guard-jasmine 1.16.0 → 1.17.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 53193032b63dd7b6271957ed84d4f210e480c555
-  data.tar.gz: 397ee318b045ae2c7afb655bf16024a4e3e05d34
+  metadata.gz: 60fc1ca74efcf8df719d1d9943044e0ad59d51a3
+  data.tar.gz: 24ef532486b920209d34741b4c7bce58b5ef8c53
 SHA512:
-  metadata.gz: f6eaa3b8cd54eaa1630ca2725faa439210b717e5716db767f99b0d94c34bb53672e73776404210f6f8d54d73a7d07f38d0491f8f42d8bae3f25a35e193950a6f
-  data.tar.gz: a35aeebd262c0c02d6cbd588bb2d27222986a0e6133ec0cf5907a19c7ad87276e7a1ec606a7de8171e902266f81ef4ae09ed258861fc048522dd0a53f22cc317
+  metadata.gz: d62f8ea0aed0bbd2e856c1c7a9cf50fb43b9d8f9a92ca7a936a74136b7011c72b185955ccda13e07f9eadc4939c6eef02cda1278d71b6128dafa916116f725d5
+  data.tar.gz: b5466cd09a10167866e6fa4c9ee439cb7afee8c420799b7747e182003b64faab1c910af3ba8e8165bfe06cf4213364ce64b616794088c3374ed9d5352c8fa059

data/README.md

@@ -643,9 +643,9 @@ Options:
                                         # Default: spec/javascripts
   -u, [--url=URL]                       # The url of the Jasmine test runner_options
                                         # Default: nil
-  -t, [--timeout=N]                     # The maximum time in milliseconds to wait for the spec
+  -t, [--timeout=N]                     # The maximum time in seconds to wait for the spec
                                         # runner to finish
-                                        # Default: 10000
+                                        # Default: 10
       [--console=CONSOLE]               # Whether to show console.log statements in the spec runner,
                                         # either `always`, `never` or `failure`
                                         # Default: failure

data/lib/guard/jasmine.rb

@@ -25,6 +25,7 @@ module Guard
       server:                   :auto,
       server_env:               ENV['RAILS_ENV'] || 'development',
       server_timeout:           60,
+      server_mount:             '/jasmine',
       port:                     nil,
       rackup_config:            nil,
       jasmine_url:              nil,
@@ -91,7 +92,7 @@ module Guard
       options[:port]        ||= Jasmine.find_free_server_port
       options[:server]      ||= :auto
       options[:server]        = ::Guard::Jasmine::Server.detect_server(options[:spec_dir]) if options[:server] == :auto
-      options[:jasmine_url]   = "http://localhost:#{ options[:port] }#{ options[:server] == :jasmine_gem ? '/' : '/jasmine' }" unless options[:jasmine_url]
+      options[:jasmine_url]   = "http://localhost:#{ options[:port] }#{ options[:server] == :jasmine_gem ? '/' : options[:server_mount] }" unless options[:jasmine_url]
       options[:specdoc]       = :failure if ![:always, :never, :failure].include? options[:specdoc]
       options[:phantomjs_bin] = Jasmine.which('phantomjs') unless options[:phantomjs_bin]
 

data/lib/guard/jasmine/cli.rb

@@ -170,6 +170,8 @@ module Guard
         runner_options[:hide_success]             = true
         runner_options[:max_error_notify]         = 0
 
+        ::Guard::UI.options = ::Guard::UI.options.merge({ :template => ':message' })
+
         paths = [runner_options[:spec_dir]] if paths.empty?
 
         if CLI.phantomjs_bin_valid?(runner_options[:phantomjs_bin])

data/lib/guard/jasmine/phantomjs/guard-jasmine.coffee

@@ -5,7 +5,7 @@ phantom.injectJs 'lib/result.js'
 # Set default values
 options =
   url: phantom.args[0] || 'http://127.0.0.1:3000/jasmine'
-  timeout: parseInt(phantom.args[1] || 5000)
+  timeout: parseInt(phantom.args[1] || 10000)
   specdoc: phantom.args[2] || 'failure'
   focus: /true/i.test phantom.args[3]
   console: phantom.args[4] || 'failure'
