Skip to content

Commit 487f35a

Browse files
committed
chore: Update config files for compatibility with latest Karma/Bower
Karma now throws an error when encountering JASMINE or when the karma.conf.js file does not return a value using `module.exports` Bower has changed their package install directory to be /bower_components
1 parent e3fd55b commit 487f35a

File tree

2 files changed

+25
-16
lines changed

2 files changed

+25
-16
lines changed

.gitignore

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
node_modules
2-
components
2+
bower_components

test/test.conf.js

+24-15
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,27 @@
1-
basePath = '..';
1+
module.exports = function( config ) {
2+
config.set({
3+
basePath: '..',
24

3-
files = [
4-
JASMINE,
5-
JASMINE_ADAPTER,
6-
'bower_components/jquery/jquery.js',
7-
'bower_components/angular/angular.js',
8-
'bower_components/angular-mocks/angular-mocks.js',
9-
'bower_components/select2/select2.js',
10-
'src/select2.js',
11-
'test/*Spec.js'
12-
];
5+
browsers: [ 'PhantomJS' ],
136

14-
singleRun = true;
7+
files: [
8+
// Dependencies
9+
'bower_components/jquery/jquery.js',
10+
'bower_components/angular/angular.js',
11+
'bower_components/angular-mocks/angular-mocks.js',
12+
'bower_components/select2/select2.js',
13+
14+
// Source Code
15+
'src/select2.js',
1516

16-
reporters = [
17-
'dots'
18-
];
17+
// Test Specs
18+
'test/*Spec.js'
19+
],
20+
21+
frameworks: [ 'jasmine' ],
22+
23+
singleRun: true,
24+
25+
reporters: [ 'dots' ]
26+
});
27+
};

0 commit comments

Comments
 (0)