pivotal-screw-unit-server 0.5.8 → 0.5.9

data/CHANGES

@@ -1,3 +1,6 @@
+0.5.9
+- Allow test suite to clear all cookies
+
 0.5.7
 - Fixed Server runner
 

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
-:major: 0
 :minor: 5
-:patch: 8
+:patch: 9
+:major: 0

data/vendor/js-test-core/CHANGES

@@ -1,3 +1,4 @@
+- Allow test suite to clear all cookies
 - No longer using the /implementanions directory. Replace all cases of /implementations with /javascripts.
 - Added support for custom suite files
 - Added dependency on Erector

data/vendor/js-test-core/lib/js_test_core/models/selenium_session.rb

@@ -45,7 +45,7 @@ module JsTestCore
         Thread.start do
           driver.open("/")
           driver.create_cookie("session_id=#{session_id}")
-          driver.open(parsed_spec_url.path)
+          driver.open("#{parsed_spec_url.path}")
         end
       end
 

data/vendor/js-test-core/lib/js_test_core/representations/spec.html.rb

@@ -1,7 +1,7 @@
 module JsTestCore
   module Representations
     class Spec < Page
-      needs :spec_files
+      needs :spec_files, :session_id
       protected
       def title_text
         "Js Test Core Suite"
@@ -15,6 +15,11 @@ module JsTestCore
         spec_files.each do |file|
           script :type => "text/javascript", :src => file
         end
+        script_to_set_window_session_id
+      end
+
+      def script_to_set_window_session_id
+        script "window._session_id = '#{session_id}';", :type => "text/javascript"
       end
       
       def body_content

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

@@ -51,8 +51,7 @@ module JsTestCore
           200,
           {
             'Content-Type' => content_type,
-            'Last-Modified' => ::File.mtime(absolute_path).rfc822,
-            'Content-Length' => ::File.size(absolute_path)
+            'Last-Modified' => ::File.mtime(absolute_path).rfc822
           },
           ::File.read(absolute_path)
         ]

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

@@ -21,14 +21,7 @@ module JsTestCore
 
       def call
         body = Representations::NotFound.new(:message => "File #{request.path_info} not found").to_s
-        [
-          404,
-          {
-            "Content-Type" => "text/html",
-            "Content-Length" => body.size.to_s
-          },
-          body
-        ]
+        [ 404, { "Content-Type" => "text/html" }, body ]
       end
     end
   end

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

@@ -34,6 +34,19 @@ module JsTestCore
 
       protected
 
+      def do_post(selenium_browser_start_command)
+        selenium_session = Models::SeleniumSession.new({
+          :spec_url => request['spec_url'].to_s == "" ? full_spec_suite_url : request['spec_url'],
+          :selenium_browser_start_command => selenium_browser_start_command,
+          :selenium_host => request['selenium_host'].to_s == "" ? 'localhost' : request['selenium_host'].to_s,
+          :selenium_port => request['selenium_port'].to_s == "" ? 4444 : Integer(request['selenium_port'])
+        })
+        selenium_session.start
+
+        body = "session_id=#{selenium_session.session_id}"
+        [ 200, { }, body ]
+      end
+
       def do_get
         selenium_session = Models::SeleniumSession.find(session_id)
         if selenium_session
@@ -46,21 +59,10 @@ module JsTestCore
               "status=#{FAILURE_COMPLETION}&reason=#{selenium_session.run_result}"
             end
           end
-          [
-            200,
-            {'Content-Length' => body.length},
-            body
-          ]
+          [ 200, {}, body ]
         else
           body = Representations::NotFound.new(:message => "Could not find session #{session_id}").to_s
-          [
-            404,
-            {
-              "Content-Type" => "text/html",
-              "Content-Length" => body.size.to_s
-            },
-            body
-          ]
+          [ 404, { "Content-Type" => "text/html" }, body ]
         end
       end
 
@@ -77,25 +79,6 @@ module JsTestCore
         params["session_id"] || request.cookies["session_id"]
       end
 
-      def do_post(selenium_browser_start_command)
-        selenium_session = Models::SeleniumSession.new({
-          :spec_url => request['spec_url'].to_s == "" ? full_spec_suite_url : request['spec_url'],
-          :selenium_browser_start_command => selenium_browser_start_command,
-          :selenium_host => request['selenium_host'].to_s == "" ? 'localhost' : request['selenium_host'].to_s,
-          :selenium_port => request['selenium_port'].to_s == "" ? 4444 : Integer(request['selenium_port'])
-        })
-        selenium_session.start
-
-        body = "session_id=#{selenium_session.session_id}"
-        [
-          200,
-          {
-            "Content-Length" => body.length  
-          },
-          body
-        ]
-      end
-
       def full_spec_suite_url
         "#{Configuration.root_url}/specs"
       end

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

