js_spec 0.3.2 → 0.3.3

data/vendor/js-test-core/spec/unit/js_test_core/resources/runners/runner_spec.rb

@@ -3,12 +3,12 @@ require File.expand_path("#{File.dirname(__FILE__)}/../../../unit_spec_helper")
 module JsTestCore
   module Resources
     describe Runner do
-      attr_reader :request, :driver, :suite_id, :selenium_browser_start_command, :body
+      attr_reader :request, :driver, :session_id, :selenium_browser_start_command, :body
 
       def self.before_with_selenium_browser_start_command(selenium_browser_start_command="selenium browser start command")
         before do
-          @driver = "Selenium Driver"
-          @suite_id = "DEADBEEF"
+          @driver = FakeSeleniumDriver.new
+          @session_id = FakeSeleniumDriver::SESSION_ID
           @selenium_browser_start_command = selenium_browser_start_command
           @body = "selenium_browser_start_command=#{selenium_browser_start_command}"
           stub(Selenium::SeleniumDriver).new('localhost', 4444, selenium_browser_start_command, 'http://0.0.0.0:8080') do
@@ -27,13 +27,13 @@ module JsTestCore
         before do
           @runner = Runner.new(:connection => connection, :selenium_browser_start_command => selenium_browser_start_command)
           stub(runner).driver {driver}
-          stub(driver).session_id {suite_id}
+          stub(driver).session_id {session_id}
           Runner.register(runner)
         end
         
         context "when passed an id for which there is a corresponding Runner" do
           it "returns the Runner" do
-            Runner.find(suite_id).should == runner
+            Runner.find(session_id).should == runner
           end
         end
 
@@ -48,26 +48,26 @@ module JsTestCore
       describe ".finalize" do
         attr_reader :runner
         before_with_selenium_browser_start_command
-        describe "when there is a runner for the passed in suite_id" do
+        describe "when there is a runner for the passed in session_id" do
           before do
             @runner = Runner.new(:connection => connection, :selenium_browser_start_command => selenium_browser_start_command)
             stub(runner).driver {driver}
             stub(driver).session_id {"DEADBEEF"}
 
             Runner.register(runner)
-            runner.suite_id.should == suite_id
+            runner.session_id.should == session_id
           end
 
-          it "finalizes the Runner that has the suite_id and keeps the Runner in memory" do
-            mock(driver).stop
+          it "finalizes the Runner that has the session_id and keeps the Runner in memory" do
+            mock.proxy(driver).stop
             mock.proxy(runner).finalize("Browser output")
-            Runner.find(suite_id).should == runner
-            Runner.finalize(suite_id, "Browser output")
-            Runner.find(suite_id).should == runner
+            Runner.find(session_id).should == runner
+            Runner.finalize(session_id, "Browser output")
+            Runner.find(session_id).should == runner
           end
         end
 
-        describe "when there is not a runner for the passed in suite_id" do
+        describe "when there is not a runner for the passed in session_id" do
           it "does nothing" do
             lambda do
               Runner.finalize("6666666", "nothing happens")
@@ -84,21 +84,27 @@ module JsTestCore
           stub(connection).send_body
         end
 
-        it "responds with a 200 and the suite_id" do
-          stub(driver).start
-          stub(driver).open
-          stub(driver).session_id {suite_id}
-
+        it "responds with a 200 and the session_id" do
           mock(connection).send_head
-          mock(connection).send_body("suite_id=#{suite_id}")
+          mock(connection).send_body("session_id=#{session_id}")
+          connection.receive_data("POST /runners HTTP/1.1\r\nHost: _\r\nContent-Length: #{body.length}\r\n\r\n#{body}")
+        end
+
+        it "starts the Selenium Driver, creates a SessionID cookie, and opens the spec page" do
+          mock(driver).start
+          stub(driver).session_id {session_id}
+          mock(driver).create_cookie("session_id=#{session_id}")
+          mock(driver).open("/")
+          mock(driver).open("/specs")
+
+          mock(Selenium::SeleniumDriver).new('localhost', 4444, selenium_browser_start_command, 'http://0.0.0.0:8080') do
+            driver
+          end
           connection.receive_data("POST /runners HTTP/1.1\r\nHost: _\r\nContent-Length: #{body.length}\r\n\r\n#{body}")
         end
 
         describe "when a selenium_host parameter is passed into the request" do
           before do
-            stub(driver).start
-            stub(driver).open
-            stub(driver).session_id {suite_id}
             body << "&selenium_host=another-machine"
           end
 
@@ -112,9 +118,6 @@ module JsTestCore
 
         describe "when a selenium_host parameter is not passed into the request" do
           before do
