Upgraded grunt plugins and jasmine, re did tests in new format

davireis · Mar 30, 2015 · a85f8c9 · a85f8c9
1 parent 33a3161
commit a85f8c9
Show file tree

Hide file tree

Showing 22 changed files with 4,293 additions and 3,947 deletions.
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -19,7 +19,10 @@ grunt.initConfig({
 		components: {
 			src: ['jquery.dfp.js'],
 			options: {
-				vendor: ['http://code.jquery.com/jquery-1.11.0.js'],
+				vendor: [
+					'http://code.jquery.com/jquery-1.11.0.js',
+					'tests/plugins.js'
+				],
 				specs: 'tests/spec/*Spec.js'
 			}
 		}

diff --git a/jquery.dfp.min.js b/jquery.dfp.min.js
diff --git a/package.json b/package.json
@@ -1,18 +1,18 @@
 {
-	"name": "jquery.dfp",
-	"version": "2.0.0",
-	"devDependencies": {
-		"grunt": "~0.4",
-		"grunt-contrib-jshint": "~0.9",
-		"grunt-contrib-jasmine": "~0.5",
-		"grunt-contrib-uglify": "~0.4"
-	},
-	"scripts": {
-		"test": "grunt travis --verbose"
-	},
-	"repository": {
-		"type": "git",
-		"url": "https://github.com/coop182/jquery.dfp.js"
-	},
-	"main" : "jquery.dfp.js"
+    "name": "jquery.dfp",
+    "version": "2.0.0",
+    "devDependencies": {
+        "grunt": "~0.4",
+        "grunt-contrib-jasmine": "^0.8.2",
+        "grunt-contrib-jshint": "^0.11.1",
+        "grunt-contrib-uglify": "^0.8.0"
+    },
+    "scripts": {
+        "test": "grunt travis --verbose"
+    },
+    "repository": {
+        "type": "git",
+        "url": "https://github.com/coop182/jquery.dfp.js"
+    },
+    "main": "jquery.dfp.js"
 }
diff --git a/tests/SpecRunner.html b/tests/SpecRunner.html
@@ -1,15 +1,21 @@
-<!DOCTYPE HTML>
+<!DOCTYPE html>
 <html>
 <head>
-  <title>Jasmine Spec Runner</title>
+  <meta charset="utf-8">
+  <title>Jasmine Spec Runner v2.2.0</title>
 
-  <link rel="shortcut icon" type="image/png" href="lib/jasmine-1.3.1/jasmine_favicon.png">
-  <link rel="stylesheet" type="text/css" href="lib/jasmine-1.3.1/jasmine.css">
-  <script type="text/javascript" src="lib/jasmine-1.3.1/jasmine.js"></script>
-  <script type="text/javascript" src="lib/jasmine-1.3.1/jasmine-html.js"></script>
+  <link rel="shortcut icon" type="image/png" href="lib/jasmine-2.2.0/jasmine_favicon.png">
+  <link rel="stylesheet" href="lib/jasmine-2.2.0/jasmine.css">
+
+  <script src="lib/jasmine-2.2.0/jasmine.js"></script>
+  <script src="lib/jasmine-2.2.0/jasmine-html.js"></script>
+  <script src="lib/jasmine-2.2.0/boot.js"></script>
+
+  <!-- Plugins -->
+  <script type="text/javascript" src="plugins.js"></script>
 
   <!-- include source files here... -->
-	<script type="text/javascript" src="http://code.jquery.com/jquery-1.11.0.js"></script>
+  <script type="text/javascript" src="http://code.jquery.com/jquery-1.11.0.js"></script>
   <script type="text/javascript" src="../jquery.dfp.js"></script>
 
   <!-- include spec files here... -->
@@ -21,35 +27,6 @@
   <script type="text/javascript" src="spec/sizeMappingSpec.js"></script>
   <script type="text/javascript" src="spec/callBacksSpec.js"></script>
 
-  <script type="text/javascript">
-    (function() {
-      var jasmineEnv = jasmine.getEnv();
-      jasmineEnv.updateInterval = 1000;
-
-      var htmlReporter = new jasmine.HtmlReporter();
-
-      jasmineEnv.addReporter(htmlReporter);
-
-      jasmineEnv.specFilter = function(spec) {
-        return htmlReporter.specFilter(spec);
-      };
-
-      var currentWindowOnload = window.onload;
-
-      window.onload = function() {
-        if (currentWindowOnload) {
-          currentWindowOnload();
-        }
-        execJasmine();
-      };
-
-      function execJasmine() {
-        jasmineEnv.execute();
-      }
-
-    })();
-  </script>
-
 </head>
 
 <body>

diff --git a/tests/lib/jasmine-1.3.1/MIT.LICENSE b/tests/lib/jasmine-1.3.1/MIT.LICENSE