@@ -44,15 +44,18 @@ module JsTestCore
           200,
           {
             'Content-Type' => "text/html",
-            'Last-Modified' => ::File.mtime(real_path).rfc822,
-            'Content-Length' => html.length
+            'Last-Modified' => ::File.mtime(real_path).rfc822
           },
           html
         ]
       end
 
       def render_spec(spec_files)
-        self.class.spec_representation_class.new(:spec_files => spec_files).to_s
+        self.class.spec_representation_class.new(:spec_files => spec_files, :session_id => session_id).to_s
+      end
+
+      def session_id
+        params[:session_id] || request.cookies["session_id"]
       end
 
       def absolute_path

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

@@ -4,7 +4,7 @@ module JsTestCore
       map "/"
       
       get("") do
-        [200, {}, "<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>"]
+        "<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/models/selenium_session_spec.rb

@@ -3,18 +3,45 @@ require File.expand_path("#{File.dirname(__FILE__)}/../../unit_spec_helper")
 module JsTestCore
   module Models
     describe SeleniumSession do
-      attr_reader :driver, :session_id, :selenium_session
+      attr_reader :driver, :selenium_session, :browser_host, :spec_url, :selenium_browser_start_command, :selenium_host, :selenium_port
 
       before do
         @driver = FakeSeleniumDriver.new
-        @selenium_session = SeleniumSession.new(:spec_url => "http://localhost:8080/specs")
-        stub(selenium_session).driver {driver}
-        driver.start
-        @session_id = driver.session_id
-        SeleniumSession.register(selenium_session)
+
+        @browser_host = "http://localhost:8080"
+        @spec_url = "#{browser_host}/specs"
+        @selenium_browser_start_command = "*firefox"
+        @selenium_host = "localhost"
+        @selenium_port = 4444
+
+        stub.proxy(Selenium::Client::Driver).new do
+          driver
+        end
+
+        @selenium_session = SeleniumSession.new(
+          :spec_url => spec_url,
+          :selenium_browser_start_command => selenium_browser_start_command,
+          :selenium_host => selenium_host,
+          :selenium_port => selenium_port
+        )
+      end
+
+      def self.started
+        attr_reader :session_id
+        before do
+          selenium_session.start
+          @session_id = selenium_session.session_id
+        end
+      end
+
+      describe "#initialize" do
+        it "creates a Selenium Driver" do
+          Selenium::Client::Driver.should have_received.new(selenium_host, selenium_port, selenium_browser_start_command, browser_host)
+        end
       end
 
       describe ".find" do
+        started
         context "when passed an id for which there is a corresponding selenium_session" do
           it "returns the selenium_session" do
             SeleniumSession.find(session_id).should == selenium_session
@@ -29,7 +56,20 @@ module JsTestCore
         end
       end
 
+      describe "#start" do
+        it "starts the Selenium Driver, opens the home page, sets the session_id cookie, and opens the spec page" do
+          stub(Thread).start.yields
+          mock.proxy(driver).start.ordered
+          mock.proxy(driver).open("/").ordered
+          mock.proxy(driver).create_cookie("session_id=#{FakeSeleniumDriver::SESSION_ID}").ordered
+          mock.proxy(driver).open("/specs").ordered
+
+          selenium_session.start
+        end
+      end
+
       describe "#running?" do
+        started
         context "when the driver#session_started? is true" do
           it "returns true" do
             driver.session_started?.should be_true
@@ -46,8 +86,8 @@ module JsTestCore
         end
       end
 
-      describe "#finalize" do
-        attr_reader :selenium_session
+      describe "#finish" do
+        started
         
         before do
           mock.proxy(driver).stop

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

@@ -5,25 +5,17 @@ module JsTestCore
     describe SeleniumSession do
       attr_reader :request, :driver, :session_id, :selenium_browser_start_command
 
