js-test-server 0.2.6 → 0.2.7

data/CHANGES

@@ -1,3 +1,11 @@
+0.2.7
+- Fixed issue where Jasmine Runner hangs when there is no window.console
+- Fixed selenium runner for Jasmine.
+
+0.2.6
+- All js files are loaded, instead of *_spec.js.
+
+0.2.5
 - Renamed JsTestServer::Representations to JsTestServer::Views
 - Added JsTestServer::Views::Spec.project_js_files and .project_css_files
 - Updated to erector 0.6.7, which fixes a bug related to including modules into Views.
@@ -29,4 +37,4 @@
 - Added JsTestCore::WebRoot.dispatch_specs and .dispatch_strategy
 - Extracted JsTestCore::Resources::Specs::SpecDir
 - Extracted JsTestCore::Resources::Specs::SpecFile
-- No longer depending on Guid. The child libraries are responsible for obtaining the Selenium session_id from the client by using top.runOptions.getSessionId().
+- No longer depending on Guid. The child libraries are responsible for obtaining the Selenium session_id from the client by using top.runOptions.getSessionId().

data/Rakefile

@@ -28,7 +28,7 @@ def run_suite
 end
 
 PKG_NAME = "js-test-server"
-PKG_VERSION = "0.2.6"
+PKG_VERSION = "0.2.7"
 PKG_FILES = FileList[
   '[A-Z]*',
   '*.rb',

data/lib/js_test_server/client/runner.rb

@@ -96,9 +96,10 @@ module JsTestServer
       end
 
       def poll
-        raw_status = selenium_client.get_eval("window.JsTestServer.status()")
+        raw_status = selenium_client.get_eval("window.JsTestServer ? window.JsTestServer.status() : ''")
         unless raw_status.to_s == ""
           @current_status = JSON.parse(raw_status)
+#          puts "#{__FILE__}:#{__LINE__} #{console.inspect}"
         end
       end
 
@@ -126,4 +127,4 @@ module JsTestServer
       end
     end
   end
-end
+end

data/lib/js_test_server/server/resources/spec_file.rb

@@ -14,7 +14,7 @@ class JsTestServer::Server::Resources::SpecFile < JsTestServer::Server::Resource
   def do_get
     if ::File.exists?(absolute_path)
       if ::File.directory?(absolute_path)
-        spec_files = ::Dir["#{absolute_path}/**/*_spec.js"].map do |file|
+        spec_files = ::Dir["#{absolute_path}/**/*.js"].map do |file|
           ["#{relative_path}#{file.gsub(absolute_path, "")}"]
         end
         get_generated_spec(absolute_path, spec_files)
@@ -44,4 +44,4 @@ class JsTestServer::Server::Resources::SpecFile < JsTestServer::Server::Resource
   def absolute_path
     @absolute_path ||= ::File.expand_path("#{spec_path}#{relative_path.gsub(%r{^/specs}, "")}")
   end
-end
+end

data/lib/js_test_server/server/views/page.html.rb

@@ -26,6 +26,14 @@ class JsTestServer::Server::Views::Page < Erector::Widget
     yield(self)
   end
 
+  def javascript(params={})
+    if params[:src]
+      script({:type => "text/javascript"}.merge(params))
+    else
+      super
+    end
+  end
+
   def path
     helpers.rack_request.path_info
   end

data/lib/js_test_server/server/views/suites/jasmine.html.rb

@@ -12,9 +12,7 @@ class JsTestServer::Server::Views::Suites::Jasmine < JsTestServer::Server::Views
     link :rel => "stylesheet", :href => "/framework/jasmine.css"
     project_css_files
     spec_script_elements
-    script <<-JS
-      JsTestServer.JasmineDriver.init();
-    JS
+    javascript "JsTestServer.JasmineDriver.init();"
 
   end
 
@@ -29,4 +27,4 @@ class JsTestServer::Server::Views::Suites::Jasmine < JsTestServer::Server::Views
   def body_content
     div :id => "jasmine_content"
   end
-end
+end

data/public/js_test_server.js

@@ -1,8 +1,6 @@
 (function() {
   function JsTestServer() {
   }
-
-  ;
   window.JsTestServer = JsTestServer;
 
   JsTestServer.status = function() {
@@ -20,7 +18,6 @@
     for (var attribute in attributes) {
       html += (" " + attribute + "='" + attributes[attribute]) + "'";
     }
-    ;
     html += "></";
     html += name;
     html += ">";

data/public/js_test_server/jasmine_driver.js

@@ -2,61 +2,62 @@ JsTestServer.JasmineDriver = {};
 
 JsTestServer.JasmineDriver.init = function() {
   JsTestServer.JasmineDriver.instance = new JsTestServer.JasmineDriver.Instance();
-  JsTestServer.JasmineDriver.instance.start();
+  JsTestServer.JasmineDriver.instance.init();
+  JsTestServer.JasmineDriver.instance.startJasmine();
 };
 
 JsTestServer.JasmineDriver.Instance = function() {
 };
 
 (function(Instance) {
-  var jsTestServerConsole = "";
-  var reporter;
+  var jsTestServerReporter;
 
-  Instance.prototype.start = function() {
-    this.addJasmineReporter();
+  Instance.prototype.init = function() {
     this.defineStatusMethod();
-    this.startJasmine();
-  };
-
-  Instance.prototype.addJasmineReporter = function() {
-    reporter = new JsTestServer.JasmineDriver.Reporter();
-    jasmine.getEnv().addReporter(reporter);
   };
 
   Instance.prototype.defineStatusMethod = function() {
     JsTestServer.status = function() {
       var runnerState;
-      if(jasmine.getEnv().currentRunner.finished) {
-        if(jasmine.getEnv().currentRunner.getResults().failedCount == 0) {
-          runnerState = "passed";
-        } else {
-          runnerState = "failed";
-        }
-      } else {
-        runnerState = "running";
-      }
+      var jasmineEnv = jasmine.getEnv();
+      jasmineEnv.reporter.log("jsTestServerReporter.finished: " + jsTestServerReporter.finished)
 
       return JsTestServer.JSON.stringify({
-        "runner_state": runnerState,
-        "console": jsTestServerConsole
+        "runner_state": jsTestServerReporter.runnerState,
+        "console": jsTestServerReporter.console
       });
     };
   };
 
   Instance.prototype.startJasmine = function() {
     var jasmineEnv = jasmine.getEnv();
-    var jsApiReporter = new jasmine.JsApiReporter();
-    jasmineEnv.addReporter(jsApiReporter);
+    jsTestServerReporter = new JsTestServer.JasmineDriver.Reporter();
+    jasmineEnv.addReporter(jsTestServerReporter);
+    jasmineEnv.addReporter(new jasmine.JsApiReporter());
+    jasmine.TrivialReporter.prototype.log = function() {
+      if (window.console && window.console.log) window.console.log.apply(window.console, arguments);
+    };
     jasmineEnv.addReporter(new jasmine.TrivialReporter());
+
     window.onload = function() {
       jasmineEnv.execute();
-    };
+    }
   };
 
   JsTestServer.JasmineDriver.Reporter = function() {
+    this.console = "";
+    this.finished = false;
+    this.runnerState = "running";
   };
   JsTestServer.JasmineDriver.Reporter.prototype.log = function(str) {
-    jsTestServerConsole += str;
-    jsTestServerConsole += "\n";
+    this.console += (str + "\n");
   };
+  JsTestServer.JasmineDriver.Reporter.prototype.reportRunnerResults = function(runner) {
+    this.finished = true;
+    if (runner.results().failedCount == 0) {
+      this.runnerState = "passed";
+    } else {
+      this.runnerState = "failed";
+    }
+  }
 })(JsTestServer.JasmineDriver.Instance);

data/spec/functional/jasmine/jasmine_functional_spec.rb

@@ -3,7 +3,7 @@ require File.expand_path("#{File.dirname(__FILE__)}/../functional_spec_helper")
 describe JsTestServer do
   start_servers("jasmine")
   attr_reader :stdout, :request
-  
+
   before do
     @stdout = StringIO.new
     JsTestServer::Client.const_set(:STDOUT, stdout)

data/spec/unit/js_test_core/client/runner_spec.rb

@@ -36,19 +36,19 @@ module JsTestServer
                 mock.proxy(driver).start.ordered
                 mock.proxy(driver).open("/specs").ordered
 
-                mock.strong(driver).get_eval("window.JsTestServer.status()") do
+                mock.strong(driver).get_eval("window.JsTestServer ? window.JsTestServer.status() : ''") do
                   {"runner_state" => RUNNING_RUNNER_STATE, "console" => ""}.to_json
                 end
 
-                mock.strong(driver).get_eval("window.JsTestServer.status()") do
+                mock.strong(driver).get_eval("window.JsTestServer ? window.JsTestServer.status() : ''") do
                   {"runner_state" => RUNNING_RUNNER_STATE, "console" => ".."}.to_json
                 end
 
-                mock.strong(driver).get_eval("window.JsTestServer.status()") do
+                mock.strong(driver).get_eval("window.JsTestServer ? window.JsTestServer.status() : ''") do
                   {"runner_state" => RUNNING_RUNNER_STATE, "console" => "...F."}.to_json
                 end
 
-                mock.strong(driver).get_eval("window.JsTestServer.status()") do
+                mock.strong(driver).get_eval("window.JsTestServer ? window.JsTestServer.status() : ''") do
                   {"runner_state" => FAILED_RUNNER_STATE, "console" => "...F..\n\nFailure\n/specs/foo_spec.js"}.to_json
                 end
 
@@ -61,19 +61,19 @@ module JsTestServer
                 mock.proxy(driver).start.ordered
                 mock.proxy(driver).open("/specs").ordered
 
-                mock.strong(driver).get_eval("window.JsTestServer.status()") do
+                mock.strong(driver).get_eval("window.JsTestServer ? window.JsTestServer.status() : ''") do
                   {"runner_state" => RUNNING_RUNNER_STATE, "console" => ""}.to_json
                 end
 
-                mock.strong(driver).get_eval("window.JsTestServer.status()") do
+                mock.strong(driver).get_eval("window.JsTestServer ? window.JsTestServer.status() : ''") do
                   {"runner_state" => RUNNING_RUNNER_STATE, "console" => ".."}.to_json
                 end
 
-                mock.strong(driver).get_eval("window.JsTestServer.status()") do
+                mock.strong(driver).get_eval("window.JsTestServer ? window.JsTestServer.status() : ''") do
                   {"runner_state" => RUNNING_RUNNER_STATE, "console" => "....."}.to_json
                 end
 
-                mock.strong(driver).get_eval("window.JsTestServer.status()") do
+                mock.strong(driver).get_eval("window.JsTestServer ? window.JsTestServer.status() : ''") do
                   {"runner_state" => PASSED_RUNNER_STATE, "console" => "......\n\nPassed"}.to_json
                 end
 
@@ -100,19 +100,19 @@ module JsTestServer
               mock.proxy(driver).start.ordered
               mock.proxy(driver).open("/specs/path").ordered
 
-              mock.strong(driver).get_eval("window.JsTestServer.status()") do
+              mock.strong(driver).get_eval("window.JsTestServer ? window.JsTestServer.status() : ''") do
                 {"runner_state" => RUNNING_RUNNER_STATE, "console" => ""}.to_json
               end
 
-              mock.strong(driver).get_eval("window.JsTestServer.status()") do
+              mock.strong(driver).get_eval("window.JsTestServer ? window.JsTestServer.status() : ''") do
                 {"runner_state" => RUNNING_RUNNER_STATE, "console" => ".."}.to_json
               end
 
-              mock.strong(driver).get_eval("window.JsTestServer.status()") do
+              mock.strong(driver).get_eval("window.JsTestServer ? window.JsTestServer.status() : ''") do
                 {"runner_state" => RUNNING_RUNNER_STATE, "console" => "....."}.to_json
               end
 
-              mock.strong(driver).get_eval("window.JsTestServer.status()") do
+              mock.strong(driver).get_eval("window.JsTestServer ? window.JsTestServer.status() : ''") do
                 {"runner_state" => PASSED_RUNNER_STATE, "console" => "......\n\nPassed"}.to_json
               end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: js-test-server
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: false
   segments: 
   - 0
   - 2
-  - 6
-  version: 0.2.6
+  - 7
+  version: 0.2.7
 platform: ruby
 authors: 
 - Brian Takita
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-31 00:00:00 -07:00
+date: 2010-06-01 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency