Migrate specs to Mr

simonzack · Oct 30, 2013 · 4246019 · 4246019
1 parent a5233e6
commit 4246019
Show file tree

Hide file tree

Showing 7 changed files with 46 additions and 65 deletions.
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -94,7 +94,6 @@ module.exports = function (grunt) {
         }
     });
 
-    grunt.registerTask("pre-browser-test", ["clean", "globalwrap"]);
     grunt.registerTask("build", ["clean", "amdwrap", "globalwrap", "uglify"]);
     grunt.registerTask("release", ["clean", "amdwrap", "globalwrap", "uglify", "s3"]);
 };
diff --git a/package.json b/package.json
@@ -57,11 +57,11 @@
     "matcha": "~0.2.0",
     "grunt-global-wrap": "~1.1.0",
     "grunt-amd-wrap": "~1.0.0",
-    "grunt-s3": "~0.2.0-alpha.2"
+    "grunt-s3": "~0.2.0-alpha.2",
+    "mr": "~0.13.3"
   },
   "scripts": {
     "test": "jasmine-node spec && promises-aplus-tests spec/aplus-adapter",
-    "test-browser": "grunt pre-browser-test && opener spec/q-spec.html",
     "release": "grunt release",
     "benchmark": "matcha",
     "lint": "jshint q.js",

diff --git a/spec/index.html b/spec/index.html
@@ -0,0 +1,17 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <title>Jasmine Spec Runner</title>
+    <meta charset="utf-8" />
+
+    <link rel="shortcut icon" type="image/png" href="lib/jasmine-1.2.0/jasmine_favicon.png" />
+    <link rel="stylesheet" href="lib/jasmine-1.2.0/jasmine.css" />
+    <script src="lib/jasmine-1.2.0/jasmine.js"></script>
+    <script src="lib/jasmine-1.2.0/jasmine-html.js"></script>
+    <script src="../node_modules/mr/bootstrap.js" data-package=".." data-module="spec/index"></script>
+
+</head>
+
+<body>
+</body>
+</html>
diff --git a/spec/index.js b/spec/index.js
@@ -0,0 +1,17 @@
+
+require("./lib/jasmine-promise");
+require("./q-spec");
+
+var jasmineEnv = jasmine.getEnv();
+jasmineEnv.updateInterval = 1000;
+
+var htmlReporter = new jasmine.HtmlReporter();
+
+jasmineEnv.addReporter(htmlReporter);
+
+jasmineEnv.specFilter = function(spec) {
+    return htmlReporter.specFilter(spec);
+};
+
+jasmineEnv.execute();
+
diff --git a/spec/lib/jasmine-promise.js b/spec/lib/jasmine-promise.js
@@ -1,5 +1,7 @@
 "use strict";
 
+var Q = require("../../q");
+
 /**
  * Modifies the way that individual specs are run to easily test async
  * code with promises.

diff --git a/spec/q-spec.html b/spec/q-spec.html
diff --git a/spec/q-spec.js b/spec/q-spec.js
@@ -1,15 +1,11 @@
 "use strict";
 /*jshint newcap: false*/
-/*global Q: true, describe: false, it: false, expect: false, beforeEach: false,
+/*global describe: false, it: false, expect: false, beforeEach: false,
          afterEach: false, require: false, jasmine: false, waitsFor: false,
          runs: false */
 
-if (typeof Q === "undefined" && typeof require !== "undefined") {
-    // For Node compatibility.
-    global.Q = require("../q");
-    global.asap = require("asap");
-    require("./lib/jasmine-promise");
-}
+var Q = require("../q");
+var asap = require("asap");
 
 var REASON = "this is not an error, but it might show up in the console";
 
@@ -2198,12 +2194,14 @@ describe("isPromiseAlike", function () {
 
 if (typeof require === "function") {
     var domain;
+    // using (require) instead of require tricks the browser-side dependency
+    // analysis heuristic into not recognizing the dependency.
     try {
-        domain = require("domain");
+        domain = (require)("domain");
     } catch (e) { }
 
     if (domain) {
-        var EventEmitter = require("events").EventEmitter;
+        var EventEmitter = (require)("events").EventEmitter;
 
         describe("node domain support", function () {
             var d;
@@ -2489,3 +2487,4 @@ describe("unhandled rejection reporting", function () {
         expect(Q.getUnhandledReasons()).toEqual([]);
     });
 });
+