Use bower for vendor

airbrite · Jun 26, 2014 · 51cf46b · 51cf46b
1 parent 65b03e6
commit 51cf46b
Show file tree

Hide file tree

Showing 11 changed files with 34 additions and 15,965 deletions.
diff --git a/.bowerrc b/.bowerrc
@@ -0,0 +1,3 @@
+{
+  "directory": "test/vendor"
+}
diff --git a/.gitignore b/.gitignore
@@ -2,4 +2,4 @@ raw
 *.sw?
 .DS_Store
 node_modules
-bower_components
+test/vendor
diff --git a/bower.json b/bower.json
@@ -13,9 +13,13 @@
     "*.ico"
   ],
   "dependencies": {
-    "backbone": ">=1.1.2",
-    "underscore": ">=1.6.0",
-    "jquery": ">=1.11.0"
+    "backbone": "~1.1.2",
+    "underscore": "~1.6.0",
+    "jquery": "~1.11.0"
   },
-  "homepage": "https://github.com/ptshih/woodhouse.git"
-}
+  "homepage": "https://github.com/ptshih/woodhouse.git",
+  "devDependencies": {
+    "qunit-bdd": "~0.6.1",
+    "qunit": "~1.14.0"
+  }
+}
diff --git a/package.json b/package.json
@@ -25,5 +25,9 @@
     "web": "https://github.com/ptshih"
   },
   "license": "MIT",
-  "readmeFilename": "README.md"
+  "readmeFilename": "README.md",
+  "devDependencies": {
+    "karma": "^0.12.16",
+    "karma-qunit": "^0.1.3"
+  }
 }
diff --git a/test/index.html b/test/index.html
@@ -3,22 +3,18 @@
 <head>
   <meta charset="utf-8">
   <title>Woodhouse Tests</title>
-  <link rel="stylesheet" href="vendor/qunit-1.14.0.css">
+  <link rel="stylesheet" href="vendor/qunit/qunit/qunit.css">
+
+  <script src="vendor/qunit/qunit/qunit.js"></script>
+  <script src="vendor/underscore/underscore.js"></script>
+  <script src="vendor/jquery/dist/jquery.js"></script>
+  <script src="vendor/backbone/backbone.js"></script>
+  <script src="../woodhouse.js"></script>
 </head>
 <body>
-  <script src="vendor/qunit-1.14.0.js"></script>
-  <script src="vendor/underscore.js"></script>
-  <script src="vendor/backbone.js"></script>
-  <script src="vendor/jquery.js"></script>
-  <script src="../woodhouse.js"></script>
-  <script src="models.js"></script>
-  <script src="relations.js"></script>
-  <script src="events.js"></script>
-  <script src="misc.js"></script>
-  <script src="bindings.js"></script>
   <div id="qunit"></div>
-  <div id="qunit-fixture">
 
+  <div id="qunit-fixture">
     <!-- Input -->
     <input id="input" bind-val="text">
     <textarea id="textarea" bind-val="html"></textarea>
@@ -57,7 +53,6 @@
     <!-- Attr -->
     <div id="attr" bind-attr-data-attr="attr"></div>
 
-
     <!-- Each -->
     <div id="each" bind-each="each">
       <div class="each-item" bind-text="id" bind-attr-data-id="id"></div>
@@ -68,5 +63,12 @@
     </select>
 
   </div>
+
+  <!-- Tests -->
+  <script src="models.js"></script>
+  <script src="relations.js"></script>
+  <script src="events.js"></script>
+  <script src="misc.js"></script>
+  <script src="bindings.js"></script>
 </body>
-</html>
+</html>