screw-unit 0.3.3 → 0.5.1

data/spec/functional/functional_spec.rb

@@ -20,6 +20,6 @@ describe "ScrewUnit" do
   it "runs a full failing Suite" do
     ScrewUnit::Client.run(:spec_url => "#{root_url}/specs/foo/failing_spec")
     stdout.string.strip.should include("FAILURE")
-    stdout.string.strip.should include("expected true to equal false")
+    stdout.string.strip.should include("A failing spec in foo fails: expected true to equal false")
   end
 end

data/spec/functional/functional_spec_helper.rb

@@ -1,55 +1,43 @@
 require "rubygems"
 require "spec"
-
+require "spec/autorun"
+require "selenium_rc"
+require "thin"
 dir = File.dirname(__FILE__)
-$LOAD_PATH.unshift "#{dir}/../../lib"
-require "screw_unit"
-require "hpricot"
-require "lsof"
+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)
 
-module WaitFor
-  extend self
-  def wait_for(time=5)
-    Timeout.timeout(time) do
-      loop do
-        value = yield
-        return value if value
-      end
-    end
-  end
-end
 
 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
-    Lsof.kill(8080)
-    wait_for do
-      !Lsof.running?(8080)
-    end
-    dir = File.dirname(__FILE__)
-    @spec_root_path = "#{dir}/../example_specs"
-    @public_path = "#{dir}/../example_public"
-    @implementation_root_path = "#{public_path}/javascripts"
-    unless $screw_unit_server_started
+    @spec_root_path = FunctionalSpecServerStarter.spec_root_path
+    @public_path = FunctionalSpecServerStarter.public_path
+    unless SeleniumRC::Server.service_is_running?
       Thread.start do
-        ScrewUnit::Server.run(spec_root_path, implementation_root_path, public_path)
+        SeleniumRC::Server.boot
       end
-      $screw_unit_server_started = true
-    end
-    wait_for do
-      Lsof.running?(8080)
     end
+    FunctionalSpecServerStarter.call
+    TCPSocket.wait_for_service :host => "0.0.0.0", :port => "4444"
   end
 
   def root_url
     "http://#{ScrewUnit::DEFAULT_HOST}:#{ScrewUnit::DEFAULT_PORT}"
   end
 end
+

data/spec/functional/functional_spec_server_starter.rb

@@ -0,0 +1,68 @@
+require "rubygems"
+require "timeout"
+require "lsof"
+dir = File.dirname(__FILE__)
+$LOAD_PATH.unshift "#{dir}/../../lib"
+require "screw_unit"
+require "nokogiri"
+
+module WaitFor
+  extend self
+  def wait_for(time=5)
+    Timeout.timeout(time) do
+      loop do
+        value = yield
+        return value if value
+      end
+    end
+  end
+end
+
+class FunctionalSpecServerStarter
+  class << self
+    include WaitFor
+    def call(threaded=true)
+      return if $screw_unit_server_started
+
+      Lsof.kill(8080)
+      wait_for do
+        !Lsof.running?(8080)
+      end
+
+      dir = File.dirname(__FILE__)
+      Dir.chdir("#{dir}/../../") do
+        Thread.start do
+          start_thin_server
+        end
+      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
+
+    def public_path
+      File.expand_path("#{dir}/../example_public")
+    end
+
+    def dir
+      dir = File.dirname(__FILE__)
+    end
+  end
+end
+
+if $0 == __FILE__
+  FunctionalSpecServerStarter.call(false)
+end

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

@@ -4,28 +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
-            mock(connection).send_body(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
+
+            it "returns script tags for the test javascript file" do
+              doc.at("script[@src='/specs/failing_spec.js']").should_not be_nil
             end
-            
-            connection.receive_data("GET /specs/failing_spec HTTP/1.1\r\nHost: _\r\n\r\n")
-            @doc = Hpricot(html)
-          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,118 +1,51 @@
 require "rubygems"
 require "spec"
-dir = File.dirname(__FILE__)
+require "spec/autorun"
+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 "hpricot"
+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,3 +1,11 @@
+- 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

data/vendor/js-test-core/Rakefile

@@ -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,38 +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/thin-rest/lib")
-require "thin_rest"
-
-# This causes errors to be printed to STDOUT.
-Thin::Logging.silent = false
-Thin::Logging.debug = true
+$LOAD_PATH.unshift File.expand_path("#{dir}/../vendor/lucky-luciano/lib")
+require "lucky_luciano"
 
 require "fileutils"
 require "tmpdir"
 require "timeout"
 require "cgi"
 require "net/http"
-require "selenium"
+require "selenium/client"
 require "optparse"
+require "erector"
+
+require "#{dir}/js_test_core/configuration"
 
 require "#{dir}/js_test_core/extensions"
-require "#{dir}/js_test_core/thin"
-require "#{dir}/js_test_core/rack"
+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/selenium_server_configuration"
-require "#{dir}/js_test_core/server"
-require "#{dir}/js_test_core/rails_server"
+
+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