-      def self.before_with_selenium_browser_start_command(selenium_browser_start_command="selenium browser start command")
-        before do
-          @driver = FakeSeleniumDriver.new
-          @session_id = FakeSeleniumDriver::SESSION_ID
-          @selenium_browser_start_command = selenium_browser_start_command
-          stub(Selenium::Client::Driver).new('localhost', 4444, selenium_browser_start_command, 'http://0.0.0.0:8080') do
-            driver
-          end
-        end
-      end
-
       after do
         Models::SeleniumSession.send(:instances).clear
       end
 
       describe "POST /selenium_sessions" do
-        before_with_selenium_browser_start_command
         before do
-          stub(Thread).start.yields
+          @session_id = FakeSeleniumDriver::SESSION_ID
+          @driver = FakeSeleniumDriver.new
+          stub.proxy(Selenium::Client::Driver).new do
+            driver
+          end
         end
 
         it "responds with a 200 and the session_id" do
@@ -37,112 +29,144 @@ module JsTestCore
           )
         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::Client::Driver).new('localhost', 4444, selenium_browser_start_command, 'http://0.0.0.0:8080') do
-            driver
+        it "creates and starts a Models::SeleniumSession" do
+          mock.proxy(Models::SeleniumSession).new({
+            :selenium_host => 'localhost',
+            :selenium_port => 4444,
+            :selenium_browser_start_command => "*firefox",
+            :spec_url => 'http://0.0.0.0:8080/specs'
+          }) do |selenium_session|
+            mock.strong(selenium_session).start
           end
-          response = post(SeleniumSession.path("/"), {:selenium_browser_start_command => selenium_browser_start_command})
+
+          response = post(SeleniumSession.path("/"), {:selenium_browser_start_command => "*firefox"})
         end
 
         describe "when a selenium_host parameter is passed into the request" do
-          it "starts the Selenium Driver with the passed in selenium_host" do
-            mock(Selenium::Client::Driver).new('another-machine', 4444, selenium_browser_start_command, 'http://0.0.0.0:8080') do
-              driver
+          it "creates and starts the Models::SeleniumSession with the given selenium_host" do
+            mock.proxy(Models::SeleniumSession).new({
+              :selenium_host => 'another-machine',
+              :selenium_port => 4444,
+              :selenium_browser_start_command => "*firefox",
+              :spec_url => 'http://0.0.0.0:8080/specs'
+            }) do |selenium_session|
+              mock.strong(selenium_session).start
             end
+
             response = post(SeleniumSession.path("/"), {
-              :selenium_browser_start_command => selenium_browser_start_command,
+              :selenium_browser_start_command => "*firefox",
               :selenium_host => "another-machine"
             })
           end
         end
 
         describe "when a selenium_host parameter is not passed into the request" do
-          it "starts the Selenium Driver from localhost" do
-            mock(Selenium::Client::Driver).new('localhost', 4444, selenium_browser_start_command, 'http://0.0.0.0:8080') do
-              driver
+          it "creates and starts the Models::SeleniumSession with localhost" do
+            mock.proxy(Models::SeleniumSession).new({
+              :selenium_host => 'localhost',
+              :selenium_port => 4444,
+              :selenium_browser_start_command => "*firefox",
+              :spec_url => 'http://0.0.0.0:8080/specs'
+            }) do |selenium_session|
+              mock.strong(selenium_session).start
             end
+
             response = post(SeleniumSession.path("/"), {
-              :selenium_browser_start_command => selenium_browser_start_command,
+              :selenium_browser_start_command => "*firefox",
               :selenium_host => ""
             })
           end
         end
 
         describe "when a selenium_port parameter is passed into the request" do
-          it "starts the Selenium Driver with the passed in selenium_port" do
-            mock(Selenium::Client::Driver).new('localhost', 4000, selenium_browser_start_command, 'http://0.0.0.0:8080') do
-              driver
+          it "creates and starts the Models::SeleniumSession with the given selenium_port" do
+            mock.proxy(Models::SeleniumSession).new({
+              :selenium_host => 'localhost',
+              :selenium_port => 4000,
+              :selenium_browser_start_command => "*firefox",
+              :spec_url => 'http://0.0.0.0:8080/specs'
+            }) do |selenium_session|
+              mock.strong(selenium_session).start
             end
             response = post(SeleniumSession.path("/"), {
-              :selenium_browser_start_command => selenium_browser_start_command,
+              :selenium_browser_start_command => "*firefox",
               :selenium_port => "4000"
             })
           end
         end
 
         describe "when a selenium_port parameter is not passed into the request" do
