Skip to content

Commit 31f753a

Browse files
devversionjelbourn
authored andcommitted
build: re-enable all temporary disabled e2e tests (#15623)
Updates all Angular packages expect "@angular/compiler-cli" to the latest beta version. This allows us to pick up recent Bazel fixes which allow us to fully re-enable all e2e tests. Additionally we can now update to the latest `rules_nodejs` version that switched from `rollup` to `terser`. Additionally since we updated `@angular/[email protected]`, we can take advantage of angular/angular@105cfaf and move forward with using the Bazel `ng_package` output for the NPM release output. Also removes unused source-map-support dependency. The NodeJS rule now transitively bring in the `source-map-support` dependency and therefore we don't need to add it to various Bazel targets. Also specifying the `jasmine` attribute is currently not working as it breaks the runfile dependency of `@npm//@bazel/jasmine`. `@bazel/jasmine` transitively brings its own version of `jasmine`. Explicitly passes required runfiles in nodejs_binary Fixes #15614
1 parent 61af10b commit 31f753a

File tree

16 files changed

+208
-243
lines changed

16 files changed

+208
-243
lines changed

WORKSPACE

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,8 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
55
# Add NodeJS rules (explicitly used for sass bundle rules)
66
http_archive(
77
name = "build_bazel_rules_nodejs",
8-
sha256 = "5c86b055c57e15bf32d9009a15bcd6d8e190c41b1ff2fb18037b75e0012e4e7c",
9-
# Temporarily locked to a version of the NodeJS rules that still comes with rollup-uglify. This
10-
# is necessary until we update "@angular/bazel" to the latest version that uses rollup-terser.
11-
urls = ["https://github.com/bazelbuild/rules_nodejs/releases/download/0.26.0/rules_nodejs-0.26.0.tar.gz"],
8+
sha256 = "88e5e579fb9edfbd19791b8a3c6bfbe16ae3444dba4b428e5efd36856db7cf16",
9+
urls = ["https://github.com/bazelbuild/rules_nodejs/releases/download/0.27.8/rules_nodejs-0.27.8.tar.gz"],
1210
)
1311

1412
# Add sass rules

e2e/components/expansion-e2e.spec.ts

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

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

106
it('should show an accordion', async () => {

e2e/components/list-e2e.spec.ts

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

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

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

e2e/components/menu-e2e.spec.ts

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,7 @@ import {
1010
const presenceOf = ExpectedConditions.presenceOf;
1111
const not = ExpectedConditions.not;
1212

13-
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', () => {
13+
describe('menu', () => {
1914
const menuSelector = '.mat-menu-panel';
2015
const page = {
2116
menu: () => element(by.css('.mat-menu-panel')),

e2e/components/stepper-e2e.spec.ts

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,9 @@
1-
import {
2-
browser, by, element, ElementFinder, ExpectedConditions
3-
} from 'protractor';
4-
import {expectFocusOn, expectToExist} from '../util/asserts';
5-
import {pressKeys} from '../util/actions';
1+
import {browser, by, element, ElementFinder, ExpectedConditions} from 'protractor';
62
import {Key} from 'selenium-webdriver';
3+
import {pressKeys} from '../util/actions';
4+
import {expectFocusOn, expectToExist} from '../util/asserts';
75

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

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

e2e/components/tabs-e2e.spec.ts

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

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', () => {
11+
describe('tabs', () => {
1612
describe('basic behavior', () => {
1713
let tabLabels: ElementArrayFinder;
1814
let tabBodies: ElementArrayFinder;

package.json

Lines changed: 19 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -31,35 +31,35 @@
3131
"version": "7.3.6",
3232
"requiredAngularVersion": ">=7.0.0",
3333
"dependencies": {
34-
"@angular/animations": "8.0.0-beta.9",
35-
"@angular/common": "8.0.0-beta.9",
36-
"@angular/compiler": "8.0.0-beta.9",
37-
"@angular/core": "8.0.0-beta.9",
38-
"@angular/elements": "8.0.0-beta.9",
39-
"@angular/forms": "8.0.0-beta.9",
40-
"@angular/platform-browser": "8.0.0-beta.9",
34+
"@angular/animations": "8.0.0-beta.10",
35+
"@angular/common": "8.0.0-beta.10",
36+
"@angular/compiler": "8.0.0-beta.10",
37+
"@angular/core": "8.0.0-beta.10",
38+
"@angular/elements": "8.0.0-beta.10",
39+
"@angular/forms": "8.0.0-beta.10",
40+
"@angular/platform-browser": "8.0.0-beta.10",
4141
"@webcomponents/custom-elements": "^1.1.0",
4242
"core-js": "^2.6.1",
4343
"rxjs": "^6.4.0",
4444
"systemjs": "0.19.43",
4545
"tsickle": "^0.34.0",
4646
"tslib": "^1.9.3",
47-
"zone.js": "^0.8.29"
47+
"zone.js": "^0.9.0"
4848
},
4949
"devDependencies": {
5050
"@angular-devkit/core": "7.3.6",
5151
"@angular-devkit/schematics": "7.3.6",
52-
"@angular/bazel": "8.0.0-beta.6",
53-
"@angular/compiler-cli": "8.0.0-beta.6",
54-
"@angular/http": "8.0.0-beta.6",
55-
"@angular/platform-browser-dynamic": "8.0.0-beta.9",
56-
"@angular/platform-server": "8.0.0-beta.9",
57-
"@angular/router": "8.0.0-beta.9",
58-
"@angular/upgrade": "8.0.0-beta.9",
52+
"@angular/bazel": "8.0.0-beta.10",
53+
"@angular/compiler-cli": "8.0.0-beta.8",
54+
"@angular/http": "8.0.0-beta.10",
55+
"@angular/platform-browser-dynamic": "8.0.0-beta.10",
56+
"@angular/platform-server": "8.0.0-beta.10",
57+
"@angular/router": "8.0.0-beta.10",
58+
"@angular/upgrade": "8.0.0-beta.10",
5959
"@bazel/ibazel": "^0.9.0",
60-
"@bazel/jasmine": "0.26.0",
61-
"@bazel/karma": "0.26.0",
62-
"@bazel/typescript": "0.26.0",
60+
"@bazel/jasmine": "0.27.8",
61+
"@bazel/karma": "0.27.8",
62+
"@bazel/typescript": "0.27.8",
6363
"@firebase/app-types": "^0.3.2",
6464
"@octokit/rest": "^15.9.4",
6565
"@schematics/angular": "7.3.6",
@@ -84,7 +84,7 @@
8484
"browser-sync": "^2.26.3",
8585
"chalk": "^1.1.3",
8686
"clang-format": "^1.2.4",
87-
"codelyzer": "^4.5.0",
87+
"codelyzer": "^5.0.0-beta.2",
8888
"conventional-changelog": "^3.0.5",
8989
"dgeni": "^0.4.11",
9090
"dgeni-packages": "^0.27.1",
@@ -132,7 +132,6 @@
132132
"scss-bundle": "^2.0.1-beta.7",
133133
"selenium-webdriver": "^3.6.0",
134134
"sorcery": "^0.10.0",
135-
"source-map-support": "^0.5.9",
136135
"stylelint": "^9.9.0",
137136
"ts-node": "^3.0.4",
138137
"tsconfig-paths": "^2.3.0",

tools/BUILD.bazel

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ nodejs_binary(
1717
name = "sass_bundle",
1818
data = [
1919
"@npm//scss-bundle",
20-
"@npm//source-map-support",
2120
":sass_bundle_lib",
2221
],
2322
entry_point = "angular_material/tools/sass-bundle.js",

tools/defaults.bzl

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -75,16 +75,8 @@ def ng_package(name, readme_md = None, **kwargs):
7575
**kwargs
7676
)
7777

78-
def jasmine_node_test(deps = [], **kwargs):
79-
local_deps = [
80-
"@npm//source-map-support",
81-
] + deps
82-
83-
_jasmine_node_test(
84-
deps = local_deps,
85-
jasmine = "@npm//jasmine",
86-
**kwargs
87-
)
78+
def jasmine_node_test(**kwargs):
79+
_jasmine_node_test(**kwargs)
8880

8981
def ng_test_library(deps = [], tsconfig = None, **kwargs):
9082
local_deps = [

tools/dgeni/BUILD.bazel

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ nodejs_binary(
77
name = "dgeni",
88
entry_point = "angular_material/tools/dgeni/bazel-bin.js",
99
data = [
10-
"@npm//source-map-support",
1110
"@npm//dgeni",
1211
"@npm//dgeni-packages",
1312
":sources",

tools/example-module/BUILD.bazel

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ nodejs_binary(
1818
entry_point = "angular_material/tools/example-module/bazel-bin.js",
1919
data = [
2020
"@npm//typescript",
21-
"@npm//source-map-support",
2221
":example-module-lib",
2322
":example-module.template",
2423
],

tools/highlight-files/BUILD.bazel

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ nodejs_binary(
1717
name = "highlight-files",
1818
entry_point = "angular_material/tools/highlight-files/highlight-files.js",
1919
data = [
20-
"@npm//source-map-support",
2120
":sources",
2221
],
2322
)

tools/markdown-to-html/BUILD.bazel

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ ts_library(
99
deps = [
1010
"@npm//@types/node",
1111
"@npm//@types/marked",
12-
"@npm//marked",
1312
"//tools/highlight-files:sources",
1413
],
1514
tsconfig = ":tsconfig.json",
@@ -19,7 +18,7 @@ nodejs_binary(
1918
name = "markdown-to-html",
2019
entry_point = "angular_material/tools/markdown-to-html/transform-markdown.js",
2120
data = [
22-
"@npm//source-map-support",
21+
"@npm//marked",
2322
":transform-markdown",
2423
],
2524
)

tools/package-docs-content/BUILD.bazel

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ nodejs_binary(
77
name = "package-docs-content",
88
entry_point = "angular_material/tools/package-docs-content/package-docs-content.js",
99
data = [
10-
"@npm//source-map-support",
1110
":sources",
1211
],
1312
)

tslint.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -86,12 +86,12 @@
8686
"no-duplicate-imports": true,
8787

8888
// Codelyzer
89-
"banana-in-box": true,
90-
"contextual-life-cycle": true,
91-
"decorator-not-allowed": true,
89+
"template-banana-in-box": true,
90+
"contextual-lifecycle": true,
91+
"contextual-decorator": true,
9292
"no-output-on-prefix": true,
93-
"templates-no-negated-async": true,
94-
"use-life-cycle-interface": true,
93+
"template-no-negated-async": true,
94+
"use-lifecycle-interface": true,
9595

9696
// Custom Rules
9797
"ts-loader": true,

0 commit comments

Comments
 (0)