Fix unit tests, get jquery from npm

swisnl · Oct 11, 2015 · 0375c8f · 0375c8f
1 parent 881a3ad
commit 0375c8f
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/karma.conf.js b/karma.conf.js
@@ -17,7 +17,7 @@ module.exports = function(config) {
     files: [
 
       // dependencies
-      { pattern: 'jquery-1.8.2.min.js', watched: false, served: true, included: true },
+      { pattern: 'node_modules/jquery/dist/jquery.js', watched: false, served: true, included: true },
       { pattern: 'src/jquery.ui.position.js', watched: false, served: true, included: true },
       { pattern: 'src/jquery.contextMenu.js', watched: false, served: true, included: true },
 

diff --git a/package.json b/package.json
@@ -8,7 +8,7 @@
   },
   "license": "MIT",
   "dependencies": {
-    "jquery": ">=1.8.2"
+    "jquery": "^1.8.2"
   },
   "devDependencies": {
     "dalek-browser-chrome": "0.0.11",

diff --git a/test/index.html b/test/index.html
@@ -7,10 +7,13 @@
 
     <!-- Your project file goes here -->
     <link rel="stylesheet" href="../src/jquery.contextMenu.css" type="text/css" media="screen">
-    <script type="text/javascript" src="../jquery-1.8.2.min.js"></script>
+    <script src="../node_modules/jquery/dist/jquery.js"></script>
+
     <script type="text/javascript" src="../src/jquery.ui.position.js"></script>
+
     <script type="text/javascript" src="../src/jquery.contextMenu.js"></script>
 
+
     <!-- Your tests file goes here -->
     <script type="text/javascript" src="unit/test-events.js"></script>
 </head>