snapdragon 0.1.1 → 0.1.2

data/lib/jasmine/lib/jasmine-core/version.rb

@@ -1,9 +1,6 @@
-#
-# DO NOT Edit this file. Canonical version of Jasmine lives in the repo's package.json. This file is generated
-# by a grunt task when the standalone release is built.
-#
 module Jasmine
   module Core
-    VERSION = "2.0.0.alpha"
+    VERSION = "1.3.1"
   end
 end
+

data/lib/snapdragon/resources/ConsoleReporter.js

@@ -1,4 +1,4 @@
-getJasmineRequireObj().ConsoleReporter = function() {
+jasmine.ConsoleReporter = function() {
   function ConsoleReporter(options) {
     var print = function(msg) { console.log(msg); },
       showColors = options.showColors || true,
@@ -9,6 +9,8 @@ getJasmineRequireObj().ConsoleReporter = function() {
       failedSpecs = [],
       pendingSpecs = [],
       pendingCount,
+      startTimestamp,
+      endTimestamp
       ansi = {
         green: '\033[32m',
         red: '\033[31m',
@@ -16,7 +18,12 @@ getJasmineRequireObj().ConsoleReporter = function() {
         none: '\033[0m'
       };
 
-    this.jasmineStarted = function() {
+    this.log = function() {
+    };
+
+    // "reportRunnerStarting",
+    this.reportRunnerStarting = function() {
+      startTimestamp = new Date().getTime();
       specCount = 0;
       failureCount = 0;
       passedCount = 0;
@@ -25,14 +32,29 @@ getJasmineRequireObj().ConsoleReporter = function() {
       printNewline();
     };
 
-    this.jasmineDone = function(options) {
-      if (pendingCount > 0) {
-        print("Pending:");
-      }
+    // "reportSuiteResults",
+    this.reportSuitResults = function() {
+    };
 
-      for (var i = 0; i < pendingSpecs.length; i++) {
-        specPendingDetails(pendingSpecs[i]);
-      }
+    // "reportSpecStarting",
+    this.reportSpecStarting = function() {
+    };
+
+    // "reportRunnerResults",
+    this.reportRunnerResults = function(options) {
+      endTimestamp = new Date().getTime();
+
+      // I have commented out the pending section below because v1.3.1 of
+      // jasmine doesn't have a concept of pending. It has a concept of
+      // skipped when you filter tests using the spec query param.
+
+      // if (pendingCount > 0) {
+      //   print("Pending:");
+      // }
+
+      // for (var i = 0; i < pendingSpecs.length; i++) {
+      //   specPendingDetails(pendingSpecs[i]);
+      // }
 
       if (failureCount > 0) {
         print("Failures:");
@@ -46,16 +68,16 @@ getJasmineRequireObj().ConsoleReporter = function() {
       var specCounts = specCount + " " + plural("example", specCount) + ", " + failureCount + " " + plural("failure", failureCount);
 
       if (pendingCount) {
-        specCounts += ", " + pendingCount + " pending";
+        specCounts += ", " + pendingCount + " skipped";
       }
       
-      var seconds = options.executionTime / 1000;
+      var seconds = (endTimestamp - startTimestamp) / 1000.0;
       print("Finished in " + seconds + " " + plural("second", seconds));
 
       if (failureCount > 0) { // have any failures
         print(colored("red", specCounts));
-      } else if (pendingCount > 0) {
-        print(colored("yellow", specCounts));
+      // } else if (pendingCount > 0) {
+      //   print(colored("yellow", specCounts));
       } else {
         print(colored("green", specCounts));
       }
@@ -63,26 +85,22 @@ getJasmineRequireObj().ConsoleReporter = function() {
       onComplete();
     };
 
-    this.specDone = function(result) {
-      if (result.status !== "disabled") {
+    // "reportSpecResults",
+    this.reportSpecResults = function(spec) {
+      var results = spec.results();
+
+      if (!results.skipped) { // not pending
         specCount++;
       }
 
-      if (result.status == "pending") {
+      if (results.skipped) { // when you filter out tests with spec query param
         pendingCount++;
-        pendingSpecs.push(result);
-        return;
-      }
-
-      if (result.status == "passed") {
+        pendingSpecs.push(spec);
+      } else if (results.passed()) { // passed
         passedCount++;
-        return;
-      }
-
-      if (result.status == "failed") {
+      } else { // failed
         failureCount++;
-        failedSpecs.push(result);
-        return;
+        failedSpecs.push(spec);
       }
     };
 
@@ -117,18 +135,19 @@ getJasmineRequireObj().ConsoleReporter = function() {
       return newArr.join("\n");
     }
 
-    function specFailureDetails(result, failure_number) {
-      print(indent(failure_number + ") " + result.fullName, 2));
+    function specFailureDetails(spec, failure_number) {
+      var results = spec.results();
+      print(indent(failure_number + ") " + spec.getFullName(), 2));
 
-      for (var i = 0; i < result.failedExpectations.length; i++) {
-        var failedExpectation = result.failedExpectations[i];
-        print(colored("red", indent(failedExpectation.message, 6)));
+      for (var i = 0; i < results.items_.length; i++) {
+        var failedExpectation = results.items_[i];
+        print(indent(colored("red", failedExpectation.message), 6));
       }
       printNewline();
     }
 
-    function specPendingDetails(result) {
-      print(indent(colored("yellow", result.fullName), 2));
+    function specPendingDetails(spec) {
+      print(indent(colored("yellow", spec.getFullName()), 2));
       printNewline();
     }
   }

data/lib/snapdragon/version.rb

@@ -1,3 +1,3 @@
 module Snapdragon
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/lib/snapdragon/views/run.erb

@@ -4,16 +4,6 @@
 
 <script type="text/javascript" src="/resources/ConsoleReporter.js"></script>
 
-<script type="text/javascript" src="/jasmine-core/boot.js"></script>
-
-<script type="text/javascript">
-  // standard jasmine code to add console reporter in the jasmine runner
-  var env = jasmine.getEnv();
-  var consoleReporterFunc = getJasmineRequireObj().ConsoleReporter();
-  var consoleReporter = new consoleReporterFunc({});
-  env.addReporter(consoleReporter);
-</script>
-
 <script type="text/javascript">
   // The implementation code the spec files being tested need
   <%= @suite.output_spec_dependencies %>
@@ -25,3 +15,36 @@
     <%= spec.read %>
   <% end %>
 </script>
+
+<script type="text/javascript">
+  (function() {
+    var jasmineEnv = jasmine.getEnv();
+    jasmineEnv.updateInterval = 1000;
+
+    var htmlReporter = new jasmine.HtmlReporter();
+
+    jasmineEnv.addReporter(htmlReporter);
+
+    var consoleReporterFunc = jasmine.ConsoleReporter();
+    var consoleReporter = new consoleReporterFunc({});
+    jasmineEnv.addReporter(consoleReporter);
+
+    jasmineEnv.specFilter = function(spec) {
+      return htmlReporter.specFilter(spec);
+    };
+
+    var currentWindowOnload = window.onload;
+
+    window.onload = function() {
+      if (currentWindowOnload) {
+        currentWindowOnload();
+      }
+      execJasmine();
+    };
+
+    function execJasmine() {
+      jasmineEnv.execute();
+    }
+
+  })();
+</script>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: snapdragon
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Andrew De Ponte
@@ -149,10 +149,9 @@ files:
 - spec/lib/snapdragon/spec_file_spec.rb
 - spec/lib/snapdragon/suite_spec.rb
 - spec/spec_helper.rb
-- lib/jasmine/lib/jasmine-core/boot/boot.js
-- lib/jasmine/lib/jasmine-core/boot.js
 - lib/jasmine/lib/jasmine-core/example/spec/PlayerSpec.js
 - lib/jasmine/lib/jasmine-core/example/spec/SpecHelper.js
+- lib/jasmine/lib/jasmine-core/example/SpecRunner.html
 - lib/jasmine/lib/jasmine-core/example/src/Player.js
 - lib/jasmine/lib/jasmine-core/example/src/Song.js
 - lib/jasmine/lib/jasmine-core/jasmine-html.js

data/lib/jasmine/lib/jasmine-core/boot.js

@@ -1,129 +0,0 @@
-/*
-Copyright (c) 2008-2013 Pivotal Labs
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-*/
-// Jasmine boot.js for browser runners - exposes external/global interface, builds the Jasmine environment and executes it.
-(function() {
-  window.jasmine = jasmineRequire.core(jasmineRequire);
-  jasmineRequire.html(jasmine);
-
-  var env = jasmine.getEnv();
-
-  var jasmineInterface = {
-    describe: function(description, specDefinitions) {
-      return env.describe(description, specDefinitions);
-    },
-
-    xdescribe: function(description, specDefinitions) {
-      return env.xdescribe(description, specDefinitions);
-    },
-
-    it: function(desc, func) {
-      return env.it(desc, func);
-    },
-
-    xit: function(desc, func) {
-      return env.xit(desc, func);
-    },
-
-    beforeEach: function(beforeEachFunction) {
-      return env.beforeEach(beforeEachFunction);
-    },
-
-    afterEach: function(afterEachFunction) {
-      return env.afterEach(afterEachFunction);
-    },
-
-    expect: function(actual) {
-      return env.expect(actual);
-    },
-
-    pending: function() {
-      return env.pending();
-    },
-
-    addMatchers: function(matchers) {
-      return env.addMatchers(matchers);
-    },
-
-    spyOn: function(obj, methodName) {
-      return env.spyOn(obj, methodName);
-    },
-
-    clock: env.clock,
-    setTimeout: env.clock.setTimeout,
-    clearTimeout: env.clock.clearTimeout,
-    setInterval: env.clock.setInterval,
-    clearInterval: env.clock.clearInterval,
-
-    jsApiReporter: new jasmine.JsApiReporter(jasmine)
-  };
-
-  if (typeof window == "undefined" && typeof exports == "object") {
-    extend(exports, jasmineInterface);
-  } else {
-    extend(window, jasmineInterface);
-  }
-
-  var queryString = new jasmine.QueryString({
-    getWindowLocation: function() { return window.location; }
-  });
-
-  // TODO: move all of catching to raise so we don't break our brains
-  var catchingExceptions = queryString.getParam("catch");
-  env.catchExceptions(typeof catchingExceptions === "undefined" ? true : catchingExceptions);
-
-  var htmlReporter = new jasmine.HtmlReporter({
-    env: env,
-    queryString: queryString,
-    onRaiseExceptionsClick: function() { queryString.setParam("catch", !env.catchingExceptions()); },
-    getContainer: function() { return document.body; },
-    createElement: function() { return document.createElement.apply(document, arguments); },
-    createTextNode: function() { return document.createTextNode.apply(document, arguments); }
-  });
-
-  env.addReporter(jasmineInterface.jsApiReporter);
-  env.addReporter(htmlReporter);
-
-  var specFilter = new jasmine.HtmlSpecFilter({
-    filterString: function() { return queryString.getParam("spec"); }
-  });
-
-  env.specFilter = function(spec) {
-    return specFilter.matches(spec.getFullName());
-  };
-
-  var currentWindowOnload = window.onload;
-
-  window.onload = function() {
-    if (currentWindowOnload) {
-      currentWindowOnload();
-    }
-    htmlReporter.initialize();
-    env.execute();
-  };
-
-  function extend(destination, source) {
-    for (var property in source) destination[property] = source[property];
-    return destination;
-  }
-
-}());

data/lib/jasmine/lib/jasmine-core/boot/boot.js

@@ -1,107 +0,0 @@
-// Jasmine boot.js for browser runners - exposes external/global interface, builds the Jasmine environment and executes it.
-(function() {
-  window.jasmine = jasmineRequire.core(jasmineRequire);
-  jasmineRequire.html(jasmine);
-
-  var env = jasmine.getEnv();
-
-  var jasmineInterface = {
-    describe: function(description, specDefinitions) {
-      return env.describe(description, specDefinitions);
-    },
-
-    xdescribe: function(description, specDefinitions) {
-      return env.xdescribe(description, specDefinitions);
-    },
-
-    it: function(desc, func) {
-      return env.it(desc, func);
-    },
-
-    xit: function(desc, func) {
-      return env.xit(desc, func);
-    },
-
-    beforeEach: function(beforeEachFunction) {
-      return env.beforeEach(beforeEachFunction);
-    },
-
-    afterEach: function(afterEachFunction) {
-      return env.afterEach(afterEachFunction);
-    },
-
-    expect: function(actual) {
-      return env.expect(actual);
-    },
-
-    pending: function() {
-      return env.pending();
-    },
-
-    addMatchers: function(matchers) {
-      return env.addMatchers(matchers);
-    },
-
-    spyOn: function(obj, methodName) {
-      return env.spyOn(obj, methodName);
-    },
-
-    clock: env.clock,
-    setTimeout: env.clock.setTimeout,
-    clearTimeout: env.clock.clearTimeout,
-    setInterval: env.clock.setInterval,
-    clearInterval: env.clock.clearInterval,
-
-    jsApiReporter: new jasmine.JsApiReporter(jasmine)
-  };
-
-  if (typeof window == "undefined" && typeof exports == "object") {
-    extend(exports, jasmineInterface);
-  } else {
-    extend(window, jasmineInterface);
-  }
-
-  var queryString = new jasmine.QueryString({
-    getWindowLocation: function() { return window.location; }
-  });
-
-  // TODO: move all of catching to raise so we don't break our brains
-  var catchingExceptions = queryString.getParam("catch");
-  env.catchExceptions(typeof catchingExceptions === "undefined" ? true : catchingExceptions);
-
-  var htmlReporter = new jasmine.HtmlReporter({
-    env: env,
-    queryString: queryString,
-    onRaiseExceptionsClick: function() { queryString.setParam("catch", !env.catchingExceptions()); },
-    getContainer: function() { return document.body; },
-    createElement: function() { return document.createElement.apply(document, arguments); },
-    createTextNode: function() { return document.createTextNode.apply(document, arguments); }
-  });
-
-  env.addReporter(jasmineInterface.jsApiReporter);
-  env.addReporter(htmlReporter);
-
-  var specFilter = new jasmine.HtmlSpecFilter({
-    filterString: function() { return queryString.getParam("spec"); }
-  });
-
-  env.specFilter = function(spec) {
-    return specFilter.matches(spec.getFullName());
-  };
-
-  var currentWindowOnload = window.onload;
-
-  window.onload = function() {
-    if (currentWindowOnload) {
-      currentWindowOnload();
-    }
-    htmlReporter.initialize();
-    env.execute();
-  };
-
-  function extend(destination, source) {
-    for (var property in source) destination[property] = source[property];
-    return destination;
-  }
-
-}());