Merge pull request canjs#722 from bitovi/qunit-cdn

Use QUnit CDN by default. Fall back to bower components if not found.
afaden · Feb 6, 2014 · d59d6a5 · d59d6a5
2 parents 0604ea9 + 7410028
commit d59d6a5
Show file tree

Hide file tree

Showing 7 changed files with 61 additions and 14 deletions.
diff --git a/test/dojo.html b/test/dojo.html
@@ -4,8 +4,8 @@
 
     <head>
         <title>Dojo Test Suite</title>
-        <link rel="stylesheet" type="text/css" href="../bower_components/qunit/qunit/qunit.css" />
         <script type="text/javascript" src="../lib/html5shiv.js"></script>
+        <link rel="stylesheet" type="text/css" href="//code.jquery.com/qunit/qunit-1.14.0.css" />
     </head>
 
     <body>
@@ -19,8 +19,15 @@ <h2 id="qunit-userAgent"></h2>
         <ol id="qunit-tests"></ol>
         <div id="qunit-test-area"></div>
         <script type="text/javascript" src="../lib/steal/steal.js"></script>
-        <script type="text/javascript" src="../bower_components/qunit/qunit/qunit.js"></script>
+        <script type="text/javascript" src="//code.jquery.com/qunit/qunit-1.14.0.js"></script>
         <script type="text/javascript">
