File tree 9 files changed +25
-31
lines changed
9 files changed +25
-31
lines changed Original file line number Diff line number Diff line change @@ -38,6 +38,7 @@ package-lock.json
38
38
39
39
# e2e
40
40
/e2e /* .js
41
+ ! /e2e /protractor.conf.js
41
42
/e2e /* .map
42
43
43
44
# System Files
Original file line number Diff line number Diff line change 1
1
language : node_js
2
2
node_js :
3
3
- 8
4
+ sudo : required
5
+ addons :
6
+ chrome : stable
7
+ before_script :
8
+ - export DISPLAY=:99.0
9
+ - sh -e /etc/init.d/xvfb start
4
10
install :
5
11
- npm set progress=false
6
12
- npm install
7
13
script :
14
+ - ng lint
15
+ - npm run test
16
+ - npm run e2e
8
17
- npm run build
Original file line number Diff line number Diff line change 65
65
"builder" : " @angular-devkit/build-angular:karma" ,
66
66
"options" : {
67
67
"main" : " src/test.ts" ,
68
- "karmaConfig" : " ./karma.conf.js" ,
69
- "polyfills" : " src/polyfills.ts" ,
68
+ "polyfills" : " src/polyfills-test.ts" ,
70
69
"tsConfig" : " src/tsconfig.spec.json" ,
70
+ "karmaConfig" : " src/karma.conf.js" ,
71
71
"scripts" : [],
72
72
"styles" : [
73
73
" src/styles.scss"
97
97
}
98
98
},
99
99
"angular-electron-e2e" : {
100
- "root" : " " ,
101
- "sourceRoot" : " " ,
100
+ "root" : " e2e" ,
102
101
"projectType" : " application" ,
103
102
"architect" : {
104
103
"e2e" : {
105
104
"builder" : " @angular-devkit/build-angular:protractor" ,
106
105
"options" : {
107
- "protractorConfig" : " . /protractor.conf.js" ,
106
+ "protractorConfig" : " e2e /protractor.conf.js" ,
108
107
"devServerTarget" : " angular-electron:serve"
109
108
}
110
109
},
Original file line number Diff line number Diff line change @@ -7,7 +7,7 @@ exports.config = {
7
7
allScriptsTimeout : 25000 ,
8
8
delayBrowserTimeInSeconds : 0 ,
9
9
specs : [
10
- './e2e/ **/*.e2e-spec.ts'
10
+ './**/*.e2e-spec.ts'
11
11
] ,
12
12
capabilities : {
13
13
'browserName' : 'chrome' ,
Original file line number Diff line number Diff line change 30
30
"electron:windows" : " npm run build:prod && npx electron-builder build --windows" ,
31
31
"electron:mac" : " npm run build:prod && npx electron-builder build --mac" ,
32
32
"test" : " ng test" ,
33
- "pree2e:build" : " webdriver-manager update --gecko false && npm run ng serve" ,
34
- "pree2e:protractor" : " wait-on http-get://localhost:4200/ && protractor ./protractor.conf.js" ,
35
- "e2e" : " npm-run-all -p -r pree2e:build pree2e:protractor"
33
+ "e2e" : " ng e2e"
36
34
},
37
35
"dependencies" : {},
38
36
"devDependencies" : {
52
50
"@ngx-translate/http-loader" : " 3.0.1" ,
53
51
"@types/jasmine" : " 2.8.7" ,
54
52
"@types/jasminewd2" : " 2.0.3" ,
55
- "@types/node" : " 8.0.58 " ,
53
+ "@types/node" : " ~8.9.4 " ,
56
54
"codelyzer" : " 4.2.1" ,
57
55
"core-js" : " 2.5.6" ,
58
56
"cross-env" : " 5.1.5" ,
68
66
"karma-coverage-istanbul-reporter" : " 2.0.0" ,
69
67
"karma-jasmine" : " 1.1.2" ,
70
68
"karma-jasmine-html-reporter" : " 1.1.0" ,
71
- "npm-run-all" : " 4.1.3" ,
69
+ "npm-run-all" : " ^ 4.1.3" ,
72
70
"npx" : " 10.2.0" ,
73
71
"protractor" : " 5.3.2" ,
74
72
"replace" : " 0.3.0" ,
Original file line number Diff line number Diff line change @@ -15,26 +15,12 @@ module.exports = function (config) {
15
15
client :{
16
16
clearContext : false // leave Jasmine Spec Runner output visible in browser
17
17
} ,
18
- files : [
19
-
20
- ] ,
21
- preprocessors : {
22
-
23
- } ,
24
- mime : {
25
- 'text/x-typescript' : [ 'ts' , 'tsx' ]
26
- } ,
27
18
coverageIstanbulReporter : {
28
- dir : require ( 'path' ) . join ( __dirname , 'coverage' ) ,
19
+ dir : require ( 'path' ) . join ( __dirname , '../ coverage' ) ,
29
20
reports : [ 'html' , 'lcovonly' ] ,
30
21
fixWebpackSourcePaths : true
31
22
} ,
32
- angularCli : {
33
- environment : 'dev'
34
- } ,
35
- reporters : config . angularCli && config . angularCli . codeCoverage
36
- ? [ 'progress' , 'coverage-istanbul' ]
37
- : [ 'progress' , 'kjhtml' ] ,
23
+ reporters : [ 'progress' , 'kjhtml' ] ,
38
24
port : 9876 ,
39
25
colors : true ,
40
26
logLevel : config . LOG_INFO ,
Original file line number Diff line number Diff line change
1
+ import 'core-js/es7/reflect' ;
2
+ import 'zone.js/dist/zone' ;
3
+
Original file line number Diff line number Diff line change 7
7
"types" : []
8
8
},
9
9
"exclude" : [
10
- " test.ts" ,
10
+ " src/ test.ts" ,
11
11
" **/*.spec.ts" ,
12
12
" dist" ,
13
13
" app-builds" ,
Original file line number Diff line number Diff line change 3
3
"compilerOptions" : {
4
4
"outDir" : " ../out-tsc/spec" ,
5
5
"module" : " commonjs" ,
6
- "target" : " es5" ,
7
- "baseUrl" : " " ,
8
6
"types" : [
9
7
" jasmine" ,
10
8
" node"
11
9
]
12
10
},
13
11
"files" : [
14
12
" test.ts" ,
15
- " polyfills.ts"
13
+ " polyfills-test .ts"
16
14
],
17
15
"include" : [
18
16
" **/*.spec.ts" ,
You can’t perform that action at this time.
0 commit comments