-            stub(driver).start
-            stub(driver).open
-            stub(driver).session_id {suite_id}
             body << "&selenium_host="
           end
 
@@ -128,9 +131,6 @@ module JsTestCore
 
         describe "when a selenium_port parameter is passed into the request" do
           before do
-            stub(driver).start
-            stub(driver).open
-            stub(driver).session_id {suite_id}
             body << "&selenium_port=4000"
           end
 
@@ -144,9 +144,6 @@ module JsTestCore
 
         describe "when a selenium_port parameter is not passed into the request" do
           before do
-            stub(driver).start
-            stub(driver).open
-            stub(driver).session_id {suite_id}
             body << "&selenium_port="
           end
 
@@ -159,13 +156,15 @@ module JsTestCore
         end
 
         describe "when a spec_url is passed into the request" do
-          it "runs Selenium with the passed in host and part to run the specified spec suite in Firefox" do
+          it "runs Selenium with the passed in host and part to run the specified spec session in Firefox" do
             mock(Selenium::SeleniumDriver).new('localhost', 4444, selenium_browser_start_command, 'http://another-host:8080') do
               driver
             end
             mock(driver).start
-            mock(driver).open("http://another-host:8080/specs/subdir")
-            mock(driver).session_id {suite_id}.at_least(1)
+            stub(driver).create_cookie
+            mock(driver).open("/")
+            mock(driver).open("/specs/subdir")
+            mock(driver).session_id {session_id}.at_least(1)
 
             body << "&spec_url=http://another-host:8080/specs/subdir"
             connection.receive_data("POST /runners HTTP/1.1\r\nHost: _\r\nContent-Length: #{body.length}\r\n\r\n#{body}")
@@ -179,10 +178,12 @@ module JsTestCore
             end
           end
 
-          it "uses Selenium to run the entire spec suite in Firefox" do
+          it "uses Selenium to run the entire spec session in Firefox" do
             mock(driver).start
-            mock(driver).open("http://0.0.0.0:8080/specs")
-            mock(driver).session_id {suite_id}.at_least(1)
+            stub(driver).create_cookie
+            mock(driver).open("/")
+            mock(driver).open("/specs")
+            mock(driver).session_id {session_id}.at_least(1)
 
             body << "&spec_url="
             connection.receive_data("POST /runners HTTP/1.1\r\nHost: _\r\nContent-Length: #{body.length}\r\n\r\n#{body}")
@@ -198,16 +199,12 @@ module JsTestCore
           stub(connection).send_head
           stub(connection).send_body
 
-          stub(driver).start
-          stub(driver).open
-          stub(driver).session_id {suite_id}
-
           mock(connection).send_head
-          mock(connection).send_body("suite_id=#{suite_id}")
+          mock(connection).send_body("session_id=#{session_id}")
 
-          Runner.find(suite_id).should be_nil
+          Runner.find(session_id).should be_nil
           connection.receive_data("POST /runners/firefox HTTP/1.1\r\nHost: _\r\n\r\n")
-          runner = Runner.find(suite_id)
+          runner = Runner.find(session_id)
           runner.class.should == Runner
           runner.driver.should == driver
         end
@@ -221,45 +218,68 @@ module JsTestCore
           stub(connection).send_head
           stub(connection).send_body
 
-          stub(driver).start
-          stub(driver).open
-          stub(driver).session_id {suite_id}
-
           mock(connection).send_head
-          mock(connection).send_body("suite_id=#{suite_id}")
+          mock(connection).send_body("session_id=#{session_id}")
 
-          Runner.find(suite_id).should be_nil
+          Runner.find(session_id).should be_nil
           connection.receive_data("POST /runners/iexplore HTTP/1.1\r\nHost: _\r\n\r\n")
-          runner = Runner.find(suite_id)
+          runner = Runner.find(session_id)
           runner.class.should == Runner
           runner.driver.should == driver
         end
       end
 
+      describe "#running?" do
+        before_with_selenium_browser_start_command
+        context "when the driver#session_started? is true" do
+          it "returns true" do
+            create_runner_connection = create_connection
+            stub(create_runner_connection).send_head
+            stub(create_runner_connection).send_body
+            create_runner_connection.receive_data("POST /runners HTTP/1.1\r\nHost: _\r\nContent-Length: #{body.length}\r\n\r\n#{body}")
+
+            runner = Resources::Runner.find(session_id)
+            runner.driver.session_started?.should be_true
+            runner.should be_running
+          end
+        end
+
+        context "when the driver#session_started? is false" do
+          it "returns false" do
+            create_runner_connection = create_connection
+            stub(create_runner_connection).send_head
+            stub(create_runner_connection).send_body
+            create_runner_connection.receive_data("POST /runners HTTP/1.1\r\nHost: _\r\nContent-Length: #{body.length}\r\n\r\n#{body}")
+
+            runner = Resources::Runner.find(session_id)
+            runner.driver.stop
+            runner.driver.session_started?.should be_false
+            runner.should_not be_running
+          end
+        end
+      end
+
       describe "#finalize" do
         attr_reader :runner
         before_with_selenium_browser_start_command
         before do
