pivotal-screw-unit 0.4.3 → 0.5.0

data/CHANGES

@@ -1,3 +1,9 @@
+0.5.0
+- Replaced thin-rest with Sinatra and Lucky Luciano as the server base.
+- The Screw Unit Server is now Rake middleware.
+- Sensible directory defaults for the screw_unit_server executable.
+- Replaced /implementations with /javascripts, assuming you have a /javascripts directory in the application root.
+
 0.4.0
 - Added ScrewUnit::Representations::Spec#project_js_files and #project_css_files, which can be overridden, so the javascript include mechanism is not needed.
 - Better error message when running using Selenium.

data/Rakefile

@@ -6,7 +6,7 @@ begin
     s.summary = "Server and helpers for your Screw Unit tests."
     s.email = "pivotallabsopensource@googlegroups.com"
     s.homepage = "http://github.com/pivotal/screw-unit-server"
-    s.description = "The Screw Unit server conveniently serves your Screw Unit specs and implementations javascript files and css stylesheets."
+    s.description = "The Screw Unit server conveniently serves your Screw Unit specs and javascript files and css stylesheets."
     s.authors = ["Pivotal Labs", "Brian Takita"]
     s.files = Dir["[A-Z]*"] +
       Dir["*.rb"] +
@@ -18,6 +18,9 @@ begin
     s.test_files = Dir['spec/**/*.rb']
     s.rdoc_options = ["--main", "README.markdown"]
     s.extra_rdoc_files = ["README.markdown", "CHANGES"]
+    s.add_dependency("thin", ">=1.2.1")
+    s.add_dependency("erector", ">=0.6.6")
+    s.add_dependency("selenium_client")
   end
 rescue LoadError
   puts "Jeweler, or one of its dependencies, is not available. Install it with: sudo gem install technicalpickles-jeweler -s http://gems.github.com"

data/VERSION.yml

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

data/bin/screw_unit_server

@@ -3,8 +3,18 @@
 dir = File.dirname(__FILE__)
 $LOAD_PATH.unshift("#{dir}/../lib")
 require "screw_unit"
+require "thin"
 
-spec_root_path = ARGV[0] || "./spec"
-implementation_root_path = ARGV[1] || "./public/javascripts"
-public_path = ARGV[2] || "./public"
-ScrewUnit::Server.run(spec_root_path, implementation_root_path, public_path)
+unless ENV["SCREW_UNIT_SPEC_ROOT"]
+  ENV["SCREW_UNIT_SPEC_ROOT"] = ARGV[0]
+end
+
+unless ENV["SCREW_UNIT_PUBLIC"]
+  ENV["SCREW_UNIT_PUBLIC"] = ARGV[1]
+end
+
+Thin::Runner.new([
+  "--port", "8080",
+  "--rackup", File.expand_path("#{dir}/../standalone.ru"),
+  "start"]
+).run!

data/lib/screw_unit/representations/spec.html.rb

@@ -76,7 +76,7 @@ module ScrewUnit
 
               ajax({
                 type: "POST",
-                url: '/session/finish',
+                url: '#{ScrewUnit::Resources::SeleniumSession.path("/finish")}',
                 data: {"text": error_text}
               });
             });

data/lib/screw_unit/resources/core_file.rb

@@ -0,0 +1,7 @@
+module ScrewUnit
+  module Resources
+    class CoreFile < File
+      map "/core"
+    end
+  end
+end

data/lib/screw_unit.rb

@@ -3,17 +3,21 @@ require "rubygems"
 dir = File.dirname(__FILE__)
 $:.unshift(File.expand_path("#{dir}/../vendor/js-test-core/lib"))
 require "js_test_core"
-JsTestCore::Resources::WebRoot.dispatch_specs
 
 require "#{dir}/screw_unit/representations"
 
+JsTestCore.core_path = File.expand_path("#{dir}/../core/lib")
+JsTestCore::Resources::SpecFile.spec_representation_class = ScrewUnit::Representations::Spec
 module ScrewUnit
-  DEFAULT_HOST = JsTestCore::DEFAULT_HOST
-  DEFAULT_PORT = JsTestCore::DEFAULT_PORT
+  include JsTestCore
 
-  Server = JsTestCore::Server
-  RailsServer = JsTestCore::RailsServer
-  Client = JsTestCore::Client
+  class << self
+    def method_missing(method_name, *args, &block)
+      if JsTestCore::Configuration.instance.respond_to?(method_name)
+        JsTestCore::Configuration.instance.send(method_name, *args, &block)
+      else
+        super
+      end
+    end
+  end
 end
