Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -367,10 +367,8 @@ workflows:

integration_tests:
jobs:
# Temporarily disable e2e tests until https://github.com/angular/angular/issues/29123
# is resolved.
# - e2e_tests:
# filters: *ignore_presubmit_branch_filter
- e2e_tests:
filters: *ignore_presubmit_branch_filter
- prerender_build:
filters: *ignore_presubmit_branch_filter

Expand Down
2 changes: 2 additions & 0 deletions angular-tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
// with AOT compilation, NGC needs the "ngsummary.json" files.
{
"compilerOptions": {
"module": "umd",
"moduleResolution": "node",
"lib": [
"dom",
"es2015"
Expand Down
9 changes: 5 additions & 4 deletions e2e/components/expansion-e2e.spec.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
import {browser, by, element} from 'protractor';

describe('expansion', () => {

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

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

expect(await panelDescription.getText()).toContain('Currently I am closed');
});

});

6 changes: 5 additions & 1 deletion e2e/components/list-e2e.spec.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
import {browser} from 'protractor';
import {expectToExist} from '../util/index';

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

it('should render a list container', async () => {
Expand Down
6 changes: 5 additions & 1 deletion e2e/components/menu-e2e.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,11 @@ const presenceOf = ExpectedConditions.presenceOf;
const not = ExpectedConditions.not;


describe('menu', () => {
// TODO(mmalerba): These tests are disabled due to an issue with animations.
// (See https://github.com/angular/material2/issues/15614)
// Re-enable once the issue is resolved.
// tslint:disable-next-line:ban
xdescribe('menu', () => {
const menuSelector = '.mat-menu-panel';
const page = {
menu: () => element(by.css('.mat-menu-panel')),
Expand Down
6 changes: 5 additions & 1 deletion e2e/components/stepper-e2e.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,11 @@ import {expectFocusOn, expectToExist} from '../util/asserts';
import {pressKeys} from '../util/actions';
import {Key} from 'selenium-webdriver';

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

it('should render a stepper', async () => {
Expand Down
6 changes: 5 additions & 1 deletion e2e/components/tabs-e2e.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,11 @@ import {
} from 'protractor';
import {pressKeys} from '../util/index';

describe('tabs', () => {
// TODO(mmalerba): These tests are disabled due to an issue with animations.
// (See https://github.com/angular/material2/issues/15614)
// Re-enable once the issue is resolved.
// tslint:disable-next-line:ban
xdescribe('tabs', () => {
describe('basic behavior', () => {
let tabLabels: ElementArrayFinder;
let tabBodies: ElementArrayFinder;
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"dev-app": "gulp serve:devapp",
"test": "gulp test",
"lint": "gulp lint",
"e2e": "gulp e2e",
"e2e": "bazel test //e2e/...",
"deploy": "gulp deploy:devapp",
"webdriver-manager": "webdriver-manager",
"breaking-changes": "gulp breaking-changes",
Expand Down
1 change: 1 addition & 0 deletions packages.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -129,4 +129,5 @@ ANGULAR_LIBRARY_UMDS = [
"@npm//node_modules/@angular/platform-browser:bundles/platform-browser-animations.umd.js",
"@npm//node_modules/@angular/platform-browser:bundles/platform-browser-testing.umd.js",
"@npm//node_modules/@angular/platform-browser:bundles/platform-browser.umd.js",
"@npm//node_modules/@angular/router:bundles/router.umd.js",
]