Skip to content

build: re-enable all temporary disabled e2e tests #15623

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Mar 27, 2019
Merged
Show file tree
Hide file tree
Changes from 2 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 WORKSPACE
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,8 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
# Add NodeJS rules (explicitly used for sass bundle rules)
http_archive(
name = "build_bazel_rules_nodejs",
sha256 = "5c86b055c57e15bf32d9009a15bcd6d8e190c41b1ff2fb18037b75e0012e4e7c",
# Temporarily locked to a version of the NodeJS rules that still comes with rollup-uglify. This
# is necessary until we update "@angular/bazel" to the latest version that uses rollup-terser.
urls = ["https://github.com/bazelbuild/rules_nodejs/releases/download/0.26.0/rules_nodejs-0.26.0.tar.gz"],
sha256 = "88e5e579fb9edfbd19791b8a3c6bfbe16ae3444dba4b428e5efd36856db7cf16",
urls = ["https://github.com/bazelbuild/rules_nodejs/releases/download/0.27.8/rules_nodejs-0.27.8.tar.gz"],
)

# Add sass rules
Expand Down
6 changes: 1 addition & 5 deletions e2e/components/expansion-e2e.spec.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
import {browser, by, element} from 'protractor';

// 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', () => {
describe('expansion', () => {
beforeEach(async () => await browser.get('/expansion'));

it('should show an accordion', async () => {
Expand Down
6 changes: 1 addition & 5 deletions e2e/components/list-e2e.spec.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,7 @@
import {browser} from 'protractor';
import {expectToExist} from '../util/index';

// 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', () => {
describe('list', () => {
beforeEach(async () => await browser.get('/list'));

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


// 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', () => {
describe('menu', () => {
const menuSelector = '.mat-menu-panel';
const page = {
menu: () => element(by.css('.mat-menu-panel')),
Expand Down
14 changes: 4 additions & 10 deletions e2e/components/stepper-e2e.spec.ts
Original file line number Diff line number Diff line change
@@ -1,15 +1,9 @@
import {
browser, by, element, ElementFinder, ExpectedConditions
} from 'protractor';
import {expectFocusOn, expectToExist} from '../util/asserts';
import {pressKeys} from '../util/actions';
import {browser, by, element, ElementFinder, ExpectedConditions} from 'protractor';
import {Key} from 'selenium-webdriver';
import {pressKeys} from '../util/actions';
import {expectFocusOn, expectToExist} from '../util/asserts';

// 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', () => {
describe('stepper', () => {
beforeEach(async () => await browser.get('/stepper'));

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

// 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('tabs', () => {
describe('basic behavior', () => {
let tabLabels: ElementArrayFinder;
let tabBodies: ElementArrayFinder;
Expand Down
38 changes: 19 additions & 19 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,35 +31,35 @@
"version": "7.3.6",
"requiredAngularVersion": ">=7.0.0",
"dependencies": {
"@angular/animations": "8.0.0-beta.9",
"@angular/common": "8.0.0-beta.9",
"@angular/compiler": "8.0.0-beta.9",
"@angular/core": "8.0.0-beta.9",
"@angular/elements": "8.0.0-beta.9",
"@angular/forms": "8.0.0-beta.9",
"@angular/platform-browser": "8.0.0-beta.9",
"@angular/animations": "8.0.0-beta.10",
"@angular/common": "8.0.0-beta.10",
"@angular/compiler": "8.0.0-beta.10",
"@angular/core": "8.0.0-beta.10",
"@angular/elements": "8.0.0-beta.10",
"@angular/forms": "8.0.0-beta.10",
"@angular/platform-browser": "8.0.0-beta.10",
"@webcomponents/custom-elements": "^1.1.0",
"core-js": "^2.6.1",
"rxjs": "^6.4.0",
"systemjs": "0.19.43",
"tsickle": "^0.34.0",
"tslib": "^1.9.3",
"zone.js": "^0.8.29"
"zone.js": "^0.9.0"
},
"devDependencies": {
"@angular-devkit/core": "7.3.6",
"@angular-devkit/schematics": "7.3.6",
"@angular/bazel": "8.0.0-beta.6",
"@angular/compiler-cli": "8.0.0-beta.6",
"@angular/http": "8.0.0-beta.6",
"@angular/platform-browser-dynamic": "8.0.0-beta.9",
"@angular/platform-server": "8.0.0-beta.9",
"@angular/router": "8.0.0-beta.9",
"@angular/upgrade": "8.0.0-beta.9",
"@angular/bazel": "8.0.0-beta.10",
"@angular/compiler-cli": "8.0.0-beta.8",
"@angular/http": "8.0.0-beta.10",
"@angular/platform-browser-dynamic": "8.0.0-beta.10",
"@angular/platform-server": "8.0.0-beta.10",
"@angular/router": "8.0.0-beta.10",
"@angular/upgrade": "8.0.0-beta.10",
"@bazel/ibazel": "^0.9.0",
"@bazel/jasmine": "0.26.0",
"@bazel/karma": "0.26.0",
"@bazel/typescript": "0.26.0",
"@bazel/jasmine": "0.27.8",
"@bazel/karma": "0.27.8",
"@bazel/typescript": "0.27.8",
"@firebase/app-types": "^0.3.2",
"@octokit/rest": "^15.9.4",
"@schematics/angular": "7.3.6",
Expand All @@ -84,7 +84,7 @@
"browser-sync": "^2.26.3",
"chalk": "^1.1.3",
"clang-format": "^1.2.4",
"codelyzer": "^4.5.0",
"codelyzer": "^5.0.0-beta.2",
"conventional-changelog": "^3.0.5",
"dgeni": "^0.4.11",
"dgeni-packages": "^0.27.1",
Expand Down
10 changes: 5 additions & 5 deletions tslint.json
Original file line number Diff line number Diff line change
Expand Up @@ -86,12 +86,12 @@
"no-duplicate-imports": true,

// Codelyzer
"banana-in-box": true,
"contextual-life-cycle": true,
"decorator-not-allowed": true,
"template-banana-in-box": true,
"contextual-lifecycle": true,
"contextual-decorator": true,
"no-output-on-prefix": true,
"templates-no-negated-async": true,
"use-life-cycle-interface": true,
"template-no-negated-async": true,
"use-lifecycle-interface": true,

// Custom Rules
"ts-loader": true,
Expand Down
Loading