# Updated to QUnit 1.18, load it via AMD as well

af1e7f79 · Tobias Moebert · 097dfab6 · af1e7f79 · af1e7f79 · af1e7f79
Commit af1e7f79 authored 9 years ago by Tobias Moebert
--- a/libs/qunit/qunit.css
+++ b/libs/qunit/qunit.css
 /*!
- * QUnit 1.15.0
+ * QUnit 1.18.0
 * http://qunitjs.com/
 *
- * Copyright 2014 jQuery Foundation and other contributors
+ * Copyright jQuery Foundation and other contributors
 * Released under the MIT license
 * http://jquery.org/license
 *
- * Date: 2014-08-08T16:00Z
+ * Date: 2015-04-03T10:23Z
 */

 /** Font Family and Sizes */
@@ -77,6 +77,18 @@

 #qunit-modulefilter-container {
 	float: right;
+	padding: 0.2em;
+}
+
+.qunit-url-config {
+	display: inline-block;
+	padding: 0.1em;
+}
+
+.qunit-filter {
+	display: block;
+	float: right;
+	margin-left: 1em;
 }

 /** Tests: Pass/Fail */
@@ -91,19 +103,46 @@
 	list-style-position: inside;
 }

-#qunit-tests.hidepass li.pass, #qunit-tests.hidepass li.running  {
+#qunit-tests > li {
 	display: none;
 }

+#qunit-tests li.running,
+#qunit-tests li.pass,
+#qunit-tests li.fail,
+#qunit-tests li.skipped {
+	display: list-item;
+}
+
+#qunit-tests.hidepass li.running,
+#qunit-tests.hidepass li.pass {
+	visibility: hidden;
+	position: absolute;
+	width:   0px;
+	height:  0px;
+	padding: 0;
+	border:  0;
+	margin:  0;
+}
+
 #qunit-tests li strong {
 	cursor: pointer;
 }

+#qunit-tests li.skipped strong {
+	cursor: default;
+}
+
 #qunit-tests li a {
 	padding: 0.5em;
 	color: #C2CCD1;
 	text-decoration: none;
 }
+
+#qunit-tests li p a {
+	padding: 0.25em;
+	color: #6B6464;
+}
 #qunit-tests li a:hover,
 #qunit-tests li a:focus {
 	color: #000;
@@ -211,6 +250,21 @@

 #qunit-banner.qunit-fail                    { background-color: #EE5757; }

+/*** Skipped tests */
+
+#qunit-tests .skipped {
+	background-color: #EBECE9;
+}
+
+#qunit-tests .qunit-skipped-label {
+	background-color: #F4FF77;
+	display: inline-block;
+	font-style: normal;
+	color: #366097;
+	line-height: 1.8em;
+	padding: 0 0.5em;
+	margin: -0.4em 0.4em -0.4em 0;
+}

 /** Result */


--- a/libs/qunit/qunit.js
+++ b/libs/qunit/qunit.js
--- a/qunitTest/configTest.js
+++ b/qunitTest/configTest.js
@@ -8,6 +8,7 @@ requirejs.config({
        jquery: '../libs/jquery/jquery',
        easejs: '../libs/ease.js/ease-full',
        MathUuid: '../libs/uuid/Math.uuid',
+        qunit: "../libs/qunit/qunit",
        contactJS: '../dist/contactJS'
    },
    
@@ -17,10 +18,9 @@ requirejs.config({
      },
      'jquery' : {
          exports : '$'
-        },
+      },
      'MathUuid' : {
          exports : 'MathUuid'
-        }
+      }
    }
-
 });
\ No newline at end of file
--- a/qunitTest/qunitTest.html
+++ b/qunitTest/qunitTest.html
@@ -3,13 +3,12 @@
 <head>
    <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 <title>QUnit contactJS</title>
-<link rel="stylesheet" href="http://code.jquery.com/qunit/qunit-1.15.0.css">
+<link rel="stylesheet" href="http://code.jquery.com/qunit/qunit-1.18.0.css">
 </head>
 <body>
 <div id="qunit"></div>
 <div id="qunit-fixture"></div>
 <script data-main="test" src="../libs/require.js/require.js"></script>
-<script src="../libs/qunit/qunit.js"></script>
 <script src="parameterTest.js"></script>
 <script src="parameterListTest.js"></script>
 <script src="attributeTypeTest.js"></script>

--- a/qunitTest/test.js
+++ b/qunitTest/test.js
-require(['configTest'], function() {
+require(['configTest', 'qunit'], function() {
+	QUnit.start();
 	QUnit.test( "hello test", function( assert ) {
 		assert.ok( 1 == "1", "Passed!" );
 	});
-
 });