Skip to content

Commit 7420fea

Browse files
clydinclydin
committed
build: remove unused Protractor E2E targets from integration tests
Removes the `e2e` architect target from several integration test projects that do not have Protractor as a dependency and are not executing E2E tests. Affected projects: - cli-hello-world - cli-hello-world-lazy - defer - legacy-animations-async - standalone-bootstrap
1 parent 760910e commit 7420fea

5 files changed

Lines changed: 16 additions & 146 deletions

File tree

‎integration/cli-hello-world-lazy/angular.json‎

Lines changed: 2 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,7 @@
2020
"browser": ""
2121
},
2222
"index": "src/index.html",
23-
"polyfills": [
24-
"zone.js"
25-
],
23+
"polyfills": ["zone.js"],
2624
"tsConfig": "tsconfig.app.json",
2725
"aot": true,
2826
"assets": ["src/favicon.ico", "src/assets"],
@@ -74,10 +72,7 @@
7472
"test": {
7573
"builder": "@angular-devkit/build-angular:karma",
7674
"options": {
77-
"polyfills": [
78-
"zone.js",
79-
"zone.js/testing"
80-
],
75+
"polyfills": ["zone.js", "zone.js/testing"],
8176
"tsConfig": "tsconfig.spec.json",
8277
"karmaConfig": "karma.conf.js",
8378
"assets": ["src/favicon.ico", "src/assets"],
@@ -91,19 +86,6 @@
9186
"tsConfig": ["tsconfig.app.json", "tsconfig.spec.json", "e2e/tsconfig.json"],
9287
"exclude": ["**/node_modules/**"]
9388
}
94-
},
95-
"e2e": {
96-
"builder": "@angular-devkit/build-angular:private-protractor",
97-
"options": {
98-
"protractorConfig": "e2e/protractor.conf.js",
99-
"devServerTarget": "cli-hello-world-lazy:serve",
100-
"webdriverUpdate": false
101-
},
102-
"configurations": {
103-
"production": {
104-
"devServerTarget": "cli-hello-world-lazy:serve:production"
105-
}
106-
}
10789
}
10890
}
10991
}

‎integration/cli-hello-world/angular.json‎

Lines changed: 2 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,7 @@
1919
"browser": ""
2020
},
2121
"index": "src/index.html",
22-
"polyfills": [
23-
"zone.js"
24-
],
22+
"polyfills": ["zone.js"],
2523
"tsConfig": "tsconfig.app.json",
2624
"aot": true,
2725
"assets": ["src/favicon.ico", "src/assets"],
@@ -80,10 +78,7 @@
8078
"test": {
8179
"builder": "@angular-devkit/build-angular:karma",
8280
"options": {
83-
"polyfills": [
84-
"zone.js",
85-
"zone.js/testing"
86-
],
81+
"polyfills": ["zone.js", "zone.js/testing"],
8782
"tsConfig": "tsconfig.spec.json",
8883
"karmaConfig": "karma.conf.js",
8984
"assets": ["src/favicon.ico", "src/assets"],
@@ -99,25 +94,6 @@
9994
"tsConfig": ["tsconfig.app.json", "tsconfig.spec.json", "e2e/tsconfig.json"],
10095
"exclude": ["**/node_modules/**"]
10196
}
102-
},
103-
"e2e": {
104-
"builder": "@angular-devkit/build-angular:private-protractor",
105-
"options": {
106-
"protractorConfig": "e2e/protractor.conf.js",
107-
"devServerTarget": "cli-hello-world:serve",
108-
"webdriverUpdate": false
109-
},
110-
"configurations": {
111-
"production": {
112-
"devServerTarget": "cli-hello-world:serve:production"
113-
},
114-
"ci": {
115-
"devServerTarget": "cli-hello-world:serve:ci"
116-
},
117-
"ci-production": {
118-
"devServerTarget": "cli-hello-world:serve:ci-production"
119-
}
120-
}
12197
}
12298
}
12399
}

‎integration/defer/angular.json‎

Lines changed: 2 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,7 @@
2020
"browser": ""
2121
},
2222
"index": "src/index.html",
23-
"polyfills": [
24-
"zone.js"
25-
],
23+
"polyfills": ["zone.js"],
2624
"tsConfig": "tsconfig.app.json",
2725
"aot": true,
2826
"assets": ["src/favicon.ico", "src/assets"],
@@ -81,10 +79,7 @@
8179
"test": {
8280
"builder": "@angular-devkit/build-angular:karma",
8381
"options": {
84-
"polyfills": [
85-
"zone.js",
86-
"zone.js/testing"
87-
],
82+
"polyfills": ["zone.js", "zone.js/testing"],
8883
"tsConfig": "tsconfig.spec.json",
8984
"karmaConfig": "karma.conf.js",
9085
"assets": ["src/favicon.ico", "src/assets"],
@@ -100,25 +95,6 @@
10095
"tsConfig": ["tsconfig.app.json", "tsconfig.spec.json", "e2e/tsconfig.json"],
10196
"exclude": ["**/node_modules/**"]
10297
}
103-
},
104-
"e2e": {
105-
"builder": "@angular-devkit/build-angular:private-protractor",
106-
"options": {
107-
"protractorConfig": "e2e/protractor.conf.js",
108-
"devServerTarget": "defer:serve",
109-
"webdriverUpdate": false
110-
},
111-
"configurations": {
112-
"production": {
113-
"devServerTarget": "defer:serve:production"
114-
},
115-
"ci": {
116-
"devServerTarget": "defer:serve:ci"
117-
},
118-
"ci-production": {
119-
"devServerTarget": "defer:serve:ci-production"
120-
}
121-
}
12298
}
12399
}
124100
}

