Skip to content

Commit

Permalink
fix(tests): cleanup test code (valor-software#4778)
Browse files Browse the repository at this point in the history
  • Loading branch information
ludmilanesvitiy authored and valorkin committed Nov 7, 2018
1 parent 1d2ff35 commit 9f2ec92
Show file tree
Hide file tree
Showing 7 changed files with 4,951 additions and 5,403 deletions.
5 changes: 0 additions & 5 deletions .angular-cli.json.bak
Original file line number Diff line number Diff line change
Expand Up @@ -65,11 +65,6 @@
],
"addons": [],
"packages": [],
"e2e": {
"protractor": {
"config": "protractor.conf.js"
}
},
"lint": [
{
"project": "../tslint.json"
Expand Down
5 changes: 1 addition & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -91,10 +91,7 @@ jobs:
- stage: cypress-tests
env: URL=localhost:4200/#
before_script: ng serve --prod &
script:
# until this is fixed https://github.com/bahmutov/add-typescript-to-cypress/issues/23
- npm i ts-loader@3 --no-save
- $(npm bin)/wait-on http-get://$URL && npm run cy:run
script: $(npm bin)/wait-on http-get://$URL && npm run cy:run

# check prod build
- &build
Expand Down
7 changes: 0 additions & 7 deletions angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -127,13 +127,6 @@
"sourceRoot": "",
"projectType": "application",
"architect": {
"e2e": {
"builder": "@angular-devkit/build-angular:protractor",
"options": {
"protractorConfig": "protractor.conf.js",
"devServerTarget": "ngx-bootstrap:serve"
}
},
"lint": {
"builder": "@angular-devkit/build-angular:tslint",
"options": {
Expand Down
8 changes: 4 additions & 4 deletions cypress/plugins/cy-ts-preprocessor.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const wp = require('@cypress/webpack-preprocessor')
const wp = require('@cypress/webpack-preprocessor');

const webpackOptions = {
resolve: {
Expand All @@ -17,10 +17,10 @@ const webpackOptions = {
}
]
}
}
};

const options = {
webpackOptions
}
};

module.exports = wp(options)
module.exports = wp(options);
4 changes: 2 additions & 2 deletions cypress/plugins/index.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
const cypressTypeScriptPreprocessor = require('./cy-ts-preprocessor')
const cypressTypeScriptPreprocessor = require('./cy-ts-preprocessor');

module.exports = on => {
on('file:preprocessor', cypressTypeScriptPreprocessor)
}
};
Loading

0 comments on commit 9f2ec92

Please sign in to comment.