Skip to content

Commit 9f2ec92

Browse files
ludmilanesvitiyvalorkin
authored andcommitted
fix(tests): cleanup test code (#4778)
1 parent 1d2ff35 commit 9f2ec92

File tree

7 files changed

+4951
-5403
lines changed

7 files changed

+4951
-5403
lines changed

.angular-cli.json.bak

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -65,11 +65,6 @@
6565
],
6666
"addons": [],
6767
"packages": [],
68-
"e2e": {
69-
"protractor": {
70-
"config": "protractor.conf.js"
71-
}
72-
},
7368
"lint": [
7469
{
7570
"project": "../tslint.json"

.travis.yml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -91,10 +91,7 @@ jobs:
9191
- stage: cypress-tests
9292
env: URL=localhost:4200/#
9393
before_script: ng serve --prod &
94-
script:
95-
# until this is fixed https://github.com/bahmutov/add-typescript-to-cypress/issues/23
96-
- npm i ts-loader@3 --no-save
97-
- $(npm bin)/wait-on http-get://$URL && npm run cy:run
94+
script: $(npm bin)/wait-on http-get://$URL && npm run cy:run
9895

9996
# check prod build
10097
- &build

angular.json

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -127,13 +127,6 @@
127127
"sourceRoot": "",
128128
"projectType": "application",
129129
"architect": {
130-
"e2e": {
131-
"builder": "@angular-devkit/build-angular:protractor",
132-
"options": {
133-
"protractorConfig": "protractor.conf.js",
134-
"devServerTarget": "ngx-bootstrap:serve"
135-
}
136-
},
137130
"lint": {
138131
"builder": "@angular-devkit/build-angular:tslint",
139132
"options": {

cypress/plugins/cy-ts-preprocessor.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
const wp = require('@cypress/webpack-preprocessor')
1+
const wp = require('@cypress/webpack-preprocessor');
22

33
const webpackOptions = {
44
resolve: {
@@ -17,10 +17,10 @@ const webpackOptions = {
1717
}
1818
]
1919
}
20-
}
20+
};
2121

2222
const options = {
2323
webpackOptions
24-
}
24+
};
2525

26-
module.exports = wp(options)
26+
module.exports = wp(options);

cypress/plugins/index.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
const cypressTypeScriptPreprocessor = require('./cy-ts-preprocessor')
1+
const cypressTypeScriptPreprocessor = require('./cy-ts-preprocessor');
22

33
module.exports = on => {
44
on('file:preprocessor', cypressTypeScriptPreprocessor)
5-
}
5+
};

0 commit comments

Comments
 (0)