-          stub(driver).start
-          stub(driver).open
-          stub(driver).session_id {suite_id}
-
           create_runner_connection = create_connection
           stub(create_runner_connection).send_head
           stub(create_runner_connection).send_body
           create_runner_connection.receive_data("POST /runners HTTP/1.1\r\nHost: _\r\nContent-Length: #{body.length}\r\n\r\n#{body}")
-          @runner = Resources::Runner.find(suite_id)
-          mock(driver).stop
+          @runner = Resources::Runner.find(session_id)
+          mock.proxy(driver).stop
         end
 
-        it "kills the browser and stores the #suite_run_result" do
-          suite_run_result = "The suite run result"
-          runner.finalize(suite_run_result)
-          runner.suite_run_result.should == suite_run_result
+        it "kills the browser and stores the #session_run_result" do
+          session_run_result = "The session run result"
+          runner.finalize(session_run_result)
+          runner.session_run_result.should == session_run_result
         end
 
-        it "causes #running? to be false" do
-          runner.finalize("")
+        it "sets #session_run_result" do
+          runner.finalize("the result")
+          runner.session_run_result.should == "the result"
         end
 
         context "when passed an empty string" do

data/vendor/js-test-core/spec/unit/js_test_core/resources/{suite_finish_spec.rb → session_finish_spec.rb}

@@ -2,26 +2,27 @@ require File.expand_path("#{File.dirname(__FILE__)}/../../unit_spec_helper")
 
 module JsTestCore
   module Resources
-    describe SuiteFinish do
+    describe SessionFinish do
       attr_reader :stdout
       before do
         @stdout = StringIO.new
-        SuiteFinish.const_set(:STDOUT, stdout)
+        SessionFinish.const_set(:STDOUT, stdout)
       end
 
       after do
-        SuiteFinish.__send__(:remove_const, :STDOUT)
+        SessionFinish.__send__(:remove_const, :STDOUT)
       end
 
-      describe "POST /suites/:suite_id/finish" do
-        context "when :suite_id == 'user'" do
+
+      describe "POST /session/finish" do
+        context "when session_id cookie is not set" do
           it "writes the body of the request to stdout" do
             stub(connection).send_head
             stub(connection).send_body
 
             text = "The text in the POST body"
             body = "text=#{text}"
-            connection.receive_data("POST /suites/user/finish HTTP/1.1\r\nHost: _\r\nContent-Length: #{body.length}\r\n\r\n#{body}")
+            connection.receive_data("POST /session/finish HTTP/1.1\r\nHost: _\r\nContent-Length: #{body.length}\r\n\r\n#{body}")
             stdout.string.should == "#{text}\n"
           end
 
@@ -31,22 +32,18 @@ module JsTestCore
 
             mock(connection).send_head
             mock(connection).send_body("")
-            connection.receive_data("POST /suites/user/finish HTTP/1.1\r\nHost: _\r\nContent-Length: #{body.length}\r\n\r\n#{body}")
+            connection.receive_data("POST /session/finish HTTP/1.1\r\nHost: _\r\nContent-Length: #{body.length}\r\n\r\n#{body}")
           end
         end
 
-        context "when :suite_id != 'user'" do
-          attr_reader :suite_id, :driver
+        context "when session_id cookie is set'" do
+          attr_reader :session_id, :driver
           before do
-            @suite_id = "DEADBEEF"
-            @driver = "Selenium Driver"
+            @session_id = FakeSeleniumDriver::SESSION_ID
+            @driver = FakeSeleniumDriver.new
             stub(Selenium::SeleniumDriver).new('localhost', 4444, '*firefox', 'http://0.0.0.0:8080') do
               driver
             end
-            stub(driver).start
-            stub(driver).open
-            stub(driver).session_id {suite_id}
-            stub(Thread).start.yields
 
             firefox_connection = Thin::JsTestCoreConnection.new(Guid.new)
             stub(firefox_connection).send_head
@@ -60,11 +57,11 @@ module JsTestCore
             body = "text=#{text}"
             stub(connection).send_head
             stub(connection).send_body
-            mock.proxy(Runner).finalize(suite_id.to_s, text)
+            mock.proxy(Runner).finalize(session_id.to_s, text)
             mock(driver).stop
             stub(connection).close_connection
 