-          it "starts the Selenium Driver from localhost" do
-            mock(Selenium::Client::Driver).new('localhost', 4444, selenium_browser_start_command, 'http://0.0.0.0:8080') do
-              driver
+          it "creates and starts the Models::SeleniumSession on port 4444" do
+            mock.proxy(Models::SeleniumSession).new({
+              :selenium_host => 'localhost',
+              :selenium_port => 4444,
+              :selenium_browser_start_command => "*firefox",
+              :spec_url => 'http://0.0.0.0:8080/specs'
+            }) do |selenium_session|
+              mock.strong(selenium_session).start
             end
             response = post(SeleniumSession.path("/"), {
-              :selenium_browser_start_command => selenium_browser_start_command,
+              :selenium_browser_start_command => "*firefox",
               :selenium_port => ""
             })
           end
         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 session in Firefox" do
-            mock(Selenium::Client::Driver).new('localhost', 4444, selenium_browser_start_command, 'http://another-host:8080') do
-              driver
+          it "creates and starts the Models::SeleniumSession with the given spec_url" do
+            mock.proxy(Models::SeleniumSession).new({
+              :selenium_host => 'localhost',
+              :selenium_port => 4444,
+              :selenium_browser_start_command => "*firefox",
+              :spec_url => 'http://another-host:8080/specs/subdir'
+            }) do |selenium_session|
+              mock.strong(selenium_session).start
             end
-            mock(driver).start
-            stub(driver).create_cookie
-            mock(driver).open("/")
-            mock(driver).open("/specs/subdir")
-            mock(driver).session_id {session_id}.at_least(1)
 
             response = post(SeleniumSession.path("/"), {
-              :selenium_browser_start_command => selenium_browser_start_command,
+              :selenium_browser_start_command => "*firefox",
               :spec_url => "http://another-host:8080/specs/subdir"
             })
           end
         end
 
         describe "when a spec_url is not passed into the request" do
-          before do
-            mock(Selenium::Client::Driver).new('localhost', 4444, selenium_browser_start_command, 'http://0.0.0.0:8080') do
-              driver
+          it "creates and starts the Models::SeleniumSession with a spec_url of http://0.0.0.0:8080/specs" do
+            mock.proxy(Models::SeleniumSession).new({
+              :selenium_host => 'localhost',
+              :selenium_port => 4444,
+              :selenium_browser_start_command => "*firefox",
+              :spec_url => 'http://0.0.0.0:8080/specs'
+            }) do |selenium_session|
+              mock.strong(selenium_session).start
             end
-          end
-
-          it "uses Selenium to run the entire spec session in Firefox" do
-            mock(driver).start
-            stub(driver).create_cookie
-            mock(driver).open("/")
-            mock(driver).open("/specs")
-            mock(driver).session_id {session_id}.at_least(1)
 
             response = post(SeleniumSession.path("/"), {
-              :selenium_browser_start_command => selenium_browser_start_command,
+              :selenium_browser_start_command => "*firefox",
               :spec_url => ""
             })
           end
         end
       end
 
-      describe "POST /selenium_sessions/firefox" do
-        before_with_selenium_browser_start_command "*firefox"
+      def self.before_with_selenium_browser_start_command(selenium_browser_start_command)
+        before do
+          @session_id = FakeSeleniumDriver::SESSION_ID
+          @selenium_browser_start_command = selenium_browser_start_command
+        end
+      end
 
+      describe "POST /selenium_sessions/firefox" do
         it "creates a selenium_session whose #driver started with '*firefox'" do
-          Models::SeleniumSession.find(session_id).should be_nil
+          mock.proxy(Models::SeleniumSession).new({
+            :selenium_host => 'localhost',
+            :selenium_port => 4444,
+            :selenium_browser_start_command => "*firefox",
+            :spec_url => 'http://0.0.0.0:8080/specs'
+          }) do |selenium_session|
+            mock.strong(selenium_session).start
+          end
+
           response = post(SeleniumSession.path("/firefox"))
           body = "session_id=#{session_id}"
           response.should be_http(
@@ -150,18 +174,20 @@ module JsTestCore
             {'Content-Length' => body.length.to_s},
             body
           )
-
-          selenium_session = Models::SeleniumSession.find(session_id)
-          selenium_session.class.should == Models::SeleniumSession
-          selenium_session.driver.should == driver
         end
       end
 
       describe "POST /selenium_sessions/iexplore" do