@@ -53,75 +53,92 @@ page.onInitialized = ->
   page.evaluate ->
     # Attach the console reporter when the document is ready.
     window.onload = ->
+      window.onload = null
       window.resultReceived = false
       window.reporter = new ConsoleReporter()
-      jasmine.getEnv().addReporter(window.reporter)
+      if window.jasmine
+        jasmine.getEnv().addReporter(window.reporter)
 
 # Open web page and run the Jasmine test runner
 #
 page.open options.url, (status) ->
   # Avoid that a failed iframe load breaks the runner, see https://github.com/netzpirat/guard-jasmine/pull/19
   page.onLoadFinished = ->
-
   if status isnt 'success'
     console.log JSON.stringify({ error: "Unable to access Jasmine specs at #{ options.url }" })
     phantom.exit()
   else
-    runnerAvailable = page.evaluate -> window.jasmine
+    waitFor jasmineReady, jasmineAvailable, options.timeout, jasmineMissing
 
-    if runnerAvailable
-      done = -> phantom.exit()
-      waitFor specsReady, done, options.timeout
-    else
-      text = page.evaluate -> document.getElementsByTagName('body')[0]?.innerText
 
-      if text
-        error = """
-                The Jasmine reporter is not available!
+# Test if the jasmine has been loaded
+#
+jasmineReady = ->
+  page.evaluate -> window.jasmine
 
-                #{ text }
-                """
-        console.log JSON.stringify({ error: error })
-      else
-        console.log JSON.stringify({ error: 'The Jasmine reporter is not available!' })
+# Start specs after they are have been loaded
+#
+jasmineAvailable = ->
+  waitFor specsReady, specsDone, options.timeout, specsTimedout
 
-      phantom.exit(1)
+# Error message for when jasmine never loaded asynchronously
+#
+jasmineMissing = ->
+  text = page.evaluate -> document.getElementsByTagName('body')[0]?.innerText
+
+  if text
+    error = """
+            The Jasmine reporter is not available!
+
+            #{ text }
+            """
+    console.log JSON.stringify({ error: error })
+  else
+    console.log JSON.stringify({ error: 'The Jasmine reporter is not available!' })
 
 # Test if the specs have finished.
 #
 specsReady = ->
   page.evaluate -> window.resultReceived
 
+# Error message for when specs time out
+#
+specsTimedout = ->
+  text = page.evaluate -> document.getElementsByTagName('body')[0]?.innerText
+  if text
+    error = """
+            Timeout waiting for the Jasmine test results!
+
+            #{ text }
+            """
+    console.log JSON.stringify({ error: error })
+  else
+    console.log JSON.stringify({ error: 'Timeout for the Jasmine test results!' })
+
+specsDone = ->
+  phantom.exit()
+
 # Wait until the test condition is true or a timeout occurs.
 #
 # @param [Function] test the test that returns true if condition is met
 # @param [Function] ready the action when the condition is fulfilled
 # @param [Number] timeout the max amount of time to wait in milliseconds
 #
-waitFor = (test, ready, timeout = 5000) ->
-    start = new Date().getTime()
-    condition = false
+waitFor = (test, ready, timeout = 10000, timeoutFunction) ->
+  start = Date.now()
+  condition = false
+  interval = undefined
+
+  wait = ->
+    if (Date.now() - start < timeout) and not condition
+      condition = test()
+    else
+      clearInterval interval
 
-    wait = ->
-      if (new Date().getTime() - start < timeout) and not condition
-        condition = test()
+      if condition
+        ready()
       else
-        if not condition
-          text = page.evaluate -> document.getElementsByTagName('body')[0]?.innerText
-
-          if text
-            error = """
-                    Timeout waiting for the Jasmine test results!
-
-                    #{ text }
-                    """
-            console.log JSON.stringify({ error: error })
-          else
-            console.log JSON.stringify({ error: 'Timeout waiting for the Jasmine test results!' })
-
-          phantom.exit(1)
-        else
-          ready()
-          clearInterval interval
+        timeoutFunction()
+        phantom.exit(1)
 
-    interval = setInterval wait, 250
+  interval = setInterval wait, 250

