Skip to content

Commit 70075f2

Browse files
amoldavskyamoldavsky
authored
Merge pull request #19 from amoldavsky/update-for-unit-tests
update for unit tests
2 parents f72c08b + 0ea1a82 commit 70075f2

File tree

11 files changed

+100486
-133
lines changed

11 files changed

+100486
-133
lines changed

‎README.md‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,13 @@
22
AngularJS ngMockE2E Async
33
<br><br>
44

5-
Angular 1.3.17 [![CircleCI](https://circleci.com/gh/amoldavsky/angular-mocks-async/tree/master.svg?style=shield)](https://circleci.com/gh/amoldavsky/angular-mocks-async)
6-
7-
Angular 1.5.8 [![CircleCI](https://circleci.com/gh/amoldavsky/angular-mocks-async/tree/master.svg?style=shield)](https://circleci.com/gh/amoldavsky/angular-mocks-async)
8-
5+
[![CircleCI](https://circleci.com/gh/amoldavsky/angular-mocks-async/tree/master.svg?style=shield)](https://circleci.com/gh/amoldavsky/angular-mocks-async)
96
[![codecov](https://codecov.io/gh/amoldavsky/angular-mocks-async/branch/master/graph/badge.svg)](https://codecov.io/gh/amoldavsky/angular-mocks-async)
107
<br><br>
8+
Tested Angular versions:
9+
1.3.17, 1.4.0, 1.5.0, 1.6.0
10+
<br><br>
11+
1112

1213
An abstraction on top of ngMockE2E to support async calls using promises.
1314

‎circle.yml‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
machine:
22
node:
33
version:
4-
6.9.4
4+
7.10.0
55

66
dependencies:
77
pre:
@@ -14,9 +14,7 @@ test:
1414
override:
1515
- npm install
1616
#- ./node_modules/karma-cli/bin/karma start karma.conf.js --single-run
17-
- ./node_modules/gulp-cli/bin/gulp.js test-unminified
18-
- ./node_modules/gulp-cli/bin/gulp.js test-minified
19-
- ./node_modules/gulp-cli/bin/gulp.js test-with-angular-1.3.17
17+
- ./node_modules/gulp-cli/bin/gulp.js test-with-angular-all-versions
2018

2119
post:
2220
- bash <(curl -s https://codecov.io/bash)

‎gulpfile.js‎

Lines changed: 69 additions & 123 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,45 @@
11
(function( require ) {
22

33
const gulp = require( "gulp" );
4+
// const gulpSequence = require('run-sequence').use( gulp );
45
const karma = require( "gulp-karma-runner" );
56
const fs = require('fs');
67

8+
function createKarmaServer() {
9+
return karma.server({
10+
singleRun: true,
11+
autoWatch: true,
12+
concurrency: Infinity,
13+
port: 9876,
14+
15+
frameworks: [ "mocha", "chai" ],
16+
browsers: [ "Chrome" ],
17+
basePath: "",
18+
exclude: [],
19+
preprocessors: {
20+
'src/**/*.js': ['coverage']
21+
},
22+
reporters: [ 'spec', 'coverage' ],
23+
coverageReporter: {
24+
type : 'lcov',
25+
dir : 'coverage/'
26+
},
27+
colors: true
28+
});
29+
}
30+
31+
function gulpTestRun( angularVersion = "1.6.0", isMinified = false ) {
32+
const ext = isMinified ? '.min' : '';
33+
return gulp.src([
34+
`test/angular-${angularVersion}/angular.js`,
35+
`test/angular-${angularVersion}/angular-mocks.js`,
36+
`dist/angular-mocks-async${ext}.js`,
37+
'test/angular-mocks-async-internal-tests.js',
38+
'test/angular-mocks-async-test.js'
39+
], { "read": false })
40+
.pipe( createKarmaServer() );
41+
}
42+
743
gulp.task( "compile", function () {
844
const compressor = require( "node-minify" );
945

@@ -68,128 +104,38 @@
68104

69105
});
70106

71-
gulp.task( "test-unminified", function () {
72-
gulp.src([
73-
'test/angular-1.5.8/angular.js',
74-
'test/angular-1.5.8/angular-mocks.js',
75-
'dist/angular-mocks-async.js',
76-
'test/angular-mocks-async-internal-tests.js',
77-
'test/angular-mocks-async-test.js'
78-
], {"read": false}).pipe(
79-
karma.server({
80-
singleRun: true,
81-
autoWatch: true,
82-
concurrency: Infinity,
83-
port: 9876,
84-
85-
frameworks: [ "mocha", "chai" ],
86-
browsers: [ "Chrome" ],
87-
basePath: "",
88-
exclude: [],
89-
preprocessors: {
90-
'src/**/*.js': ['coverage']
91-
},
92-
reporters: [ 'spec', 'coverage' ],
93-
coverageReporter: {
94-
type : 'lcov',
95-
dir : 'coverage/'
96-
},
97-
colors: true
98-
})
99-
);
100-
});
101-
102-
gulp.task( "test-minified", function () {
103-
gulp.src([
104-
'test/angular-1.5.8/angular.js',
105-
'test/angular-1.5.8/angular-mocks.js',
106-
'dist/angular-mocks-async.min.js',
107-
'test/angular-mocks-async-internal-tests.js',
108-
'test/angular-mocks-async-test.js'
109-
], {"read": false}).pipe(
110-
karma.server({
111-
singleRun: true,
112-
autoWatch: true,
113-
concurrency: Infinity,
114-
port: 9876,
115-
116-
frameworks: [ "mocha", "chai" ],
117-
browsers: [ "Chrome" ],
118-
basePath: "",
119-
exclude: [],
120-
preprocessors: {
121-
'src/**/*.js': ['coverage']
122-
},
123-
reporters: [ 'spec', 'coverage' ],
124-
coverageReporter: {
125-
type : 'lcov',
126-
dir : 'coverage/'
127-
},
128-
colors: true
129-
})
130-
);
131-
});
132-
133-
gulp.task( "test-with-angular-1.3.17", function () {
134-
gulp.src([
135-
'test/angular-1.3.17/angular.js',
136-
'test/angular-1.3.17/angular-mocks.js',
137-
'dist/angular-mocks-async.min.js',
138-
'test/angular-mocks-async-internal-tests.js',
139-
'test/angular-mocks-async-test.js'
140-
], {"read": false}).pipe(
141-
karma.server({
142-
singleRun: true,
143-
autoWatch: true,
144-
concurrency: Infinity,
145-
port: 9876,
146-
147-
frameworks: [ "mocha", "chai" ],
148-
browsers: [ "Chrome" ],
149-
basePath: "",
150-
exclude: [],
151-
preprocessors: {
152-
'src/**/*.js': ['coverage']
153-
},
154-
reporters: [ 'spec', 'coverage' ],
155-
coverageReporter: {
156-
type : 'lcov',
157-
dir : 'coverage/'
158-
},
159-
colors: true
160-
})
161-
);
162-
});
163-
164-
gulp.task( "test-with-angular-1.3.0", function () {
165-
gulp.src([
166-
'test/angular-1.3.0/angular.js',
167-
'test/angular-1.3.0/angular-mocks.js',
168-
'dist/angular-mocks-async.min.js',
169-
'test/angular-mocks-async-internal-tests.js',
170-
'test/angular-mocks-async-test.js'
171-
], {"read": false}).pipe(
172-
karma.server({
173-
singleRun: true,
174-
autoWatch: true,
175-
concurrency: Infinity,
176-
port: 9876,
177-
178-
frameworks: [ "mocha", "chai" ],
179-
browsers: [ "Chrome" ],
180-
basePath: "",
181-
exclude: [],
182-
preprocessors: {
183-
'src/**/*.js': ['coverage']
184-
},
185-
reporters: [ 'spec', 'coverage' ],
186-
coverageReporter: {
187-
type : 'lcov',
188-
dir : 'coverage/'
189-
},
190-
colors: true
191-
})
192-
);
193-
});
107+
gulp.task( "test-with-angular-1.6.0", [ "test-with-angular-1.6.0-minified", "test-with-angular-1.6.0-unminified" ]);
108+
gulp.task( "test-with-angular-1.6.0-unminified", () => gulpTestRun( "1.6.0" ) );
109+
gulp.task( "test-with-angular-1.6.0-minified", () => gulpTestRun( "1.6.0", true ) );
110+
111+
gulp.task( "test-with-angular-1.5.0", [ "test-with-angular-1.5.0-minified", "test-with-angular-1.5.0-unminified" ]);
112+
gulp.task( "test-with-angular-1.5.0-unminified", () => gulpTestRun( "1.5.0" ) );
113+
gulp.task( "test-with-angular-1.5.0-minified", () => gulpTestRun( "1.5.0", true ) );
114+
115+
gulp.task( "test-with-angular-1.4.0", [ "test-with-angular-1.4.0-minified", "test-with-angular-1.4.0-unminified" ]);
116+
gulp.task( "test-with-angular-1.4.0-unminified", () => gulpTestRun( "1.4.0" ) );
117+
gulp.task( "test-with-angular-1.4.0-minified", () => gulpTestRun( "1.4.0", true ) );
118+
119+
gulp.task( "test-with-angular-1.3.17", [ "test-with-angular-1.3.17-minified", "test-with-angular-1.3.17-unminified" ]);
120+
gulp.task( "test-with-angular-1.3.17-minified", () => gulpTestRun( "1.3.17" ) );
121+
gulp.task( "test-with-angular-1.3.17-unminified", () => gulpTestRun( "1.3.17", true ) );
122+
123+
function runSequential( tasks ) {
124+
if( !tasks || tasks.length <= 0 ) return;
125+
126+
const task = tasks[0];
127+
gulp.start( task, () => {
128+
console.log( `${task} finished` );
129+
runSequential( tasks.slice(1) );
130+
} );
131+
}
132+
gulp.task( "test-with-angular-all-versions", () => runSequential([
133+
"test-with-angular-1.3.17",
134+
"test-with-angular-1.4.0",
135+
"test-with-angular-1.5.0",
136+
"test-with-angular-1.6.0",
137+
]));
138+
139+
gulp.task( "test-with-angular-1.3.0", () => gulpTestRun("1.3.0") );
194140

195141
}( require ));

0 commit comments

Comments
 (0)