-        before_with_selenium_browser_start_command "*iexplore"
-
         it "creates a selenium_session whose #driver started with '*iexplore'" do
-          Models::SeleniumSession.find(session_id).should be_nil
+          mock.proxy(Models::SeleniumSession).new({
+            :selenium_host => 'localhost',
+            :selenium_port => 4444,
+            :selenium_browser_start_command => "*iexplore",
+            :spec_url => 'http://0.0.0.0:8080/specs'
+          }) do |selenium_session|
+            mock.strong(selenium_session).start
+          end
+
           response = post(SeleniumSession.path("/iexplore"))
           body = "session_id=#{session_id}"
           response.should be_http(
@@ -169,10 +195,6 @@ module JsTestCore
             {'Content-Length' => body.length.to_s},
             body
           )
-
-          selenium_session = Models::SeleniumSession.find(session_id)
-          selenium_session.class.should == Models::SeleniumSession
-          selenium_session.driver.should == driver
         end
       end
 

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

@@ -105,6 +105,30 @@ module JsTestCore
         end
       end
 
+      context "when passed a :session_id param" do
+        it "instantiates the Representation with the :session_id and renders window._session_id=:session_id" do
+          session_id = "DEADBEEF"
+
+          response = get(SpecFile.path("failing_spec"), :session_id => session_id)
+          doc = Nokogiri::HTML(response.body)
+          doc.css("script").any? do |script|
+            script.inner_html.include?("window._session_id = '#{session_id}';")
+          end.should be_true
+        end
+      end
+
+      context "when the :session_id cookie is set" do
+        it "instantiates the Representation with the :session_id and renders window._session_id=:session_id" do
+          session_id = "DEADBEEF"
+
+          response = get(SpecFile.path("failing_spec"), {}, {:cookie => "session_id=#{session_id}"})
+          doc = Nokogiri::HTML(response.body)
+          doc.css("script").any? do |script|
+            script.inner_html.include?("window._session_id = '#{session_id}';")
+          end.should be_true
+        end
+      end
+
       describe "GET /specs/i_dont_exist" do
         it "renders a 404" do
           response = get(SpecFile.path("i_dont_exist"))

data/vendor/js-test-core/spec/unit/unit_spec_helper.rb

@@ -2,6 +2,7 @@ require "rubygems"
 require "spec"
 require "spec/autorun"
 require "rack/test"
+require "rr"
 ARGV.push("-b")
 
 dir = File.dirname(__FILE__)
@@ -16,7 +17,7 @@ require "#{LIBRARY_ROOT_DIR}/spec/spec_helpers/fake_selenium_driver"
 require "#{LIBRARY_ROOT_DIR}/spec/spec_helpers/show_test_exceptions"
 
 Spec::Runner.configure do |config|
-  config.mock_with :rr
+  config.mock_with RR::Adapters::Rspec
 end
 
 Sinatra::Application.use ShowTestExceptions

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: pivotal-screw-unit-server
 version: !ruby/object:Gem::Version 
-  version: 0.5.8
+  version: 0.5.9
 platform: ruby
 authors: 
 - Pivotal Labs
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-08 00:00:00 -07:00
+date: 2009-06-14 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -162,7 +162,7 @@ files:
 - vendor/js-test-core/vendor/lucky-luciano/spec/lucky_luciano/resource_spec.rb
 - vendor/js-test-core/vendor/lucky-luciano/spec/spec_helper.rb
 - vendor/js-test-core/vendor/lucky-luciano/spec/spec_suite.rb
-has_rdoc: false
+has_rdoc: true
 homepage: http://github.com/pivotal/screw-unit-server
 post_install_message: 
 rdoc_options: 
@@ -187,14 +187,14 @@ requirements: []
 rubyforge_project: 
 rubygems_version: 1.2.0
 signing_key: 
-specification_version: 3
+specification_version: 2
 summary: Server and helpers for your Screw Unit tests.
 test_files: 
+- spec/unit_suite.rb
+- spec/functional/functional_spec_server_starter.rb
 - spec/functional/functional_spec.rb
 - spec/functional/functional_spec_helper.rb
-- spec/functional/functional_spec_server_starter.rb
-- spec/functional_suite.rb
 - spec/spec_suite.rb
 - spec/unit/js_test_core/specs/spec_file_spec.rb
 - spec/unit/unit_spec_helper.rb
-- spec/unit_suite.rb
+- spec/functional_suite.rb