Close GH-850: Use qunitjs through npm.

videojs · Dec 2, 2013 · 75b2171 · 75b2171
1 parent 3248bc1
commit 75b2171
Show file tree

Hide file tree

Showing 38 changed files with 12 additions and 5,253 deletions.
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -57,7 +57,7 @@ module.exports = function(grunt) {
       },
       tests: {
         src: ['build/files/combined.video.js', 'build/compiler/goog.base.js', 'src/js/exports.js', 'test/unit/*.js', '!test/unit/api.js'],
-        externs: ['src/js/media/flash.externs.js', 'test/qunit/qunit-externs.js'],
+        externs: ['src/js/media/flash.externs.js', 'test/qunit-externs.js'],
         dest: 'build/files/test.minified.video.js'
       }
     },

diff --git a/package.json b/package.json
@@ -36,7 +36,8 @@
     "grunt-contrib-less": "~0.6.4",
     "grunt-karma": "~0.4.4",
     "karma-qunit": "~0.0.2",
-    "videojs-doc-generator": "0.0.1"
+    "videojs-doc-generator": "0.0.1",
+    "qunitjs": "~1.12.0"
   },
   "testling": {
     "browsers": [

diff --git a/test/index.html b/test/index.html
@@ -8,8 +8,8 @@
   <!--<![endif]-->
 
   <!-- QUnit -->
-  <link rel="stylesheet" href="../test/qunit/qunit/qunit.css" />
-  <script src="../test/qunit/qunit/qunit.js"></script>
+  <link rel="stylesheet" href="../node_modules/qunitjs/qunit/qunit.css" />
+  <script src="../node_modules/qunitjs/qunit/qunit.js"></script>
 
   <!-- Video.js CSS -->
   <link rel="stylesheet" href="../build/files/video-js.css" type="text/css">
@@ -67,6 +67,7 @@
   <div>
     <h1 id="qunit-header">Video.js Test Suite</h1>
     <h2 id="qunit-banner"></h2>
+    <div id="qunit-testrunner-toolbar"></div>
     <h2 id="qunit-userAgent"></h2>
     <ol id="qunit-tests"></ol>
     <div id="qunit-fixture"></div>

diff --git a/test/minified-api.html b/test/minified-api.html
@@ -4,8 +4,8 @@
   <title>Video.js Test Suite</title>
 
   <!-- QUnit -->
-  <link rel="stylesheet" href="../test/qunit/qunit/qunit.css" />
-  <script src="../test/qunit/qunit/qunit.js"></script>
+  <link rel="stylesheet" href="../node_modules/qunitjs/qunit/qunit.css" />
+  <script src="../node_modules/qunitjs/qunit/qunit.js"></script>
 
   <!-- Video.js CSS -->
   <link rel="stylesheet" href="../build/files/video-js.css" type="text/css">
@@ -38,6 +38,7 @@
   <div>
     <h1 id="qunit-header">Video.js Test Suite</h1>
     <h2 id="qunit-banner"></h2>
+    <div id="qunit-testrunner-toolbar"></div>
     <h2 id="qunit-userAgent"></h2>
     <ol id="qunit-tests"></ol>
     <div id="qunit-fixture"></div>

diff --git a/test/minified.html b/test/minified.html
@@ -4,8 +4,8 @@
   <title>Video.js Test Suite</title>
 
   <!-- QUnit -->
-  <link rel="stylesheet" href="../test/qunit/qunit/qunit.css" />
-  <script src="../test/qunit/qunit/qunit.js"></script>
+  <link rel="stylesheet" href="../node_modules/qunitjs/qunit/qunit.css" />
+  <script src="../node_modules/qunitjs/qunit/qunit.js"></script>
 
   <!-- Video.js CSS -->
   <link rel="stylesheet" href="../build/files/video-js.css" type="text/css">
@@ -22,6 +22,7 @@
   <div>
     <h1 id="qunit-header">Video.js Test Suite</h1>
     <h2 id="qunit-banner"></h2>
+    <div id="qunit-testrunner-toolbar"></div>
     <h2 id="qunit-userAgent"></h2>
     <ol id="qunit-tests"></ol>
     <div id="qunit-fixture"></div>

diff --git a/test/qunit/qunit-externs.js → test/qunit-externs.js b/test/qunit/qunit-externs.js → test/qunit-externs.js
diff --git a/test/qunit/.gitignore b/test/qunit/.gitignore
diff --git a/test/qunit/README.md b/test/qunit/README.md
diff --git a/test/qunit/addons/canvas/README.md b/test/qunit/addons/canvas/README.md
diff --git a/test/qunit/addons/canvas/canvas-test.js b/test/qunit/addons/canvas/canvas-test.js
diff --git a/test/qunit/addons/canvas/canvas.html b/test/qunit/addons/canvas/canvas.html
diff --git a/test/qunit/addons/canvas/qunit-canvas.js b/test/qunit/addons/canvas/qunit-canvas.js
diff --git a/test/qunit/addons/close-enough/README.md b/test/qunit/addons/close-enough/README.md
diff --git a/test/qunit/addons/close-enough/close-enough-test.js b/test/qunit/addons/close-enough/close-enough-test.js
diff --git a/test/qunit/addons/close-enough/close-enough.html b/test/qunit/addons/close-enough/close-enough.html
diff --git a/test/qunit/addons/close-enough/qunit-close-enough.js b/test/qunit/addons/close-enough/qunit-close-enough.js
diff --git a/test/qunit/addons/composite/README.md b/test/qunit/addons/composite/README.md
diff --git a/test/qunit/addons/composite/composite-demo-test.html b/test/qunit/addons/composite/composite-demo-test.html