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

Commit fcb6629

Browse files
committed
Merge pull request #213 from thgreasi/wiredep
chore: use wiredep in karma tests for resolving package filepaths
2 parents d9911be + 7ac6735 commit fcb6629

File tree

5 files changed

+29
-10
lines changed

5 files changed

+29
-10
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ This directive allows you to sort an array with drag & drop.
55
## Requirements
66

77
- JQuery
8-
- JQueryUI (1.9+)
8+
- JQueryUI (1.9+) (1.11 is not yet supported)
99
- AngularJS
1010

1111
**Notes:**

bower.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
],
1818
"dependencies": {
1919
"angular": "~1.2.x",
20-
"jquery-ui": ">= 1.9"
20+
"jquery-ui": ">=1.9 <1.11"
2121
},
2222
"devDependencies": {
2323
"angular-mocks": "~1.2.x",

package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,8 @@
3131
"karma-requirejs": "0.2.x",
3232
"karma-script-launcher": "0.1.x",
3333
"load-grunt-tasks": "0.2.x",
34-
"requirejs": "2.1.x"
34+
"requirejs": "2.1.x",
35+
"wiredep": "1.8.x"
3536
},
3637
"scripts": {},
3738
"repository": {

test/bower_overrides.json

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
{
2+
"jquery-simulate": {
3+
"main": "jquery.simulate.js",
4+
"dependencies": {
5+
"jquery": ""
6+
}
7+
},
8+
"angular": {
9+
"dependencies": {
10+
"jquery": ""
11+
}
12+
}
13+
}

test/karma.conf.js

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,16 @@
44
'use strict';
55

66
module.exports = function(config) {
7+
var wiredep = require('wiredep');
8+
9+
var fs = require('fs');
10+
var bowerOverrides = JSON.parse(fs.readFileSync('./test/bower_overrides.json'));
11+
12+
var devJSDependencies = wiredep({
13+
devDependencies: true,
14+
overrides: bowerOverrides
15+
}).js;
16+
717
config.set({
818

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

1626

1727
// list of files / patterns to load in the browser
18-
files: [
19-
'bower_components/jquery/dist/jquery.js',
20-
'bower_components/jquery-simulate/jquery.simulate.js',
28+
files: devJSDependencies.concat([
2129
'test/libs/jquery.simulate.dragandrevert.js',
22-
'bower_components/jquery-ui/ui/jquery-ui.js',
23-
'bower_components/angular/angular.js',
24-
'bower_components/angular-mocks/angular-mocks.js',
2530
'src/sortable.js',
2631
'test/sortable.test-helper.js',
2732
'test/sortable.test-directives.js',
2833
'test/*.spec.js'
29-
],
34+
]),
3035

3136

3237
// list of files to exclude

0 commit comments

Comments
 (0)