screw-unit-server 0.3.0 → 0.5.3

data/vendor/js-test-core/CHANGES

@@ -1,3 +1,22 @@
+- No longer using the /implementanions directory. Replace all cases of /implementations with /javascripts.
+- Added support for custom suite files
+- Added dependency on Erector
+- Better error messages
+- Changed dependency from Selenium to selenium-client
+- Renamed Resources::Runner to Resources::SeleniumSession
+- Changed /runners to /selenium_sessions
+
+0.2.0
+- 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
+- Resource file download performance improvements via caching and chunked sending
+- Fixed false positive bug when Client connection times out
+
 0.1.1
 - SuiteFinish#post immediately closes the connection
 

data/vendor/js-test-core/Rakefile

@@ -26,7 +26,7 @@ def run_suite
 end
 
 PKG_NAME = "js_test_core"
-PKG_VERSION = "0.1.1"
+PKG_VERSION = "0.2.0"
 PKG_FILES = FileList[
   '[A-Z]*',
   '*.rb',
@@ -58,6 +58,7 @@ spec = Gem::Specification.new do |s|
   s.rubyforge_project = "pivotalrb"
   s.add_dependency('Selenium')
   s.add_dependency('thin', '=0.8.1')
+  s.add_dependency('erector')
 end
 
 Rake::GemPackageTask.new(spec) do |pkg|

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

@@ -1,30 +1,46 @@
 require "rubygems"
-gem "thin", ">=0.8.0"
+gem "thin", ">=1.2.1"
+gem "erector", ">=0.6.6"
+gem "selenium-client"
+
+dir = File.dirname(__FILE__)
+$LOAD_PATH.unshift File.expand_path("#{dir}/../vendor/lucky-luciano/lib")
+require "lucky_luciano"
 
-require "thin"
 require "fileutils"
 require "tmpdir"
 require "timeout"
 require "cgi"
 require "net/http"
-require "selenium"
+require "selenium/client"
 require "optparse"
+require "erector"
 
-dir = File.dirname(__FILE__)
-require "#{dir}/js_test_core/thin"
-require "#{dir}/js_test_core/rack"
+require "#{dir}/js_test_core/configuration"
+
+require "#{dir}/js_test_core/extensions"
+require "#{dir}/js_test_core/models"
 require "#{dir}/js_test_core/resources"
-require "#{dir}/js_test_core/selenium"
+require "#{dir}/js_test_core/representations"
 
 require "#{dir}/js_test_core/client"
-require "#{dir}/js_test_core/server"
-require "#{dir}/js_test_core/rails_server"
+require "#{dir}/js_test_core/selenium_server_configuration"
+
+require "#{dir}/js_test_core/app"
 
 module JsTestCore
   DEFAULT_HOST = "0.0.0.0"
   DEFAULT_PORT = 8080
 
   class << self
-    attr_accessor :core_path
+    Configuration.instance = Configuration.new
+
+    def method_missing(method_name, *args, &block)
+      if Configuration.instance.respond_to?(method_name)
+        Configuration.instance.send(method_name, *args, &block)
+      else
+        super
+      end
+    end
   end
 end

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

@@ -0,0 +1,12 @@
+module JsTestCore
+  class App < Sinatra::Base
+    set :logging, true
+    register(JsTestCore::Resources::WebRoot.route_handler)
+    register(JsTestCore::Resources::SeleniumSession.route_handler)
+    register(JsTestCore::Resources::CoreFile.route_handler)
+    register(JsTestCore::Resources::SpecFile.route_handler)
+    register(JsTestCore::Resources::File.route_handler)
+    register(JsTestCore::Resources::ImplementationsDeprecation.route_handler)
+    register(JsTestCore::Resources::NotFound.route_handler)
+  end
+end

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

@@ -1,24 +1,17 @@
 module JsTestCore
   class Client
-    class << self
-      def run(params={})
-        data = []
-        data << "selenium_host=#{CGI.escape(params[:selenium_host] || 'localhost')}"
-        data << "selenium_port=#{CGI.escape((params[:selenium_port] || 4444).to_s)}"
-        data << "spec_url=#{CGI.escape(params[:spec_url])}" if params[:spec_url]
-        response = Net::HTTP.start(DEFAULT_HOST, DEFAULT_PORT) do |http|
-          http.post('/runners/firefox', data.join("&"))
-        end
+    class ClientException < Exception
+    end
 
-        body = response.body
-        if body.empty?
-          puts "SUCCESS"
-          return true
-        else
-          puts "FAILURE"
-          puts body
-          return false
-        end
+    class InvalidStatusResponse < ClientException
+    end
+
+    class SessionNotFound < ClientException
+    end
+
+    class << self
+      def run(parameters={})
+        new(parameters).run
       end
 
       def run_argv(argv)
@@ -28,6 +21,10 @@ module JsTestCore
           o.banner << "\nUsage: #{$0} [options] [-- untouched arguments]"
 
           o.on
+          o.on('-s', '--selenium_browser_start_command=selenium_browser_start_command', "The Selenium server command to start the browser. See http://selenium-rc.openqa.org/") do |selenium_browser_start_command|
+            params[:selenium_browser_start_command] = selenium_browser_start_command
+          end
+
           o.on('-h', '--selenium_host=SELENIUM_HOST', "The host name of the Selenium Server relative to where this file is executed") do |host|
             params[:selenium_host] = host
           end
@@ -40,11 +37,93 @@ module JsTestCore
             params[:spec_url] = spec_url
           end
 
+          o.on('-t', '--timeout=TIMEOUT', "The timeout limit of the test run") do |timeout|
+            params[:timeout] = Integer(timeout)
+          end
+
           o.on_tail
         end
         parser.order!(argv)
         run params
       end
     end
+
+    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)
+    end
+
+    def run
+      if parameters[:timeout]
+        Timeout.timeout(parameters[:timeout]) {do_run}
+      else
+        do_run
+      end
+    end
+
+    def parts_from_query(query)
+      query.split('&').inject({}) do |acc, key_value_pair|
+        key, value = key_value_pair.split('=')
+        acc[key] = value
+        acc
+      end
+    end
+    
+    protected
+    def do_run
+      Net::HTTP.start(DEFAULT_HOST, DEFAULT_PORT) do |@http|
+        start_runner
+        wait_for_session_to_finish
+      end
+      report_result
+    end
+
+    def start_runner
+      @session_start_response = http.post(Resources::SeleniumSession.path, query_string)
+    end
+
+    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::SeleniumSession::SUCCESSFUL_COMPLETION
+        STDOUT.puts "SUCCESS"
+        true
+      when Resources::SeleniumSession::FAILURE_COMPLETION
+        STDOUT.puts "FAILURE"
+        STDOUT.puts last_poll_reason
+        false
+      else
+        raise InvalidStatusResponse, "Invalid Status: #{last_poll_status}"
+      end
+    end
+
+    def session_not_completed?
+      last_poll_status.nil? || last_poll_status == Resources::SeleniumSession::RUNNING
+    end
+
+    def poll
+      @last_poll = http.get(Resources::SeleniumSession.path("/:session_id", :session_id => 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_session_exists!
+      if (400..499).include?(Integer(last_poll.code))
+        raise SessionNotFound, "Could not find session with id #{session_id}"
+      end
+    end
+
+    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/configuration.rb

@@ -0,0 +1,35 @@
+module JsTestCore
+  class Configuration
+    class << self
+      attr_accessor :instance
+
+      def method_missing(method_name, *args, &block)
+        if Configuration.instance.respond_to?(method_name)
+          Configuration.instance.send(method_name, *args, &block)
+        else
+          super
+        end
+      end
+    end
+
+    attr_accessor :host, :port, :spec_root_path, :public_path, :core_path
+
+    def initialize(params={})
+      params = {
+        :spec_root_path => File.expand_path("./specs/javascripts"),
+        :public_path => File.expand_path("./public"),
+        :host => DEFAULT_HOST,
+        :port => DEFAULT_PORT,
+      }.merge(params)
+      @spec_root_path = ::File.expand_path(params[:spec_root_path])
+      @public_path = ::File.expand_path(params[:public_path])
+      @host = params[:host]
+      @port = params[:port]
+      @core_path = params[:core_path]
+    end
+
+    def root_url
+      "http://#{host}:#{port}"
+    end
+  end
+end

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

@@ -0,0 +1,3 @@
+Dir["#{File.dirname(__FILE__)}/extensions/**/*.rb"].each do |file|
+  require file
+end

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

@@ -0,0 +1,7 @@
+module Selenium
+  module Client
+    Driver.class_eval do
+      attr_reader :session_id
+    end
+  end
+end

data/vendor/js-test-core/lib/js_test_core/extensions/time.rb

@@ -0,0 +1,6 @@
+require "time"
+class Time
+  def rfc822
+    strftime("%a, %d %b %Y %k:%M:%S %Z")
+  end  
+end

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

@@ -0,0 +1,8 @@
+dir = File.dirname(__FILE__)
+
+module JsTestCore
+  module Models
+  end
+end
+
+require "#{dir}/models/selenium_session"

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

@@ -0,0 +1,80 @@
+module JsTestCore
+  module Models
+    class SeleniumSession
+      class << self
+        def find(id)
+          instances[id.to_s]
+        end
+
+        def register(selenium_session)
+          instances[selenium_session.session_id] = selenium_session
+        end
+
+        protected
+        def instances
+          @instances ||= {}
+        end
+      end
+      
+      attr_reader :spec_url, :selenium_browser_start_command, :selenium_host, :selenium_port, :http_address, :driver, :run_result
+
+      def initialize(params={})
+        @spec_url = params[:spec_url]
+        @selenium_browser_start_command = params[:selenium_browser_start_command]
+        @selenium_host = params[:selenium_host]
+        @selenium_port = params[:selenium_port]
+
+        memoized_parsed_spec_url = parsed_spec_url
+        @http_address = "#{memoized_parsed_spec_url.scheme}://#{memoized_parsed_spec_url.host}:#{memoized_parsed_spec_url.port}"
+
+        @driver = Selenium::Client::Driver.new(
+          selenium_host,
+          selenium_port,
+          selenium_browser_start_command,
+          http_address
+        )
+      end
+
+      def start
+        begin
+          driver.start
+        rescue Errno::ECONNREFUSED => e
+          raise Errno::ECONNREFUSED, "Cannot connect to Selenium Server at #{http_address}. To start the selenium server, run `selenium`."
+        end
+        self.class.register(self)
+        Thread.start do
+          driver.open("/")
+          driver.create_cookie("session_id=#{session_id}")
+          driver.open(parsed_spec_url.path)
+        end
+      end
+
+      def session_id
+        driver.session_id
+      end
+
+      def finish(run_result)
+        driver.stop
+        @run_result = run_result.to_s
+      end
+
+      def running?
+        driver.session_started?
+      end
+
+      def successful?
+        !running? && run_result.empty?
+      end
+
+      def failed?
+        !running? && !successful?
+      end
+
+      protected
+
+      def parsed_spec_url
+        URI.parse(spec_url)
+      end
+    end
+  end
+end

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

@@ -0,0 +1,11 @@
+dir = File.dirname(__FILE__)
+
+module JsTestCore
+  module Representations
+  end
+end
+
+require "#{dir}/representations/page.html"
+require "#{dir}/representations/not_found.html"
+require "#{dir}/representations/spec.html"
+require "#{dir}/representations/dir.html"

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

@@ -0,0 +1,24 @@
+module JsTestCore
+  module Representations
+    class Dir < Page
+      needs :relative_path, :absolute_path
+      protected
+      def body_content
+        ul do
+          ::Dir.glob("#{absolute_path}/*").inject("") do |html, file|
+            li do
+              a(
+                ::File.basename(file),
+                :href => "#{relative_path}/#{::File.basename(file)}".gsub("//", "/")
+              )
+            end
+          end
+        end
+      end
+
+      def title_text
+        "Contents of #{relative_path}"
+      end
+    end
+  end
+end

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

@@ -0,0 +1,15 @@
+module JsTestCore
+  module Representations
+    class NotFound < Page
+      needs :message
+      protected
+      def body_content
+        h1 message
+      end
+
+      def title_text
+        message
+      end
+    end
+  end
+end