data/lib/guard/jasmine/phantomjs/guard-jasmine.js

@@ -1,11 +1,11 @@
 (function() {
-  var currentSpecId, errors, logs, options, page, specsReady, waitFor;
+  var currentSpecId, errors, jasmineAvailable, jasmineMissing, jasmineReady, logs, options, page, specsDone, specsReady, specsTimedout, waitFor;
 
   phantom.injectJs('lib/result.js');
 
   options = {
     url: phantom.args[0] || 'http://127.0.0.1:3000/jasmine',
-    timeout: parseInt(phantom.args[1] || 5000),
+    timeout: parseInt(phantom.args[1] || 10000),
     specdoc: phantom.args[2] || 'failure',
     focus: /true/i.test(phantom.args[3]),
     console: phantom.args[4] || 'failure',
@@ -32,6 +32,7 @@
 
   page.onConsoleMessage = function(msg, line, source) {
     var result;
+
     if (/^RUNNER_END$/.test(msg)) {
       result = page.evaluate(function() {
         return window.reporter.runnerResult;
@@ -53,15 +54,17 @@
     page.injectJs('lib/reporter.js');
     return page.evaluate(function() {
       return window.onload = function() {
+        window.onload = null;
         window.resultReceived = false;
         window.reporter = new ConsoleReporter();
-        return jasmine.getEnv().addReporter(window.reporter);
+        if (window.jasmine) {
+          return jasmine.getEnv().addReporter(window.reporter);
+        }
       };
     });
   };
 
   page.open(options.url, function(status) {
-    var done, error, runnerAvailable, text;
     page.onLoadFinished = function() {};
     if (status !== 'success') {
       console.log(JSON.stringify({
@@ -69,71 +72,89 @@
       }));
       return phantom.exit();
     } else {
-      runnerAvailable = page.evaluate(function() {
-        return window.jasmine;
-      });
-      if (runnerAvailable) {
-        done = function() {
-          return phantom.exit();
-        };
-        return waitFor(specsReady, done, options.timeout);
-      } else {
-        text = page.evaluate(function() {
-          var _ref;
-          return (_ref = document.getElementsByTagName('body')[0]) != null ? _ref.innerText : void 0;
-        });
-        if (text) {
-          error = "The Jasmine reporter is not available!\n\n" + text;
-          console.log(JSON.stringify({
-            error: error
-          }));
-        } else {
-          console.log(JSON.stringify({
-            error: 'The Jasmine reporter is not available!'
-          }));
-        }
-        return phantom.exit(1);
-      }
+      return waitFor(jasmineReady, jasmineAvailable, options.timeout, jasmineMissing);
     }
   });
 
+  jasmineReady = function() {
+    return page.evaluate(function() {
+      return window.jasmine;
+    });
+  };
+
+  jasmineAvailable = function() {
+    return waitFor(specsReady, specsDone, options.timeout, specsTimedout);
+  };
+
+  jasmineMissing = function() {
+    var error, text;
+
+    text = page.evaluate(function() {
+      var _ref;
+
+      return (_ref = document.getElementsByTagName('body')[0]) != null ? _ref.innerText : void 0;
+    });
+    if (text) {
+      error = "The Jasmine reporter is not available!\n\n" + text;
+      return console.log(JSON.stringify({
+        error: error
+      }));
+    } else {
+      return console.log(JSON.stringify({
+        error: 'The Jasmine reporter is not available!'
+      }));
+    }
+  };
+
   specsReady = function() {
     return page.evaluate(function() {
       return window.resultReceived;
     });
   };
 
-  waitFor = function(test, ready, timeout) {
+  specsTimedout = function() {
+    var error, text;
+
+    text = page.evaluate(function() {
+      var _ref;
+
+      return (_ref = document.getElementsByTagName('body')[0]) != null ? _ref.innerText : void 0;
+    });
+    if (text) {
+      error = "Timeout waiting for the Jasmine test results!\n\n" + text;
+      return console.log(JSON.stringify({
+        error: error
+      }));
+    } else {
+      return console.log(JSON.stringify({
+        error: 'Timeout for the Jasmine test results!'
+      }));
+    }
+  };
+
+  specsDone = function() {
+    return phantom.exit();
+  };
+
+  waitFor = function(test, ready, timeout, timeoutFunction) {
     var condition, interval, start, wait;
+
     if (timeout == null) {
-      timeout = 5000;
+      timeout = 10000;
     }
-    start = new Date().getTime();
+    start = Date.now();
     condition = false;
+    interval = void 0;
     wait = function() {
-      var error, text;
-      if ((new Date().getTime() - start < timeout) && !condition) {
+      if ((Date.now() - start < timeout) && !condition) {
         return condition = test();
       } else {
-        if (!condition) {
-          text = page.evaluate(function() {
-            var _ref;
-            return (_ref = document.getElementsByTagName('body')[0]) != null ? _ref.innerText : void 0;
-          });
-          if (text) {
-            error = "Timeout waiting for the Jasmine test results!\n\n" + text;
-            console.log(JSON.stringify({
-              error: error
-            }));
-          } else {
-            console.log(JSON.stringify({
-              error: 'Timeout waiting for the Jasmine test results!'
-            }));
-          }
-          return phantom.exit(1);
+        clearInterval(interval);
+        if (condition) {
+          return ready();
         } else {
-          ready();
-          return clearInterval(interval);
+          timeoutFunction();
+          return phantom.exit(1);
         }
       }
     };

data/lib/guard/jasmine/phantomjs/lib/console.js

@@ -3,32 +3,37 @@
     __slice = [].slice;
 
   Console = (function() {
-
     function Console(console) {
       var log;
+
       log = console.log;
       console.log = function() {
         var args;
+
         args = 1 <= arguments.length ? __slice.call(arguments, 0) : [];
         return log.call(console, Console.format.apply(Console, args));
       };
       console.info = function() {
         var args;
+
         args = 1 <= arguments.length ? __slice.call(arguments, 0) : [];
         return log.call(console, "INFO: " + (Console.format.apply(Console, args)));
       };
       console.warn = function() {
         var args;
+
         args = 1 <= arguments.length ? __slice.call(arguments, 0) : [];
         return log.call(console, "WARN: " + (Console.format.apply(Console, args)));
       };
       console.error = function() {
         var args;
+
         args = 1 <= arguments.length ? __slice.call(arguments, 0) : [];
         return log.call(console, "ERROR: " + (Console.format.apply(Console, args)));
       };
       console.debug = function() {
         var args;
+
         args = 1 <= arguments.length ? __slice.call(arguments, 0) : [];
         return log.call(console, "DEBUG: " + (Console.format.apply(Console, args)));
       };
@@ -39,6 +44,7 @@
     Console.format = function() {
       var arg, args, result, _i, _len,
         _this = this;
+
       args = 1 <= arguments.length ? __slice.call(arguments, 0) : [];
       result = [];
       if (typeof args[0] === 'string' && /%[sdifo]/gi.test(args[0])) {
@@ -56,6 +62,7 @@
 
     Console.inspect = function(object, type) {
       var match, result;
+
       switch (type) {
         case '%s':
           result = String(object);
@@ -93,6 +100,7 @@
 
     Console.pp = function(object, depth) {
       var key, result, type, value, _i, _len;
+
       if (depth == null) {
         depth = 0;
       }

data/lib/guard/jasmine/phantomjs/lib/reporter.js

@@ -2,7 +2,6 @@
   var ConsoleReporter;
 
   ConsoleReporter = (function() {
-
     function ConsoleReporter() {}
 
     ConsoleReporter.prototype.runnerResult = {
@@ -27,6 +26,7 @@
 
     ConsoleReporter.prototype.reportSpecResults = function(spec) {
       var messages, result, specResult, _base, _i, _len, _name, _ref;
+
       if (!spec.results().skipped) {
         specResult = {
           id: spec.id,
@@ -52,6 +52,7 @@
 
     ConsoleReporter.prototype.reportSuiteResults = function(suite) {
       var parent, suiteResult, _base, _ref;
+
       if (!suite.results().skipped) {
         suiteResult = {
           id: suite.id,
@@ -77,6 +78,7 @@
 
     ConsoleReporter.prototype.reportRunnerResults = function(runner) {
       var end, runtime;
+
       runtime = (new Date().getTime() - this.startTime) / 1000;
       this.runnerResult['passed'] = runner.results().failedCount === 0;
       this.runnerResult['stats'] = {
@@ -99,6 +101,7 @@
 
     ConsoleReporter.prototype.addNestedSuites = function(suiteResult) {
       var suite, _i, _len, _ref, _results;
+
       if (this.nestedSuiteResults[suiteResult.id]) {
         _ref = this.nestedSuiteResults[suiteResult.id];
         _results = [];
@@ -113,6 +116,7 @@
 
     ConsoleReporter.prototype.removeEmptySuites = function(suiteResult) {
       var suite, suites, _i, _len, _ref;
+
       suites = [];
       _ref = suiteResult.suites;
       for (_i = 0, _len = _ref.length; _i < _len; _i++) {

data/lib/guard/jasmine/phantomjs/lib/result.js

@@ -1,9 +1,7 @@
-// Generated by CoffeeScript 1.3.3
 (function() {
   var Result;
 
   Result = (function() {
-
     function Result(result, logs, errors, options) {
       this.result = result;
       this.logs = logs != null ? logs : {};
@@ -13,8 +11,10 @@
 
     Result.prototype.addLogs = function(suite) {
       var id, s, spec;
+
       suite.suites = (function() {
         var _i, _len, _ref, _results;
+
         _ref = suite.suites;
         _results = [];
         for (_i = 0, _len = _ref.length; _i < _len; _i++) {
@@ -26,6 +26,7 @@
       if (suite.specs) {
         suite.specs = (function() {
           var _i, _len, _ref, _results;
+
           _ref = suite.specs;
           _results = [];
           for (_i = 0, _len = _ref.length; _i < _len; _i++) {
@@ -46,8 +47,10 @@
 
     Result.prototype.addErrors = function(suite) {
       var id, s, spec;
+
       suite.suites = (function() {
         var _i, _len, _ref, _results;
+
         _ref = suite.suites;
         _results = [];
         for (_i = 0, _len = _ref.length; _i < _len; _i++) {
@@ -59,6 +62,7 @@
       if (suite.specs) {
         suite.specs = (function() {
           var _i, _len, _ref, _results;
+
           _ref = suite.specs;
           _results = [];
           for (_i = 0, _len = _ref.length; _i < _len; _i++) {
@@ -77,8 +81,9 @@
       return suite;
     };
 
-    Result.prototype.addGlobalErrors = function(suite) {
+    Result.prototype.addGlobalError = function(suite) {
       var b, err, errMsg, globalErrors, noSpecs, noSuites, _i, _len, _ref;
+
       noSuites = !suite.suites || suite.suites.length === 0;
       noSpecs = !suite.specs || suite.specs.length === 0;
       globalErrors = this.errors[-1] && this.errors[-1].length !== 0;
@@ -97,8 +102,10 @@
 
     Result.prototype.cleanResult = function(suite) {
       var s, spec, _i, _len, _ref;
+
       suite.suites = (function() {
         var _i, _len, _ref, _results;
+
         _ref = suite.suites;
         _results = [];
         for (_i = 0, _len = _ref.length; _i < _len; _i++) {
@@ -125,7 +132,7 @@
       }
       if (this.options.errors !== 'never') {
         this.addErrors(this.result);
-        this.addGlobalErrors(this.result);
+        this.addGlobalError(this.result);
       }
       this.cleanResult(this.result);
       return this.result;

data/lib/guard/jasmine/version.rb

@@ -1,6 +1,6 @@
 module Guard
   module JasmineVersion
     # Guard::Jasmine version that is used for the Gem specification
-    VERSION = '1.16.0'
+    VERSION = '1.17.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: guard-jasmine
 version: !ruby/object:Gem::Version
-  version: 1.16.0
+  version: 1.17.0
 platform: ruby
 authors:
 - Michael Kessler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-27 00:00:00.000000000 Z
+date: 2013-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: guard
@@ -148,7 +148,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: guard-jasmine
-rubygems_version: 2.0.3
+rubygems_version: 2.0.2
 signing_key: 
 specification_version: 4
 summary: Guard gem for headless testing with Jasmine