-            connection.receive_data("POST /suites/#{suite_id}/finish HTTP/1.1\r\nHost: _\r\nContent-Length: #{body.length}\r\n\r\n#{body}")
+            connection.receive_data("POST /session/finish HTTP/1.1\r\nCookie: session_id=#{session_id}\r\nHost: _\r\nContent-Length: #{body.length}\r\n\r\n#{body}")
           end
 
           it "responds with a blank body" do
@@ -73,7 +70,7 @@ module JsTestCore
 
             mock(connection).send_head
             mock(connection).send_body("")
-            connection.receive_data("POST /suites/#{suite_id}/finish HTTP/1.1\r\nHost: _\r\nContent-Length: 0\r\n\r\n")
+            connection.receive_data("POST /session/finish HTTP/1.1\r\nCookie: session_id=#{session_id}\r\nHost: _\r\nContent-Length: 0\r\n\r\n")
           end
         end
       end

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

@@ -0,0 +1,82 @@
+require File.expand_path("#{File.dirname(__FILE__)}/../../unit_spec_helper")
+
+module JsTestCore
+  module Resources
+    describe Session do
+      describe "GET /sessions/:session_id" do
+        attr_reader :driver, :session_id
+
+        context "when there is no Runner with the :session_id" do
+          it "responds with a 404" do
+            session_id = "invalid_session_id"
+            Runner.find(session_id).should be_nil
+
+            mock(connection).send_head(404)
+            mock(connection).send_body("")
+
+            connection.receive_data("GET /sessions/#{session_id} HTTP/1.1\r\nHost: _\r\n\r\n")
+          end
+        end
+
+        context "when there is a Runner with the :session_id" do
+          attr_reader :session_runner
+          before do
+            @driver = FakeSeleniumDriver.new
+            @session_id = FakeSeleniumDriver::SESSION_ID
+            stub(Selenium::SeleniumDriver).new('localhost', 4444, '*firefox', 'http://0.0.0.0:8080') do
+              driver
+            end
+
+            connection_that_starts_firefox = create_connection
+            stub(connection_that_starts_firefox).send_head
+            stub(connection_that_starts_firefox).send_body
+            connection_that_starts_firefox.receive_data("POST /runners/firefox HTTP/1.1\r\nHost: _\r\nContent-Length: 0\r\n\r\n")
+            @session_runner = Runner.find(session_id)
+            session_runner.should be_running
+          end
+
+          context "when a Runner with the :session_id is running" do
+            it "responds with a 200 and status=running" do
+              mock(connection).send_head
+              mock(connection).send_body("status=#{Resources::Session::RUNNING}")
+
+              connection.receive_data("GET /sessions/#{session_id} HTTP/1.1\r\nHost: _\r\n\r\n")
+            end
+          end
+
+          context "when a Runner with the :session_id has completed" do
+            context "when the session has a status of 'success'" do
+              before do
+                session_runner.finalize("")
+                session_runner.should be_successful
+              end
+
+              it "responds with a 200 and status=success" do
+                mock(connection).send_head
+                mock(connection).send_body("status=#{Resources::Session::SUCCESSFUL_COMPLETION}")
+
+                connection.receive_data("GET /sessions/#{session_id} HTTP/1.1\r\nHost: _\r\n\r\n")
+              end
+            end
+
+            context "when the session has a status of 'failure'" do
+              attr_reader :reason
+              before do
+                @reason = "Failure stuff"
+                session_runner.finalize(reason)
+                session_runner.should be_failed
+              end
+
+              it "responds with a 200 and status=failure and reason" do
+                mock(connection).send_head
+                mock(connection).send_body("status=#{Resources::Session::FAILURE_COMPLETION}&reason=#{reason}")
+
+                connection.receive_data("GET /sessions/#{session_id} HTTP/1.1\r\nHost: _\r\n\r\n")
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/vendor/js-test-core/spec/unit/js_test_core/resources/specs/spec_dir_spec.rb

@@ -90,10 +90,10 @@ module JsTestCore
 
         describe "GET /" do
           context "when WebRoot.dispatch_specs has been invoked" do
-            it "redirects to /specs" do
+            it "renders a home page" do
               WebRoot.dispatch_specs
-              mock(connection).send_head(301, :Location => '/specs')
-              mock(connection).send_body("<script type='text/javascript'>window.location.href='/specs';</script>")
+              mock(connection).send_head(200, :Location => '/specs')
+              mock(connection).send_body(is_a(String))
 
               connection.receive_data("GET / HTTP/1.1\r\nHost: _\r\n\r\n")
             end