-JsTestCore.core_path = File.expand_path("#{dir}/../core/lib")
-JsTestCore::Resources::Specs::Spec.spec_representation_class = ScrewUnit::Representations::Spec

data/spec/functional/functional_spec_helper.rb

@@ -2,24 +2,31 @@ require "rubygems"
 require "spec"
 require "spec/autorun"
 require "selenium_rc"
+require "thin"
 dir = File.dirname(__FILE__)
+LIBRARY_ROOT_DIR = File.expand_path("#{dir}/../..")
+require "#{LIBRARY_ROOT_DIR}/vendor/js-test-core/spec/spec_helpers/be_http"
+require "#{LIBRARY_ROOT_DIR}/vendor/js-test-core/spec/spec_helpers/show_test_exceptions"
 require "#{dir}/functional_spec_server_starter"
+ARGV.push("-b")
 
 Spec::Runner.configure do |config|
   config.mock_with :rr
 end
 
-Thin::Logging.silent = false
-Thin::Logging.debug = true
+Sinatra::Application.use ShowTestExceptions
+Sinatra::Application.set :raise_errors, true
+
+Sinatra::Application.use(ScrewUnit::App)
+
 
 class Spec::ExampleGroup
   include WaitFor
-  attr_reader :spec_root_path, :implementation_root_path, :public_path
+  attr_reader :spec_root_path, :public_path
 
   before(:all) do
     @spec_root_path = FunctionalSpecServerStarter.spec_root_path
     @public_path = FunctionalSpecServerStarter.public_path
-    @implementation_root_path = FunctionalSpecServerStarter.implementation_root_path
     unless SeleniumRC::Server.service_is_running?
       Thread.start do
         SeleniumRC::Server.boot

data/spec/functional/functional_spec_server_starter.rb

@@ -23,23 +23,32 @@ class FunctionalSpecServerStarter
     include WaitFor
     def call(threaded=true)
       return if $screw_unit_server_started
+
       Lsof.kill(8080)
       wait_for do
         !Lsof.running?(8080)
       end
-      if threaded
+
+      dir = File.dirname(__FILE__)
+      Dir.chdir("#{dir}/../../") do
         Thread.start do
-          ScrewUnit::Server.run(spec_root_path, implementation_root_path, public_path)
+          start_thin_server
         end
-      else
-        ScrewUnit::Server.run(spec_root_path, implementation_root_path, public_path)
       end
+
       wait_for do
         Lsof.running?(8080)
       end
       $screw_unit_server_started = true
     end
 
+    def start_thin_server
+      system("bin/screw_unit_server #{spec_root_path} #{public_path}")
+      at_exit do
+        Lsof.kill(8080)
+      end
+    end
+
     def spec_root_path
       File.expand_path("#{dir}/../example_specs")
     end
@@ -48,10 +57,6 @@ class FunctionalSpecServerStarter
       File.expand_path("#{dir}/../example_public")
     end
 
-    def implementation_root_path
-      File.expand_path("#{public_path}/javascripts")
-    end
-
     def dir
       dir = File.dirname(__FILE__)
     end

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

@@ -4,29 +4,62 @@ module JsTestCore
   module Resources
     module Specs
       describe SpecFile do
-        describe "GET /specs/failing_spec" do
-          attr_reader :html, :doc
-          before do
-            mock(connection).send_head(200, is_a(Hash))
-            mock(connection).send_data(/Content-Length:/)
-            mock(connection).send_data(anything) do |@html|
-              # do nothing
+        describe "File" do
+          describe "GET /specs/failing_spec" do
+            attr_reader :html, :doc
+            before do
+              response = get(SpecFile.path("/failing_spec"))
+              response.should be_http(
+                200,
+                {},
+                ""
+              )
+
+              @doc = Nokogiri::HTML(response.body)
             end
 
-            connection.receive_data("GET /specs/failing_spec HTTP/1.1\r\nHost: _\r\n\r\n")
-            @doc = Nokogiri::HTML(html)            
-          end
+            it "returns script tags for the test javascript file" do
+              doc.at("script[@src='/specs/failing_spec.js']").should_not be_nil
+            end
 
