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

chore: use wiredep in karma tests for resolving package filepaths #213

Merged
merged 2 commits into from
Jun 29, 2014
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ This directive allows you to sort an array with drag & drop.
## Requirements

- JQuery
- JQueryUI (1.9+)
- JQueryUI (1.9+) (1.11 is not yet supported)
- AngularJS

**Notes:**
Expand Down
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
],
"dependencies": {
"angular": "~1.2.x",
"jquery-ui": ">= 1.9"
"jquery-ui": ">=1.9 <1.11"
},
"devDependencies": {
"angular-mocks": "~1.2.x",
Expand Down
3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,8 @@
"karma-requirejs": "0.2.x",
"karma-script-launcher": "0.1.x",
"load-grunt-tasks": "0.2.x",
"requirejs": "2.1.x"
"requirejs": "2.1.x",
"wiredep": "1.8.x"
},
"scripts": {},
"repository": {
Expand Down
13 changes: 13 additions & 0 deletions test/bower_overrides.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
{
"jquery-simulate": {
"main": "jquery.simulate.js",
"dependencies": {
"jquery": ""
}
},
"angular": {
"dependencies": {
"jquery": ""
}
}
}
19 changes: 12 additions & 7 deletions test/karma.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,16 @@
'use strict';

module.exports = function(config) {
var wiredep = require('wiredep');

var fs = require('fs');
var bowerOverrides = JSON.parse(fs.readFileSync('./test/bower_overrides.json'));

var devJSDependencies = wiredep({
devDependencies: true,
overrides: bowerOverrides
}).js;

config.set({

// base path, that will be used to resolve files and exclude
Expand All @@ -15,18 +25,13 @@ module.exports = function(config) {


// list of files / patterns to load in the browser
files: [
'bower_components/jquery/dist/jquery.js',
'bower_components/jquery-simulate/jquery.simulate.js',
files: devJSDependencies.concat([
'test/libs/jquery.simulate.dragandrevert.js',
'bower_components/jquery-ui/ui/jquery-ui.js',
'bower_components/angular/angular.js',
'bower_components/angular-mocks/angular-mocks.js',
'src/sortable.js',
'test/sortable.test-helper.js',
'test/sortable.test-directives.js',
'test/*.spec.js'
],
]),


// list of files to exclude
Expand Down