Skip to content

Commit c18825f

Browse files
chore(karma): Update angular to 1.3.0
1 parent 74255fe commit c18825f

File tree

6 files changed

+2371
-954
lines changed

6 files changed

+2371
-954
lines changed

Gruntfile.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ module.exports = function (grunt) {
9595
configFile: 'config/karma-1.1.5.js'
9696
},
9797
future: {
98-
configFile: 'config/karma-1.3.0-rc.1.js'
98+
configFile: 'config/karma-1.3.0.js'
9999
},
100100
background: {
101101
background: true,

config/karma-1.3.0-rc.1.js renamed to config/karma-1.3.0.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ module.exports = function (karma) {
88
basePath: '..',
99

1010
// list of files / patterns to load in the browser
11-
files: [].concat(files.angular('1.3.0-rc.1'), files.testUtils, files.src, files.test),
11+
files: [].concat(files.angular('1.3.0'), files.testUtils, files.src, files.test),
1212

1313
// level of logging
1414
// possible values: LOG_DISABLE || LOG_ERROR || LOG_WARN || LOG_INFO || LOG_DEBUG

files.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ routerFiles = {
2323
return [
2424
'lib/angular-' + version + '/angular.js',
2525
'lib/angular-' + version + '/angular-mocks.js'
26-
].concat(['1.2.14', '1.3.0-rc.1'].indexOf(version) !== -1 ? ['lib/angular-' + version + '/angular-animate.js'] : []);
26+
].concat(['1.2.14', '1.3.0'].indexOf(version) !== -1 ? ['lib/angular-' + version + '/angular-animate.js'] : []);
2727
}
2828
};
2929

0 commit comments

Comments
 (0)