-          it "returns script tags for the test javascript file" do
-            doc.at("script[@src='/specs/failing_spec.js']").should_not be_nil
+            it "returns the screw unit template" do
+              doc.at("link[@href='/core/screw.css']").should_not be_nil
+              doc.at("script[@src='/core/screw.builder.js']").should_not be_nil
+              doc.at("script[@src='/core/screw.events.js']").should_not be_nil
+              doc.at("script[@src='/core/screw.behaviors.js']").should_not be_nil
+              doc.at("body/#screw_unit_content").should_not be_nil
+            end
           end
+        end
+
+        describe "Directory" do
+          describe "GET /specs" do
+            attr_reader :dir, :html, :doc
 
-          it "returns the screw unit template" do
-            doc.at("link[@href='/core/screw.css']").should_not be_nil
-            doc.at("script[@src='/core/screw.builder.js']").should_not be_nil
-            doc.at("script[@src='/core/screw.events.js']").should_not be_nil
-            doc.at("script[@src='/core/screw.behaviors.js']").should_not be_nil
-            doc.at("body/#screw_unit_content").should_not be_nil
+            before do
+              response = get(SpecFile.path("/"))
+              response.should be_http(
+                200,
+                {},
+                ""
+              )
+
+              @doc = Nokogiri::HTML(response.body)
+            end
+
+            it "returns script tags for each test javascript file" do
+              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 screw unit template" do
+              doc.at("link[@href='/core/screw.css']").should_not be_nil
+              doc.at("script[@src='/core/screw.builder.js']").should_not be_nil
+              doc.at("script[@src='/core/screw.events.js']").should_not be_nil
+              doc.at("script[@src='/core/screw.behaviors.js']").should_not be_nil
+              doc.at("body/#screw_unit_content").should_not be_nil
+            end
           end
         end
       end

data/spec/unit/unit_spec_helper.rb

@@ -1,119 +1,51 @@
 require "rubygems"
 require "spec"
 require "spec/autorun"
-dir = File.dirname(__FILE__)
+require "rack/test"
+ARGV.push("-b")
 
-$LOAD_PATH.unshift "#{dir}/../../lib"
+dir = File.dirname(__FILE__)
+LIBRARY_ROOT_DIR = File.expand_path("#{dir}/../..")
+$LOAD_PATH.unshift File.expand_path("#{LIBRARY_ROOT_DIR}/lib")
 require "screw_unit"
 require "nokogiri"
 require "guid"
+require "#{LIBRARY_ROOT_DIR}/vendor/js-test-core/spec/spec_helpers/be_http"
+require "#{LIBRARY_ROOT_DIR}/vendor/js-test-core/spec/spec_helpers/show_test_exceptions"
 
 Spec::Runner.configure do |config|
   config.mock_with :rr
 end
 
-module Spec
-  module Matchers
-    class Exist
-      def matches?(actual)
-        @actual = actual
-        !@actual.nil?
-      end
-    end
-  end
-end
+Sinatra::Application.use ShowTestExceptions
+Sinatra::Application.set :raise_errors, true
+Sinatra::Application.set :show_exceptions, false
+JsTestCore::App.set :raise_errors, true
+JsTestCore::App.set :show_exceptions, false
 
-class Spec::ExampleGroup
-  class << self
-    def thin_logging
-      @thin_logging = true if @thin_logging.nil?
-      @thin_logging
-    end
-
-    attr_writer :thin_logging
-  end
+Sinatra::Application.use(ScrewUnit::App)
 
-  attr_reader :spec_root_path, :implementation_root_path, :public_path, :server, :connection
+class Spec::ExampleGroup
+  include Rack::Test::Methods
+  include BeHttp
+  
+  attr_reader :spec_root_path, :public_path, :server, :connection
   before(:all) do
     dir = File.dirname(__FILE__)
     @spec_root_path = File.expand_path("#{dir}/../example_specs")
-    @implementation_root_path = File.expand_path("#{dir}/../example_public/javascripts")
     @public_path = File.expand_path("#{dir}/../example_public")
   end
 
   before(:each) do
