Skip to content
This repository has been archived by the owner on Sep 8, 2020. It is now read-only.

Commit

Permalink
chore: Update config files for compatibility with latest Karma/Bower
Browse files Browse the repository at this point in the history
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
  • Loading branch information
kadamwhite committed Sep 16, 2013
1 parent e3fd55b commit 487f35a
Show file tree
Hide file tree
Showing 2 changed files with 25 additions and 16 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
node_modules
components
bower_components
39 changes: 24 additions & 15 deletions test/test.conf.js
Original file line number Diff line number Diff line change
@@ -1,18 +1,27 @@
basePath = '..';
module.exports = function( config ) {
config.set({
basePath: '..',

files = [
JASMINE,
JASMINE_ADAPTER,
'bower_components/jquery/jquery.js',
'bower_components/angular/angular.js',
'bower_components/angular-mocks/angular-mocks.js',
'bower_components/select2/select2.js',
'src/select2.js',
'test/*Spec.js'
];
browsers: [ 'PhantomJS' ],

singleRun = true;
files: [
// Dependencies
'bower_components/jquery/jquery.js',
'bower_components/angular/angular.js',
'bower_components/angular-mocks/angular-mocks.js',
'bower_components/select2/select2.js',

// Source Code
'src/select2.js',

reporters = [
'dots'
];
// Test Specs
'test/*Spec.js'
],

frameworks: [ 'jasmine' ],

singleRun: true,

reporters: [ 'dots' ]
});
};

0 comments on commit 487f35a

Please sign in to comment.