‎integration/legacy-animations-async/angular.json‎

Lines changed: 8 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -20,18 +20,11 @@
2020
"browser": ""
2121
},
2222
"index": "src/index.html",
23-
"polyfills": [
24-
"zone.js"
25-
],
23+
"polyfills": ["zone.js"],
2624
"tsConfig": "tsconfig.app.json",
2725
"aot": true,
28-
"assets": [
29-
"src/favicon.ico",
30-
"src/assets"
31-
],
32-
"styles": [
33-
"src/styles.css"
34-
],
26+
"assets": ["src/favicon.ico", "src/assets"],
27+
"styles": ["src/styles.css"],
3528
"scripts": [],
3629
"optimization": false,
3730
"progress": false,
@@ -86,19 +79,11 @@
8679
"test": {
8780
"builder": "@angular-devkit/build-angular:karma",
8881
"options": {
89-
"polyfills": [
90-
"zone.js",
91-
"zone.js/testing"
92-
],
82+
"polyfills": ["zone.js", "zone.js/testing"],
9383
"tsConfig": "tsconfig.spec.json",
9484
"karmaConfig": "karma.conf.js",
95-
"assets": [
96-
"src/favicon.ico",
97-
"src/assets"
98-
],
99-
"styles": [
100-
"src/styles.css"
101-
],
85+
"assets": ["src/favicon.ico", "src/assets"],
86+
"styles": ["src/styles.css"],
10287
"scripts": [],
10388
"progress": false,
10489
"watch": false
@@ -107,33 +92,8 @@
10792
"lint": {
10893
"builder": "@angular-devkit/build-angular:tslint",
10994
"options": {
110-
"tsConfig": [
111-
"tsconfig.app.json",
112-
"tsconfig.spec.json",
113-
"e2e/tsconfig.json"
114-
],
115-
"exclude": [
116-
"**/node_modules/**"
117-
]
118-
}
119-
},
120-
"e2e": {
121-
"builder": "@angular-devkit/build-angular:private-protractor",
122-
"options": {
123-
"protractorConfig": "e2e/protractor.conf.js",
124-
"devServerTarget": "animations:serve",
125-
"webdriverUpdate": false
126-
},
127-
"configurations": {
128-
"production": {
129-
"devServerTarget": "animations:serve:production"
130-
},
131-
"ci": {
132-
"devServerTarget": "animations:serve:ci"
133-
},
134-
"ci-production": {
135-
"devServerTarget": "animations:serve:ci-production"
136-
}
95+
"tsConfig": ["tsconfig.app.json", "tsconfig.spec.json", "e2e/tsconfig.json"],
96+
"exclude": ["**/node_modules/**"]
13797
}
13898
}
13999
}

‎integration/standalone-bootstrap/angular.json‎

Lines changed: 2 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,7 @@
1919
"browser": ""
2020
},
2121
"index": "src/index.html",
22-
"polyfills": [
23-
"zone.js"
24-
],
22+
"polyfills": ["zone.js"],
2523
"tsConfig": "tsconfig.app.json",
2624
"aot": true,
2725
"assets": ["src/favicon.ico", "src/assets"],
@@ -80,10 +78,7 @@
8078
"test": {
8179
"builder": "@angular-devkit/build-angular:karma",
8280
"options": {
83-
"polyfills": [
84-
"zone.js",
85-
"zone.js/testing"
86-
],
81+
"polyfills": ["zone.js", "zone.js/testing"],
8782
"tsConfig": "tsconfig.spec.json",
8883
"karmaConfig": "karma.conf.js",
8984
"assets": ["src/favicon.ico", "src/assets"],
@@ -99,25 +94,6 @@
9994
"tsConfig": ["tsconfig.app.json", "tsconfig.spec.json", "e2e/tsconfig.json"],
10095
"exclude": ["**/node_modules/**"]
10196
}
102-
},
103-
"e2e": {
104-
"builder": "@angular-devkit/build-angular:private-protractor",
105-
"options": {
106-
"protractorConfig": "e2e/protractor.conf.js",
107-
"devServerTarget": "standalone-bootstrap:serve",
108-
"webdriverUpdate": false
109-
},
110-
"configurations": {
111-
"production": {
112-
"devServerTarget": "standalone-bootstrap:serve:production"
113-
},
114-
"ci": {
115-
"devServerTarget": "standalone-bootstrap:serve:ci"
116-
},
117-
"ci-production": {
118-
"devServerTarget": "standalone-bootstrap:serve:ci-production"
119-
}
120-
}
12197
}
12298
}
12399
}

0 commit comments

Comments
 (0)