From 15ac5c24c67bbb7cf0d27a2f77a121aff0f1e7ee Mon Sep 17 00:00:00 2001
From: Thodoris Greasidis <thgreasi@gmail.com>
Date: Sun, 29 Jun 2014 20:56:11 +0300
Subject: [PATCH 1/2] chore: use wiredep  in karma tests  for resolving package
 filepaths

---
 package.json              |  3 ++-
 test/bower_overrides.json | 13 +++++++++++++
 test/karma.conf.js        | 19 ++++++++++++-------
 3 files changed, 27 insertions(+), 8 deletions(-)
 create mode 100644 test/bower_overrides.json

diff --git a/package.json b/package.json
index c501b71..2591e82 100644
--- a/package.json
+++ b/package.json
@@ -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": {
diff --git a/test/bower_overrides.json b/test/bower_overrides.json
new file mode 100644
index 0000000..3816572
--- /dev/null
+++ b/test/bower_overrides.json
@@ -0,0 +1,13 @@
+{
+  "jquery-simulate": {
+    "main": "jquery.simulate.js",
+    "dependencies": {
+      "jquery": ""
+    }
+  },
+  "angular": {
+    "dependencies": {
+      "jquery": ""
+    }
+  }
+}
diff --git a/test/karma.conf.js b/test/karma.conf.js
index f6700c2..5e50eb8 100644
--- a/test/karma.conf.js
+++ b/test/karma.conf.js
@@ -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
@@ -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

From 7ac6735afdf9afe0dd27705d0fa7f95b784e260b Mon Sep 17 00:00:00 2001
From: Thodoris Greasidis <thgreasi@gmail.com>
Date: Sun, 29 Jun 2014 21:03:59 +0300
Subject: [PATCH 2/2] chore: limit jquery-ui dependency to <1.11

This is a temporary solution till jquery-ui is marked as supported.
---
 README.md  | 2 +-
 bower.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index a166a53..d8ac8c6 100644
--- a/README.md
+++ b/README.md
@@ -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:**
diff --git a/bower.json b/bower.json
index 864f19b..9618a11 100644
--- a/bower.json
+++ b/bower.json
@@ -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",