Skip to content

Commit 5bc6422

Browse files
committed
Added angular1.5 tests and migrated to jasmine2.0
1 parent 59df66a commit 5bc6422

10 files changed

+147
-161
lines changed

bower.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
"karma-angular-1.2.conf.js",
1414
"karma-angular-1.3.conf.js",
1515
"karma-angular-1.4.conf.js",
16+
"karma-angular-1.5.conf.js",
1617
"package.json",
1718
"src",
1819
"**/*.min.js"

karma-angular-1.2.conf.js

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,13 @@ module.exports = function(config) {
33

44
basePath: './',
55

6-
frameworks: ["jasmine"],
6+
frameworks: [
7+
'jasmine',
8+
'jasmine-jquery-matchers',
9+
'phantomjs-shim'
10+
],
711

812
files: [
9-
'test/lib/jquery.min.js',
10-
'test/lib/helpers.js',
1113
'https://ajax.googleapis.com/ajax/libs/angularjs/1.2.21/angular.js',
1214
'https://ajax.googleapis.com/ajax/libs/angularjs/1.2.21/angular-route.js',
1315
'https://ajax.googleapis.com/ajax/libs/angularjs/1.2.21/angular-animate.js',

karma-angular-1.3.conf.js

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,13 @@ module.exports = function(config) {
33

44
basePath: './',
55

6-
frameworks: ["jasmine"],
6+
frameworks: [
7+
'jasmine',
8+
'jasmine-jquery-matchers',
9+
'phantomjs-shim'
10+
],
711

812
files: [
9-
'test/lib/jquery.min.js',
10-
'test/lib/helpers.js',
1113
'https://ajax.googleapis.com/ajax/libs/angularjs/1.3.16/angular.js',
1214
'https://ajax.googleapis.com/ajax/libs/angularjs/1.3.16/angular-route.js',
1315
'https://ajax.googleapis.com/ajax/libs/angularjs/1.3.16/angular-animate.js',

karma-angular-1.4.conf.js

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,13 @@ module.exports = function(config) {
33

44
basePath: './',
55

6-
frameworks: ["jasmine"],
6+
frameworks: [
7+
'jasmine',
8+
'jasmine-jquery-matchers',
9+
'phantomjs-shim'
10+
],
711

812
files: [
9-
'test/lib/jquery.min.js',
10-
'test/lib/helpers.js',
1113
'https://ajax.googleapis.com/ajax/libs/angularjs/1.4.0/angular.js',
1214
'https://ajax.googleapis.com/ajax/libs/angularjs/1.4.0/angular-route.js',
1315
'https://ajax.googleapis.com/ajax/libs/angularjs/1.4.0/angular-animate.js',

karma-angular-1.5.conf.js

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
module.exports = function(config) {
2+
config.set({
3+
4+
basePath: './',
5+
6+
frameworks: [
7+
'jasmine',
8+
'jasmine-jquery-matchers',
9+
'phantomjs-shim'
10+
],
11+
12+
files: [
13+
'https://ajax.googleapis.com/ajax/libs/angularjs/1.5.0-rc.1/angular.js',
14+
'https://ajax.googleapis.com/ajax/libs/angularjs/1.5.0-rc.1/angular-route.js',
15+
'https://ajax.googleapis.com/ajax/libs/angularjs/1.5.0-rc.1/angular-animate.js',
16+
'https://ajax.googleapis.com/ajax/libs/angularjs/1.5.0-rc.1/angular-mocks.js',
17+
'https://ajax.googleapis.com/ajax/libs/angularjs/1.5.0-rc.1/angular-scenario.js',
18+
'src/**/*.js',
19+
'test/unit/**/*.js'
20+
],
21+
22+
autoWatch: true,
23+
24+
browsers: ['PhantomJS']
25+
26+
});
27+
};

package.json

Lines changed: 24 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,26 @@
11
{
2-
"name": "angular-route-segment",
3-
"version": "1.5.0",
4-
"devDependencies": {
5-
"dgeni-alive": "~0.0.5",
6-
"grunt": "",
7-
"grunt-contrib-concat": "",
8-
"grunt-contrib-uglify": "",
9-
"grunt-git-describe": "",
10-
"grunt-karma": "",
11-
"karma": "",
12-
"karma-jasmine": "0.1.5",
13-
"karma-junit-reporter": "",
14-
"karma-phantomjs-launcher": "",
15-
"phantomjs": "^1.9.19"
16-
},
17-
"main": "build/angular-route-segment.js",
18-
"scripts": {
19-
"test": "grunt karma"
20-
}
2+
"name": "angular-route-segment",
3+
"version": "1.5.0",
4+
"devDependencies": {
5+
"dgeni-alive": "~0.0.5",
6+
"grunt": "",
7+
"grunt-contrib-concat": "",
8+
"grunt-contrib-uglify": "",
9+
"grunt-git-describe": "",
10+
"grunt-karma": "",
11+
"jasmine-core": "^2.4.1",
12+
"jasmine-jquery-matchers": "^1.0.1",
13+
"jquery": "^2.2.0",
14+
"karma": "",
15+
"karma-jasmine": "0.3.6",
16+
"karma-jasmine-jquery-matchers": "^1.0.0",
17+
"karma-junit-reporter": "",
18+
"karma-phantomjs-launcher": "",
19+
"karma-phantomjs-shim": "",
20+
"phantomjs": "^1.9.19"
21+
},
22+
"main": "build/angular-route-segment.js",
23+
"scripts": {
24+
"test": "grunt karma"
25+
}
2126
}

test/lib/helpers.js

Lines changed: 0 additions & 51 deletions
This file was deleted.

test/lib/jquery.min.js

Lines changed: 0 additions & 2 deletions
This file was deleted.

0 commit comments

Comments
 (0)