Skip to content

Commit d739c67

Browse files
mmalerbajelbourn
authored andcommitted
chore(e2e): re-enable e2e tests for some components (#15615)
Some components are affected by #15614 and can't be enabled yet.
1 parent e22f46b commit d739c67

File tree

9 files changed

+31
-13
lines changed

9 files changed

+31
-13
lines changed

.circleci/config.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -367,10 +367,8 @@ workflows:
367367

368368
integration_tests:
369369
jobs:
370-
# Temporarily disable e2e tests until https://github.com/angular/angular/issues/29123
371-
# is resolved.
372-
# - e2e_tests:
373-
# filters: *ignore_presubmit_branch_filter
370+
- e2e_tests:
371+
filters: *ignore_presubmit_branch_filter
374372
- prerender_build:
375373
filters: *ignore_presubmit_branch_filter
376374

angular-tsconfig.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
// with AOT compilation, NGC needs the "ngsummary.json" files.
44
{
55
"compilerOptions": {
6+
"module": "umd",
7+
"moduleResolution": "node",
68
"lib": [
79
"dom",
810
"es2015"

e2e/components/expansion-e2e.spec.ts

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
import {browser, by, element} from 'protractor';
22

3-
describe('expansion', () => {
4-
3+
// TODO(mmalerba): These tests are disabled due to an issue with animations.
4+
// (See https://github.com/angular/material2/issues/15614)
5+
// Re-enable once the issue is resolved.
6+
// tslint:disable-next-line:ban
7+
xdescribe('expansion', () => {
58
beforeEach(async () => await browser.get('/expansion'));
69

710
it('should show an accordion', async () => {
@@ -36,6 +39,4 @@ describe('expansion', () => {
3639

3740
expect(await panelDescription.getText()).toContain('Currently I am closed');
3841
});
39-
4042
});
41-

e2e/components/list-e2e.spec.ts

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,11 @@
11
import {browser} from 'protractor';
22
import {expectToExist} from '../util/index';
33

4-
describe('list', () => {
4+
// TODO(mmalerba): These tests are disabled due to an issue with animations.
5+
// (See https://github.com/angular/material2/issues/15614)
6+
// Re-enable once the issue is resolved.
7+
// tslint:disable-next-line:ban
8+
xdescribe('list', () => {
59
beforeEach(async () => await browser.get('/list'));
610

711
it('should render a list container', async () => {

e2e/components/menu-e2e.spec.ts

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,11 @@ const presenceOf = ExpectedConditions.presenceOf;
1111
const not = ExpectedConditions.not;
1212

1313

14-
describe('menu', () => {
14+
// TODO(mmalerba): These tests are disabled due to an issue with animations.
15+
// (See https://github.com/angular/material2/issues/15614)
16+
// Re-enable once the issue is resolved.
17+
// tslint:disable-next-line:ban
18+
xdescribe('menu', () => {
1519
const menuSelector = '.mat-menu-panel';
1620
const page = {
1721
menu: () => element(by.css('.mat-menu-panel')),

e2e/components/stepper-e2e.spec.ts

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,11 @@ import {expectFocusOn, expectToExist} from '../util/asserts';
55
import {pressKeys} from '../util/actions';
66
import {Key} from 'selenium-webdriver';
77

8-
describe('stepper', () => {
8+
// TODO(mmalerba): These tests are disabled due to an issue with animations.
9+
// (See https://github.com/angular/material2/issues/15614)
10+
// Re-enable once the issue is resolved.
11+
// tslint:disable-next-line:ban
12+
xdescribe('stepper', () => {
913
beforeEach(async () => await browser.get('/stepper'));
1014

1115
it('should render a stepper', async () => {

e2e/components/tabs-e2e.spec.ts

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,11 @@ import {
88
} from 'protractor';
99
import {pressKeys} from '../util/index';
1010

11-
describe('tabs', () => {
11+
// TODO(mmalerba): These tests are disabled due to an issue with animations.
12+
// (See https://github.com/angular/material2/issues/15614)
13+
// Re-enable once the issue is resolved.
14+
// tslint:disable-next-line:ban
15+
xdescribe('tabs', () => {
1216
describe('basic behavior', () => {
1317
let tabLabels: ElementArrayFinder;
1418
let tabBodies: ElementArrayFinder;

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"dev-app": "gulp serve:devapp",
1818
"test": "gulp test",
1919
"lint": "gulp lint",
20-
"e2e": "gulp e2e",
20+
"e2e": "bazel test //e2e/...",
2121
"deploy": "gulp deploy:devapp",
2222
"webdriver-manager": "webdriver-manager",
2323
"breaking-changes": "gulp breaking-changes",

packages.bzl

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -129,4 +129,5 @@ ANGULAR_LIBRARY_UMDS = [
129129
"@npm//node_modules/@angular/platform-browser:bundles/platform-browser-animations.umd.js",
130130
"@npm//node_modules/@angular/platform-browser:bundles/platform-browser-testing.umd.js",
131131
"@npm//node_modules/@angular/platform-browser:bundles/platform-browser.umd.js",
132+
"@npm//node_modules/@angular/router:bundles/router.umd.js",
132133
]

0 commit comments

Comments
 (0)