update to jasmine 1.2

node-migrator-bot · May 30, 2012 · 85ebcef · 85ebcef
1 parent c1867de
commit 85ebcef
Show file tree

Hide file tree

Showing 13 changed files with 954 additions and 560 deletions.
diff --git a/test/runner-node.js b/test/runner-node.js
@@ -1,6 +1,6 @@
 var fs = require('fs');
 var requirejs = require('requirejs');
-var jasmine = require('../vendor/jasmine-1.1.0/jasmine').jasmine;
+var jasmine = require('../vendor/jasmine-1.2.0/jasmine').jasmine;
 var jasmine_console = require('../vendor/jasmine_console').jasmine_console;
 
 // configure requirejs
@@ -17,9 +17,9 @@ requirejs.config({
 global.define = require('requirejs');
 
 // make jasmine available globally like it is in the browser
-global.describe = require('../vendor/jasmine-1.1.0/jasmine').describe;
-global.it = require('../vendor/jasmine-1.1.0/jasmine').it;
-global.expect = require('../vendor/jasmine-1.1.0/jasmine').expect;
+global.describe = require('../vendor/jasmine-1.2.0/jasmine').describe;
+global.it = require('../vendor/jasmine-1.2.0/jasmine').it;
+global.expect = require('../vendor/jasmine-1.2.0/jasmine').expect;
 
 // load specs
 fs.readdirSync(__dirname+'/spec').map(function(spec) {

diff --git a/test/runner.html b/test/runner.html
@@ -2,9 +2,9 @@
 <html>
 <head>
   <title>Test Runner</title>
-  <link rel="stylesheet" type="text/css" href="../vendor/jasmine-1.1.0/jasmine.css">
-  <script src="../vendor/jasmine-1.1.0/jasmine.js"></script>
-  <script src="../vendor/jasmine-1.1.0/jasmine-html.js"></script>
+  <link rel="stylesheet" type="text/css" href="../vendor/jasmine-1.2.0/jasmine.css">
+  <script src="../vendor/jasmine-1.2.0/jasmine.js"></script>
+  <script src="../vendor/jasmine-1.2.0/jasmine-html.js"></script>
 
   <!--
     default path for modules beginning with 'app' before loading requireJS

diff --git a/test/spec/feature.js b/test/spec/feature.js
@@ -10,4 +10,4 @@ define(['skeleton'],function(skeleton) {
 
   });
 
-});
+});
diff --git a/test/spec/module.js b/test/spec/module.js
@@ -14,4 +14,4 @@ define(['skeleton'],function(skeleton) {
 
   });
 
-});
+});
diff --git a/test/spec/skeleton.js b/test/spec/skeleton.js
@@ -14,4 +14,4 @@ define(['skeleton'],function(skeleton) {
 
   });
 
-});
+});
diff --git a/vendor/jasmine-1.1.0/jasmine-html.js b/vendor/jasmine-1.1.0/jasmine-html.js