js_spec 0.3.2 → 0.3.3

data/CHANGES

@@ -1,3 +1,6 @@
+0.3.3
+- Fixed for latest version of Selenium, Rack, and Thin
+
 0.3.2
 - Fixed vendor directory not being included in the gem
 

data/Rakefile

@@ -26,7 +26,7 @@ def run_suite
 end
 
 PKG_NAME = "js_spec"
-PKG_VERSION = "0.3.2"
+PKG_VERSION = "0.3.3"
 PKG_FILES = FileList[
   '[A-Z]*',
   '*.rb',

data/core/JSSpecExtensions.js

@@ -92,20 +92,14 @@ function parse_url(url) {
 JSSpec.Logger.prototype.onRunnerEndWithoutServerNotification = JSSpec.Logger.prototype.onRunnerEnd;
 JSSpec.Logger.prototype.onRunnerEndWithServerNotification = function() {
   this.onRunnerEndWithoutServerNotification();
-  var suite_id = JSSpec.suite_id();
-  if(suite_id) {
-    var xml = window.ActiveXObject ? new ActiveXObject("Microsoft.XMLHTTP") : new XMLHttpRequest();
-    xml.open("POST", '/suites/' + suite_id + '/finish', true);
-    xml.setRequestHeader("X-Requested-With", "XMLHttpRequest");
-    xml.send("text=" + encodeURIComponent(this.get_error_message_text()));
-  }
+  var xml = window.ActiveXObject ? new ActiveXObject("Microsoft.XMLHTTP") : new XMLHttpRequest();
+  xml.open("POST", '/session/finish', true);
+  xml.setRequestHeader("X-Requested-With", "XMLHttpRequest");
+  xml.setRequestHeader("Content-Type", "application/x-www-form-urlencoded; charset=UTF-8");
+  xml.send("text=" + encodeURIComponent(this.get_error_message_text()));
 }
 JSSpec.Logger.prototype.onRunnerEnd = JSSpec.Logger.prototype.onRunnerEndWithServerNotification;
 
-JSSpec.suite_id = function() {
-  return top.runOptions ? top.runOptions.getSessionId() : 'user';
-}
-
 JSSpec.Logger.prototype.get_error_message_text = function() {
   var error_messages = [];
   for(var i=0; i < JSSpec.specs.length; i++) {

data/spec/integration/integration_spec_helper.rb

@@ -26,7 +26,7 @@ module WaitFor
   end
 end
 
-module Spec::Example::ExampleMethods
+class Spec::ExampleGroup
   include WaitFor
   attr_reader :spec_root_path, :implementation_root_path, :public_path
   before(:all) do

data/spec/spec_suite.rb

@@ -1,4 +1,3 @@
 dir = File.dirname(__FILE__)
 raise "Failure" unless system(%Q|ruby #{dir}/unit_suite.rb|)
-raise "Failure" unless system(%Q|ruby #{dir}/functional_suite.rb|)
 raise "Failure" unless system(%Q|ruby #{dir}/integration_suite.rb|)

data/spec/unit/js_test_core/resources/spec_dir_spec.rb

@@ -17,15 +17,15 @@ module JsTestCore
           end
 
           it "returns script tags for each test javascript file" do
-            doc.at("script[@src='/specs/failing_spec.js']").should exist
-            doc.at("script[@src='/specs/foo/failing_spec.js']").should exist
-            doc.at("script[@src='/specs/foo/passing_spec.js']").should exist
+            doc.at("script[@src='/specs/failing_spec.js']").should_not be_nil
+            doc.at("script[@src='/specs/foo/failing_spec.js']").should_not be_nil
+            doc.at("script[@src='/specs/foo/passing_spec.js']").should_not be_nil
           end
 
           it "returns the js specs template" do
-            doc.at("link[@href='/core/JSSpec.css']").should exist
-            doc.at("script[@src='/core/JSSpec.js']").should exist
-            doc.at("script[@src='/core/JSSpecExtensions.js']").should exist
+            doc.at("link[@href='/core/JSSpec.css']").should_not be_nil
+            doc.at("script[@src='/core/JSSpec.js']").should_not be_nil
+            doc.at("script[@src='/core/JSSpecExtensions.js']").should_not be_nil
             doc.at("body/#js_spec_content").should_not be_nil
           end
         end

data/spec/unit/js_test_core/resources/spec_file_spec.rb

@@ -17,13 +17,13 @@ module JsTestCore
           end
 
           it "returns script tags for the test javascript file" do
-            doc.at("script[@src='/specs/failing_spec.js']").should exist
+            doc.at("script[@src='/specs/failing_spec.js']").should_not be_nil
           end
 
           it "returns the screw unit template" do
-            doc.at("link[@href='/core/JSSpec.css']").should exist
-            doc.at("script[@src='/core/JSSpec.js']").should exist
-            doc.at("script[@src='/core/JSSpecExtensions.js']").should exist
+            doc.at("link[@href='/core/JSSpec.css']").should_not be_nil
+            doc.at("script[@src='/core/JSSpec.js']").should_not be_nil
+            doc.at("script[@src='/core/JSSpecExtensions.js']").should_not be_nil
             doc.at("body/#js_spec_content").should_not be_nil
           end
         end

data/spec/unit/unit_spec_helper.rb

@@ -22,7 +22,7 @@ module Spec
   end
 end
 
-class Spec::Example::ExampleGroup
+class Spec::ExampleGroup
   class << self
     def thin_logging
       @thin_logging = true if @thin_logging.nil?
@@ -31,9 +31,7 @@ class Spec::Example::ExampleGroup
 
     attr_writer :thin_logging
   end
-end
 
-module Spec::Example::ExampleMethods
   attr_reader :spec_root_path, :implementation_root_path, :public_path, :server, :connection
   before(:all) do
     dir = File.dirname(__FILE__)

data/vendor/js-test-core/CHANGES

@@ -1,3 +1,7 @@
+- Renamed Suite to Session to follow Selenium conventions
+- Renamed SuiteFinish to SessionFinish to follow Selenium conventions
+- Added /session, which uses the session_id cookie to derive the current session.
+- Added /session/finished to be used to simplify client/server interactions.
 - Remove File caching because it doesn't cause a noticable performance benefit over a local network and because it sometimes doesn't write over stale files.
 - Client accepts selenium_browser_start_command parameter, which allows the user to parameterize the selenium_browser_start_command
 - Added support for running specs in Internet Explorer via POST /runners/iexplore

data/vendor/js-test-core/lib/js_test_core/client.rb

@@ -6,7 +6,7 @@ module JsTestCore
     class InvalidStatusResponse < ClientException
     end
 
-    class SuiteNotFound < ClientException
+    class SessionNotFound < ClientException
     end
 
     class << self
@@ -44,7 +44,7 @@ module JsTestCore
       end
     end
 
-    attr_reader :parameters, :query_string, :http, :suite_start_response, :last_poll_status, :last_poll_reason, :last_poll
+    attr_reader :parameters, :query_string, :http, :session_start_response, :last_poll_status, :last_poll_reason, :last_poll
     def initialize(parameters)
       @parameters = parameters
       @query_string = SeleniumServerConfiguration.query_string_from(parameters)
@@ -53,7 +53,7 @@ module JsTestCore
     def run
       Net::HTTP.start(DEFAULT_HOST, DEFAULT_PORT) do |@http|
         start_runner
-        wait_for_suite_to_finish
+        wait_for_session_to_finish
       end
       report_result
     end
@@ -68,19 +68,22 @@ module JsTestCore
     
     protected
     def start_runner
-      @suite_start_response = http.post('/runners', query_string)
+      @session_start_response = http.post('/runners', query_string)
     end
 
-    def wait_for_suite_to_finish
-      poll while suite_not_completed?
+    def wait_for_session_to_finish
+      while session_not_completed?
+        poll
+        sleep 0.25
+      end
     end
 
     def report_result
       case last_poll_status
-      when Resources::Suite::SUCCESSFUL_COMPLETION
+      when Resources::Session::SUCCESSFUL_COMPLETION
         STDOUT.puts "SUCCESS"
         true
-      when Resources::Suite::FAILURE_COMPLETION
+      when Resources::Session::FAILURE_COMPLETION
         STDOUT.puts "FAILURE"
         STDOUT.puts last_poll_reason
         false
@@ -89,26 +92,26 @@ module JsTestCore
       end
     end
 
-    def suite_not_completed?
-      last_poll_status.nil? || last_poll_status == Resources::Suite::RUNNING
+    def session_not_completed?
+      last_poll_status.nil? || last_poll_status == Resources::Session::RUNNING
     end
 
     def poll
-      @last_poll = http.get("/suites/#{suite_id}")
-      ensure_suite_exists!
+      @last_poll = http.get("/sessions/#{session_id}")
+      ensure_session_exists!
       parts = parts_from_query(last_poll.body)
       @last_poll_status = parts['status']
       @last_poll_reason = parts['reason']
     end
 
-    def ensure_suite_exists!
+    def ensure_session_exists!
       if (400..499).include?(Integer(last_poll.code))
-        raise SuiteNotFound, "Could not find suite with id #{suite_id}"
+        raise SessionNotFound, "Could not find session with id #{session_id}"
       end
     end
 
-    def suite_id
-      @suite_id ||= parts_from_query(suite_start_response.body)['suite_id']
+    def session_id
+      @session_id ||= parts_from_query(session_start_response.body)['session_id']
     end
   end
 end

data/vendor/js-test-core/lib/js_test_core/resources.rb

@@ -6,5 +6,5 @@ require "#{dir}/resources/file_not_found"
 require "#{dir}/resources/specs/spec_file"
 require "#{dir}/resources/specs/spec_dir"
 require "#{dir}/resources/web_root"
-require "#{dir}/resources/suite"
-require "#{dir}/resources/suite_finish"
+require "#{dir}/resources/session"
+require "#{dir}/resources/session_finish"

data/vendor/js-test-core/lib/js_test_core/resources/runner.rb

@@ -18,7 +18,7 @@ module JsTestCore
         end
 
         def post
-          spec_url = rack_request['spec_url'].to_s == "" ? spec_suite_url : rack_request['spec_url']
+          spec_url = rack_request['spec_url'].to_s == "" ? full_spec_suite_url : rack_request['spec_url']
           parsed_spec_url = URI.parse(spec_url)
           selenium_host = rack_request['selenium_host'].to_s == "" ? 'localhost' : rack_request['selenium_host'].to_s
           selenium_port = rack_request['selenium_port'].to_s == "" ? 4444 : Integer(rack_request['selenium_port'])
@@ -34,17 +34,19 @@ module JsTestCore
           rescue Errno::ECONNREFUSED => e
             raise Errno::ECONNREFUSED, "Cannot connect to Selenium Server at #{http_address}. To start the selenium server, run `selenium`."
           end
-          Thread.start do
-            driver.open(spec_url)
-          end
           runner = Runner.new(:driver => driver)
           Runner.register(runner)
+          Thread.start do
+            driver.open("/")
+            driver.create_cookie("session_id=#{runner.session_id}")
+            driver.open(parsed_spec_url.path)
+          end
           connection.send_head
-          connection.send_body("suite_id=#{runner.suite_id}")
+          connection.send_body("session_id=#{runner.session_id}")
         end
 
         protected
-        def spec_suite_url
+        def full_spec_suite_url
           "#{Server.root_url}/specs"
         end
       end
@@ -54,14 +56,14 @@ module JsTestCore
           instances[id.to_s]
         end
 
-        def finalize(suite_id, text)
-          if runner = find(suite_id)
+        def finalize(session_id, text)
+          if runner = find(session_id)
             runner.finalize(text)
           end
         end
 
         def register(runner)
-          instances[runner.suite_id] = runner
+          instances[runner.session_id] = runner
         end
 
         protected
@@ -72,7 +74,7 @@ module JsTestCore
 
       include FileUtils
       property :driver
-      attr_reader :profile_dir, :suite_run_result
+      attr_reader :profile_dir, :session_run_result
 
       def after_initialize
         profile_base = "#{::Dir.tmpdir}/js_test_core/#{self.class.name}"
@@ -80,24 +82,24 @@ module JsTestCore
         @profile_dir = "#{profile_base}/#{Time.now.to_i}"
       end
 
-      def finalize(suite_run_result)
+      def finalize(session_run_result)
         driver.stop
-        @suite_run_result = suite_run_result
+        @session_run_result = session_run_result.to_s
       end
 
       def running?
-        suite_run_result.nil?
+        driver.session_started?
       end
 
       def successful?
-        !running? && suite_run_result.empty?
+        !running? && session_run_result.empty?
       end
 
       def failed?
         !running? && !successful?
       end
 
-      def suite_id
+      def session_id
         driver.session_id
       end
     end

data/vendor/js-test-core/lib/js_test_core/resources/{suite.rb → session.rb}

@@ -1,9 +1,9 @@
 module JsTestCore
   module Resources
-    class Suite < ThinRest::Resource
+    class Session < ThinRest::Resource
       class Collection < ThinRest::Resource
         route ANY do |env, id|
-          Suite.new(env.merge(:id => id))
+          Session.new(env.merge(:id => id))
         end
       end
 
@@ -23,7 +23,7 @@ module JsTestCore
             if runner.successful?
               connection.send_body("status=#{SUCCESSFUL_COMPLETION}")
             else
-              connection.send_body("status=#{FAILURE_COMPLETION}&reason=#{runner.suite_run_result}")
+              connection.send_body("status=#{FAILURE_COMPLETION}&reason=#{runner.session_run_result}")
             end
           end
         else
@@ -33,7 +33,11 @@ module JsTestCore
       end
 
       route 'finish' do |env, name|
-        SuiteFinish.new(env.merge(:suite => self))
+        SessionFinish.new(env.merge(:session => self))
+      end
+
+      def associated_with_a_runner?
+        id.to_s != ""
       end
     end
   end

data/vendor/js-test-core/lib/js_test_core/resources/{suite_finish.rb → session_finish.rb}

@@ -1,13 +1,13 @@
 module JsTestCore
   module Resources
-    class SuiteFinish < ThinRest::Resource
-      property :suite
+    class SessionFinish < ThinRest::Resource
+      property :session
       
       def post
-        if suite.id == 'user'
-          STDOUT.puts rack_request['text']
+        if session.associated_with_a_runner?
+          Runner.finalize(session.id, rack_request['text'])
         else
-          Runner.finalize(suite.id, rack_request['text'])
+          STDOUT.puts rack_request['text']
         end
         connection.send_head
         connection.send_body("")

data/vendor/js-test-core/lib/js_test_core/resources/web_root.rb

@@ -16,7 +16,10 @@ module JsTestCore
           :relative_path => "/implementations"
         ))
       end
-      route "suites", "JsTestCore::Resources::Suite::Collection"
+      route "sessions", "JsTestCore::Resources::Session::Collection"
+      route "session" do |env, name|
+        Session.new(env.merge(:id => rack_request.cookies["session_id"]))
+      end
       route "runners", "JsTestCore::Resources::Runner::Collection"
       route "specs" do |env, name|
         if self.class.dispatch_strategy == :specs
@@ -55,8 +58,8 @@ module JsTestCore
       property :public_path
 
       def get
-        connection.send_head(301, :Location => "/#{self.class.dispatch_strategy}")
-        connection.send_body("<script type='text/javascript'>window.location.href='/specs';</script>")
+        connection.send_head(200, :Location => "/#{self.class.dispatch_strategy}")
+        connection.send_body("<html><head></head><body>Welcome to the Js Test Server. Click the following link to run you <a href=/specs>spec suite</a>.</body></html>")
       end
     end
   end

data/vendor/js-test-core/spec/unit/js_test_core/client_spec.rb

@@ -9,19 +9,20 @@ module JsTestCore
         Client.const_set(:STDOUT, stdout)
         @request = "http request"
         mock(Net::HTTP).start(DEFAULT_HOST, DEFAULT_PORT).yields(request)
+        stub.instance_of(Client).sleep
       end
 
       after do
         Client.__send__(:remove_const, :STDOUT)
       end
 
-      it "tells the server to start a suite run in Firefox and polls the status of the suite until the suite is complete" do
+      it "tells the server to start a session run in Firefox and polls the status of the session until the session is complete" do
         mock_post_to_runner("*firefox")
         mock_polling_returns([running_status, running_status, success_status])
         Client.run
       end
 
-      context "when the Suite run ends in 'success'" do
+      context "when the Session run ends in 'success'" do
         before do
           mock_post_to_runner("*firefox")
           mock_polling_returns([running_status, running_status, success_status])
@@ -37,7 +38,7 @@ module JsTestCore
         end
       end
 
-      context "when the Suite run ends in 'failure'" do
+      context "when the Session run ends in 'failure'" do
         attr_reader :failure_reason
         before do
           mock_post_to_runner("*firefox")
@@ -58,18 +59,18 @@ module JsTestCore
         it "reports the reason for failure"
       end
 
-      context "when the Suite is not found" do
-        it "raises a SuiteNotFound error" do
+      context "when the Session is not found" do
+        it "raises a SessionNotFound error" do
           mock_post_to_runner("*firefox")
-          mock(request).get("/suites/my_suite_id") do
-            stub(suite_response = Object.new).code {"404"}
-            suite_response
+          mock(request).get("/sessions/my_session_id") do
+            stub(session_response = Object.new).code {"404"}
+            session_response
           end
-          lambda {Client.run}.should raise_error(Client::SuiteNotFound)
+          lambda {Client.run}.should raise_error(Client::SessionNotFound)
         end
       end
 
-      context "when the Suite run ends in with invalid status" do
+      context "when the Session run ends in with invalid status" do
         it "raises an InvalidStatusResponse" do
           mock_post_to_runner("*firefox")
           mock_polling_returns([running_status, running_status, "status=this is an unexpected status result"])
@@ -78,30 +79,30 @@ module JsTestCore
       end
 
       def mock_post_to_runner(selenium_browser_start_command)
-        mock(start_suite_response = Object.new).body {"suite_id=my_suite_id"}
+        mock(start_session_response = Object.new).body {"session_id=my_session_id"}
         mock(request).post("/runners", "selenium_browser_start_command=#{CGI.escape(selenium_browser_start_command)}&selenium_host=localhost&selenium_port=4444") do
-          start_suite_response
+          start_session_response
         end
       end
 
-      def mock_polling_returns(suite_statuses=[])
-        mock(request).get("/suites/my_suite_id") do
-          stub(suite_response = Object.new).body {suite_statuses.shift}
-          stub(suite_response).code {"200"}
-          suite_response
-        end.times(suite_statuses.length)
+      def mock_polling_returns(session_statuses=[])
+        mock(request).get("/sessions/my_session_id") do
+          stub(session_response = Object.new).body {session_statuses.shift}
+          stub(session_response).code {"200"}
+          session_response
+        end.times(session_statuses.length)
       end
 
       def running_status
-        "status=#{Resources::Suite::RUNNING}"
+        "status=#{Resources::Session::RUNNING}"
       end
 
       def success_status
-        "status=#{Resources::Suite::SUCCESSFUL_COMPLETION}"
+        "status=#{Resources::Session::SUCCESSFUL_COMPLETION}"
       end
 
       def failure_status(reason)
-        "status=#{Resources::Suite::FAILURE_COMPLETION}&reason=#{reason}"
+        "status=#{Resources::Session::FAILURE_COMPLETION}&reason=#{reason}"
       end
     end