+            if (typeof QUnit === 'undefined') {
+                document.write(unescape(
+                        '%3Clink rel="stylesheet" type="text/css" href="../bower_components/qunit/qunit/qunit.css" /%3E'));
+                document.write(unescape(
+                        '%3Cscript type="text/javascript" src="../bower_components/qunit/qunit/qunit.js" %3E%3C/script%3E'));
+            }
+
             QUnit.config.autostart = false;
 
             steal(function() {

diff --git a/test/jquery-2.html b/test/jquery-2.html
@@ -4,8 +4,8 @@
 
     <head>
         <title>jQuery (2.x) Test Suite</title>
-        <link rel="stylesheet" type="text/css" href="../bower_components/qunit/qunit/qunit.css" />
         <script type="text/javascript" src="../lib/html5shiv.js"></script>
+        <link rel="stylesheet" type="text/css" href="//code.jquery.com/qunit/qunit-1.14.0.css" />
     </head>
 
     <body>
@@ -19,8 +19,15 @@ <h2 id="qunit-userAgent"></h2>
         <ol id="qunit-tests"></ol>
         <div id="qunit-test-area"></div>
         <script type="text/javascript" src="../lib/steal/steal.js"></script>
-        <script type="text/javascript" src="../bower_components/qunit/qunit/qunit.js"></script>
+        <script type="text/javascript" src="//code.jquery.com/qunit/qunit-1.14.0.js"></script>
         <script type="text/javascript">
+            if (typeof QUnit === 'undefined') {
+                document.write(unescape(
+                        '%3Clink rel="stylesheet" type="text/css" href="../bower_components/qunit/qunit/qunit.css" /%3E'));
+                document.write(unescape(
+                        '%3Cscript type="text/javascript" src="../bower_components/qunit/qunit/qunit.js" %3E%3C/script%3E'));
+            }
+
             QUnit.config.autostart = false;
 
             steal(function() {

diff --git a/test/jquery.html b/test/jquery.html
@@ -4,8 +4,8 @@
 
     <head>
         <title>jQuery Test Suite</title>
-        <link rel="stylesheet" type="text/css" href="../bower_components/qunit/qunit/qunit.css" />
         <script type="text/javascript" src="../lib/html5shiv.js"></script>
+        <link rel="stylesheet" type="text/css" href="//code.jquery.com/qunit/qunit-1.14.0.css" />
     </head>
 
     <body>
@@ -19,8 +19,15 @@ <h2 id="qunit-userAgent"></h2>
         <ol id="qunit-tests"></ol>
         <div id="qunit-test-area"></div>
         <script type="text/javascript" src="../lib/steal/steal.js"></script>
-        <script type="text/javascript" src="../bower_components/qunit/qunit/qunit.js"></script>
+        <script type="text/javascript" src="//code.jquery.com/qunit/qunit-1.14.0.js"></script>
         <script type="text/javascript">
+            if (typeof QUnit === 'undefined') {
+                document.write(unescape(
+                        '%3Clink rel="stylesheet" type="text/css" href="../bower_components/qunit/qunit/qunit.css" /%3E'));
+                document.write(unescape(
+                        '%3Cscript type="text/javascript" src="../bower_components/qunit/qunit/qunit.js" %3E%3C/script%3E'));
+            }
+
             QUnit.config.autostart = false;
 
             steal(function() {

diff --git a/test/mootools.html b/test/mootools.html
@@ -4,8 +4,8 @@
 
     <head>
         <title>Mootools Test Suite</title>
-        <link rel="stylesheet" type="text/css" href="../bower_components/qunit/qunit/qunit.css" />
         <script type="text/javascript" src="../lib/html5shiv.js"></script>
+        <link rel="stylesheet" type="text/css" href="//code.jquery.com/qunit/qunit-1.14.0.css" />
     </head>
 
     <body>
@@ -19,8 +19,15 @@ <h2 id="qunit-userAgent"></h2>
         <ol id="qunit-tests"></ol>
         <div id="qunit-test-area"></div>
         <script type="text/javascript" src="../lib/steal/steal.js"></script>
-        <script type="text/javascript" src="../bower_components/qunit/qunit/qunit.js"></script>
+        <script type="text/javascript" src="//code.jquery.com/qunit/qunit-1.14.0.js"></script>
         <script type="text/javascript">
+            if (typeof QUnit === 'undefined') {
+                document.write(unescape(
+                        '%3Clink rel="stylesheet" type="text/css" href="../bower_components/qunit/qunit/qunit.css" /%3E'));
+                document.write(unescape(
+                        '%3Cscript type="text/javascript" src="../bower_components/qunit/qunit/qunit.js" %3E%3C/script%3E'));
+            }
+
             QUnit.config.autostart = false;
 
             steal(function() {

diff --git a/test/templates/__configuration__.html.ejs b/test/templates/__configuration__.html.ejs
@@ -2,8 +2,8 @@
 <html>
 	<head>
 		<title><%= configuration.description %> Test Suite</title>
-		<link rel="stylesheet" type="text/css" href="../bower_components/qunit/qunit/qunit.css"/>
         <script type="text/javascript" src="../lib/html5shiv.js"></script>
+        <link rel="stylesheet" type="text/css" href="//code.jquery.com/qunit/qunit-1.14.0.css"/>
 	</head>
 <body>
 	<h1 id="qunit-header"><%= configuration.description %> Test Suite</h1>
@@ -14,8 +14,13 @@
 	<div id="qunit-test-area"></div>
 
 	<script type="text/javascript" src="../lib/steal/steal.js"></script>
-	<script type="text/javascript" src="../bower_components/qunit/qunit/qunit.js"></script>
+	<script type="text/javascript" src="//code.jquery.com/qunit/qunit-1.14.0.js"></script>
 	<script type="text/javascript">
+        if (typeof QUnit === 'undefined') {
+            document.write(unescape('%3Clink rel="stylesheet" type="text/css" href="../bower_components/qunit/qunit/qunit.css" /%3E'));
+            document.write(unescape('%3Cscript type="text/javascript" src="../bower_components/qunit/qunit/qunit.js" %3E%3C/script%3E'));
+        }
+
 		QUnit.config.autostart = false;
 
         steal(function() {

diff --git a/test/yui.html b/test/yui.html
@@ -4,8 +4,8 @@
 
     <head>
         <title>YUI Test Suite</title>
-        <link rel="stylesheet" type="text/css" href="../bower_components/qunit/qunit/qunit.css" />
         <script type="text/javascript" src="../lib/html5shiv.js"></script>
+        <link rel="stylesheet" type="text/css" href="//code.jquery.com/qunit/qunit-1.14.0.css" />
     </head>
 
     <body>
@@ -19,8 +19,15 @@ <h2 id="qunit-userAgent"></h2>
         <ol id="qunit-tests"></ol>
         <div id="qunit-test-area"></div>
         <script type="text/javascript" src="../lib/steal/steal.js"></script>
-        <script type="text/javascript" src="../bower_components/qunit/qunit/qunit.js"></script>
+        <script type="text/javascript" src="//code.jquery.com/qunit/qunit-1.14.0.js"></script>
         <script type="text/javascript">
+            if (typeof QUnit === 'undefined') {
+                document.write(unescape(
+                        '%3Clink rel="stylesheet" type="text/css" href="../bower_components/qunit/qunit/qunit.css" /%3E'));
+                document.write(unescape(
+                        '%3Cscript type="text/javascript" src="../bower_components/qunit/qunit/qunit.js" %3E%3C/script%3E'));
+            }
+
             QUnit.config.autostart = false;
 
             steal(function() {

diff --git a/test/zepto.html b/test/zepto.html
@@ -4,8 +4,8 @@
 
     <head>
         <title>Zepto Test Suite</title>
-        <link rel="stylesheet" type="text/css" href="../bower_components/qunit/qunit/qunit.css" />
         <script type="text/javascript" src="../lib/html5shiv.js"></script>
+        <link rel="stylesheet" type="text/css" href="//code.jquery.com/qunit/qunit-1.14.0.css" />
     </head>
 
     <body>
@@ -19,8 +19,15 @@ <h2 id="qunit-userAgent"></h2>
         <ol id="qunit-tests"></ol>
         <div id="qunit-test-area"></div>
         <script type="text/javascript" src="../lib/steal/steal.js"></script>
-        <script type="text/javascript" src="../bower_components/qunit/qunit/qunit.js"></script>
+        <script type="text/javascript" src="//code.jquery.com/qunit/qunit-1.14.0.js"></script>
         <script type="text/javascript">
+            if (typeof QUnit === 'undefined') {
+                document.write(unescape(
+                        '%3Clink rel="stylesheet" type="text/css" href="../bower_components/qunit/qunit/qunit.css" /%3E'));
+                document.write(unescape(
+                        '%3Cscript type="text/javascript" src="../bower_components/qunit/qunit/qunit.js" %3E%3C/script%3E'));
+            }
+
             QUnit.config.autostart = false;
 
             steal(function() {