-    JsTestCore::Server.instance = JsTestCore::Server.new(spec_root_path, implementation_root_path, public_path)
-    stub(EventMachine).run do
-      raise "You need to mock calls to EventMachine.run or the process will hang"
-    end
-    stub(EventMachine).start_server do
-      raise "You need to mock calls to EventMachine.start_server or the process will hang"
-    end
-    stub(EventMachine).send_data do
-      raise "Calls to EventMachine.send_data must be mocked or stubbed"
-    end
-    @connection = Thin::JsTestCoreConnection.new(Guid.new)
-    stub(EventMachine).send_data {raise "EventMachine.send_data must be handled"}
-    stub(EventMachine).close_connection {raise "EventMachine.close_connection must be handled"}
-    @server = JsTestCore::Server.instance
-    Thin::Logging.silent = !self.class.thin_logging
-    Thin::Logging.debug = self.class.thin_logging
-  end
-
-  after(:each) do
-    Thin::Logging.silent = true
-    Thin::Logging.debug = false
-  end
-
-  def get(url, params={})
-    request(:get, url, params)
-  end
-
-  def post(url, params={})
-    request(:post, url, params)
+    JsTestCore::Configuration.instance.spec_root_path = spec_root_path
+    JsTestCore::Configuration.instance.public_path = public_path
   end
 
-  def put(url, params={})
-    request(:put, url, params)
+  def app
+    Sinatra::Application
   end
 
-  def delete(url, params={})
-    request(:delete, url, params)
-  end
-
-  def env_for(method, url, params)
-    Rack::MockRequest.env_for(url, params.merge({:method => method.to_s.upcase, 'js_test_core.connection' => connection}))
-  end
-
-  def create_request(method, url, params={})
-    env = env_for(method, url, params)
-    server.call(env)[2]
-  end
-  alias_method :request, :create_request
-
   def core_path
     JsTestCore::Server.core_path
   end
-
-  def spec_file(relative_path)
-    absolute_path = spec_root_path + relative_path
-    JsTestCore::Resources::File.new(absolute_path, "/specs#{relative_path}")
-  end
-
-  def spec_dir(relative_path="")
-    absolute_path = spec_root_path + relative_path
-    JsTestCore::Resources::SpecDir.new(absolute_path, "/specs#{relative_path}")
-  end
-
-  def contain_spec_file_with_correct_paths(path_relative_to_spec_root)
-    expected_absolute_path = spec_root_path + path_relative_to_spec_root
-    expected_relative_path = "/specs" + path_relative_to_spec_root
-
-    ::Spec::Matchers::SimpleMatcher.new(expected_relative_path) do |globbed_files|
-      file = globbed_files.find do |file|
-        file.absolute_path == expected_absolute_path
-      end
-      file && file.relative_path == expected_relative_path
-    end
-  end
 end

data/vendor/js-test-core/CHANGES

@@ -1,7 +1,10 @@
+- 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

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

@@ -80,7 +80,7 @@ module JsTestCore
     end
 
     def start_runner
-      @session_start_response = http.post('/runners', query_string)
+      @session_start_response = http.post(Resources::SeleniumSession.path, query_string)
     end
 
     def wait_for_session_to_finish
@@ -92,10 +92,10 @@ module JsTestCore
 
     def report_result
       case last_poll_status
-      when Resources::Session::SUCCESSFUL_COMPLETION
+      when Resources::SeleniumSession::SUCCESSFUL_COMPLETION
         STDOUT.puts "SUCCESS"
         true
-      when Resources::Session::FAILURE_COMPLETION
+      when Resources::SeleniumSession::FAILURE_COMPLETION
         STDOUT.puts "FAILURE"
         STDOUT.puts last_poll_reason
         false
@@ -105,11 +105,11 @@ module JsTestCore
     end
 
     def session_not_completed?
-      last_poll_status.nil? || last_poll_status == Resources::Session::RUNNING
+      last_poll_status.nil? || last_poll_status == Resources::SeleniumSession::RUNNING
     end
 
     def poll
-      @last_poll = http.get("/sessions/#{session_id}")
+      @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']

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

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

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/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/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/{vendor/thin-rest/lib/thin_rest/representations/resource_not_found.html.rb → lib/js_test_core/representations/not_found.html.rb}

@@ -1,7 +1,7 @@
-module ThinRest
+module JsTestCore
   module Representations
-    class ResourceNotFound < Page
-      needs :path_info
+    class NotFound < Page
+      needs :message
       protected
       def body_content
         h1 message
@@ -10,10 +10,6 @@ module ThinRest
       def title_text
         message
       end
-
-      def message
-        "File #{path_info} not found"
-      end
     end
   end
 end

data/vendor/js-test-core/{vendor/thin-rest/lib/thin_rest → lib/js_test_core}/representations/page.html.rb

@@ -1,4 +1,4 @@
-module ThinRest
+module JsTestCore
   module Representations
     class Page < Erector::Widget
       def content(&block)