Skip to content

Commit 72bef43

Browse files
chore(*): run test suite against angular 1.5.0.
closes #2535
1 parent d6d8c33 commit 72bef43

File tree

7 files changed

+37440
-29
lines changed

7 files changed

+37440
-29
lines changed

Gruntfile.js

Lines changed: 7 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -88,21 +88,12 @@ module.exports = function (grunt) {
8888
background: false,
8989
browsers: [ grunt.option('browser') || 'Chrome' ]
9090
},
91-
ng108: {
92-
configFile: 'config/karma-1.0.8.js'
93-
},
94-
ng115: {
95-
configFile: 'config/karma-1.1.5.js'
96-
},
97-
ng1214: {
98-
configFile: 'config/karma-1.2.14.js'
99-
},
100-
ng130: {
101-
configFile: 'config/karma-1.3.0.js'
102-
},
103-
ng149: {
104-
configFile: 'config/karma-1.4.9.js'
105-
},
91+
ng108: { configFile: 'config/karma-1.0.8.js' },
92+
ng115: { configFile: 'config/karma-1.1.5.js' },
93+
ng1214: { configFile: 'config/karma-1.2.14.js' },
94+
ng130: { configFile: 'config/karma-1.3.0.js' },
95+
ng149: { configFile: 'config/karma-1.4.9.js' },
96+
ng150: { configFile: 'config/karma-1.5.0.js' },
10697
background: {
10798
background: true,
10899
browsers: [ grunt.option('browser') || 'PhantomJS' ]
@@ -134,7 +125,7 @@ module.exports = function (grunt) {
134125
}
135126
});
136127

137-
grunt.registerTask('integrate', ['build', 'jshint', 'karma:ng149', 'karma:ng108', 'karma:ng115', 'karma:ng1214', 'karma:ng130']);
128+
grunt.registerTask('integrate', ['build', 'jshint', 'karma:ng108', 'karma:ng115', 'karma:ng1214', 'karma:ng130', 'karma:ng149', 'karma:ng150']);
138129
grunt.registerTask('default', ['build', 'jshint', 'karma:unit']);
139130
grunt.registerTask('build', 'Perform a normal build', ['concat', 'uglify']);
140131
grunt.registerTask('dist', 'Perform a clean build', ['clean', 'build']);

config/karma-1.5.0.js

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
// Karma configuration file
2+
module.exports = function (karma) {
3+
4+
var files = require('../files').files;
5+
6+
karma.set({
7+
// base path, that will be used to resolve files and exclude
8+
basePath: '..',
9+
10+
// list of files / patterns to load in the browser
11+
files: [].concat(files.angular('1.5.0'), files.testUtils, files.src, files.test),
12+
13+
// level of logging
14+
// possible values: LOG_DISABLE || LOG_ERROR || LOG_WARN || LOG_INFO || LOG_DEBUG
15+
logLevel: karma.LOG_DEBUG,
16+
frameworks: ['jasmine'],
17+
18+
// Start these browsers, currently available:
19+
// - Chrome
20+
// - ChromeCanary
21+
// - Firefox
22+
// - Opera
23+
// - Safari
24+
// - PhantomJS
25+
browsers: [ 'PhantomJS' ]
26+
})
27+
};

files.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@ routerFiles = {
1313
'src/stateFilters.js'
1414
],
1515
testUtils: [
16-
'test/testUtils.js'
16+
'test/testUtils.js',
17+
'node_modules/phantomjs-polyfill/bind-polyfill.js'
1718
],
1819
test: [
1920
'test/*Spec.js',

0 commit comments

Comments
 (0)