js_spec 0.1.0 → 0.2.0

data/spec/unit/{server_spec.rb → js_spec/server_spec.rb}

@@ -1,7 +1,17 @@
-require File.expand_path("#{File.dirname(__FILE__)}/unit_spec_helper")
+require File.expand_path("#{File.dirname(__FILE__)}/../unit_spec_helper")
 
 module JsSpec
   describe Server do
+    attr_reader :result
+    
+    before do
+      @result = ""
+      stub(EventMachine).send_data do |signature, data, data_length|
+        @result << data
+      end
+      stub(EventMachine).close_connection
+    end
+
     describe "HTTP GET" do
       specify "'/specs' returns an HTML test runner including all specs files" do
         result = get("/specs").body
@@ -26,13 +36,13 @@ module JsSpec
       end
 
       specify "'/core/JSSpec.js', returns the contents of the file" do
-        result = get("/core/JSSpec.js").body
-        result.should == ::File.read("#{Server.core_path}/JSSpec.js")
+        response = get("/core/JSSpec.js")
+        response.body.should == ::File.read("#{Server.core_path}/JSSpec.js")
       end
 
       specify "'/stylesheets/example.css', returns the contents of the file" do
-        result = get("/stylesheets/example.css").body
-        result.should == ::File.read("#{Server.public_path}/stylesheets/example.css")
+        response = get("/stylesheets/example.css")
+        response.body.should == ::File.read("#{Server.public_path}/stylesheets/example.css")
       end
 
       specify "'/invalid/path', shows the full invalid path in the error message" do
@@ -49,14 +59,12 @@ module JsSpec
         Server.instance = nil
       end
 
-      it "instantiates an instance of Server and starts a Rack Mongrel handler" do
-        host = Server::DEFAULT_HOST
-        port = Server::DEFAULT_PORT
+      it "instantiates an instance of Server and starts a Rack Thin handler" do
+        host = DEFAULT_HOST
+        port = DEFAULT_PORT
 
-        mock.proxy(Server).new(spec_root_path, implementation_root_path, public_path, host, port) do
-          server_instance
-        end
-        mock(Rack::Handler::Mongrel).run(server_instance, {:Host => host, :Port => port})
+        mock(EventMachine).run.yields
+        mock(EventMachine).start_server(host, port, ::Thin::JsSpecConnection)
 
         Server.run(spec_root_path, implementation_root_path, public_path)
       end
@@ -65,21 +73,13 @@ module JsSpec
         host = 'foobar.com'
         port = 80
 
-        mock.proxy(Server).new(spec_root_path, implementation_root_path, public_path, host, port) do
-          server_instance
-        end
-        mock(Rack::Handler::Mongrel).run(server_instance, {:Host => host, :Port => port})
+        mock(EventMachine).run.yields
+        mock(EventMachine).start_server(host, port, ::Thin::JsSpecConnection)
 
         Server.run(spec_root_path, implementation_root_path, public_path, {:Host => host, :Port => port})
       end
     end
 
-    describe ".default_url" do
-      it "returns the default host and port" do
-        Server.default_url.should == "http://#{Server::DEFAULT_HOST}:#{Server::DEFAULT_PORT}"
-      end
-    end
-
     describe ".spec_root" do
       it "returns the Dir " do
         Server.spec_root_path.should == spec_root_path
@@ -101,7 +101,7 @@ module JsSpec
     describe ".core_path" do
       it "returns the expanded path to the JsSpec core directory" do
         dir = ::File.dirname(__FILE__)
-        Server.core_path.should == ::File.expand_path("#{dir}/../../core")
+        Server.core_path.should == ::File.expand_path("#{dir}/../../../core")
       end
     end
 
@@ -112,76 +112,7 @@ module JsSpec
       end
     end
 
-    describe ".request" do
-      it "returns request in progress for the thread" do
-        the_request = nil
-        stub.instance_of(Resources::WebRoot).locate('somedir') do
-          the_request = JsSpec::Server.request
-          Thread.current[:request].should == the_request
-          thread2 = Thread.new do
-            Thread.current[:request].should be_nil
-          end
-          thread2.join
-
-          mock_resource = Object.new
-          stub(mock_resource).get.returns("")
-          mock_resource
-        end
-
-        get('/somedir')
-
-        the_request.path_info.should == '/somedir'
-      end
-
-      it "resets to nil when the request is finished" do
-        get('/core')
-
-        JsSpec::Server.request.should be_nil
-      end
-    end
-
-    describe ".response" do
-      it "returns response in progress" do
-        the_response = nil
-        stub.instance_of(Resources::WebRoot).locate('somedir') do
-          the_response = JsSpec::Server.response
-          Thread.current[:response].should == the_response
-          thread2 = Thread.new do
-            Thread.current[:response].should be_nil
-          end
-          thread2.join
-
-          mock_resource = Object.new
-          stub(mock_resource).get {"The text"}
-          mock_resource
-        end
-
-        get('/somedir')
-
-        the_response.body.should == 'The text'
-      end
-
-      it "resets to nil when the response is finished" do
-        get('/core')
-
-        JsSpec::Server.response.should be_nil
-      end
-    end
-
     describe "#call" do
-      it "when resource responds with a string, sets the string as the response.body" do
-        somedir_resource = Object.new
-        stub.instance_of(Resources::WebRoot).locate('somedir') do
-          somedir_resource
-        end
-
-        def somedir_resource.get
-          "Somedir String"
-        end
-        response = get('/somedir')
-        response.body.should == "Somedir String"
-      end
-
       describe "when there is an error" do
         attr_reader :top_line_of_backtrace
         before do
@@ -213,5 +144,11 @@ module JsSpec
         end
       end
     end
+
+    describe "#root_url" do
+      it "returns the url of the site's root" do
+        server.root_url.should == "http://#{server.host}:#{server.port}"
+      end
+    end
   end
 end

data/spec/unit/rack/response_spec.rb

@@ -0,0 +1,30 @@
+require File.expand_path("#{File.dirname(__FILE__)}/../unit_spec_helper")
+
+module Rack
+  describe Response do
+    describe "#ready?" do
+      attr_reader :response
+      describe "when there is a status" do
+        before do
+          @response = Response.new
+          @response.status.should_not be_nil
+        end
+
+        it "returns true" do
+          response.should be_ready
+        end
+      end
+
+      describe "when there is no status" do
+        before do
+          @response = Response.new
+          response.status = nil
+        end
+
+        it "returns true" do
+          response.should_not be_ready
+        end
+      end
+    end
+  end
+end

data/spec/unit/thin/js_spec_connection_spec.rb

@@ -0,0 +1,50 @@
+require File.expand_path("#{File.dirname(__FILE__)}/../unit_spec_helper")
+
+module Thin
+  describe JsSpecConnection do
+    describe "#process" do
+      attr_reader :connection, :result
+      before do
+        @connection = JsSpecConnection.new('signature')
+        stub(connection).socket_address {'0.0.0.0'}
+
+        @result = ""
+        stub(EventMachine).send_data do |signature, data, data_length|
+          result << data
+        end
+      end
+
+      describe "when the response code is not 0" do
+        attr_reader :somedir_resource
+        before do
+          mock(app = Object.new).call(is_a(Hash)) do
+            [200, {}, 'The Body']
+          end
+          connection.app = app
+        end
+
+        it "sends the response to the socket and closes the connection" do
+          mock(connection).close_connection_after_writing
+          connection.receive_data "GET /specs HTTP/1.1\r\nHost: _\r\n\r\n"
+          result.should include("The Body")
+        end
+      end
+
+      describe "when the response code is 0" do
+        attr_reader :somedir_resource
+        before do
+          mock(app = Object.new).call(is_a(Hash)) do
+            [0, {}, 'The Body']
+          end
+          connection.app = app
+        end
+
+        it "does not send data to the socket and keeps it open" do
+          dont_allow(connection).close_connection_after_writing
+          connection.receive_data "GET /specs HTTP/1.1\r\nHost: _\r\n\r\n"
+          result.should_not include("The Body")
+        end
+      end
+    end
+  end
+end

data/spec/unit/unit_spec_helper.rb

@@ -22,8 +22,19 @@ module Spec
   end
 end
 
+class Spec::Example::ExampleGroup
+  class << self
+    def thin_logging
+      @thin_logging = true if @thin_logging.nil?
+      @thin_logging
+    end
+
+    attr_writer :thin_logging
+  end
+end
+
 module Spec::Example::ExampleMethods
-  attr_reader :spec_root_path, :implementation_root_path, :public_path, :server
+  attr_reader :spec_root_path, :implementation_root_path, :public_path, :server, :connection
   before(:all) do
     dir = File.dirname(__FILE__)
     @spec_root_path = File.expand_path("#{dir}/../example_specs")
@@ -33,7 +44,26 @@ module Spec::Example::ExampleMethods
 
   before(:each) do
     JsSpec::Server.instance = JsSpec::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::JsSpecConnection.new(UUID.new)
+    stub(EventMachine).send_data {raise "EventMachine.send_data must be handled"}
+    stub(EventMachine).close_connection {raise "EventMachine.close_connection must be handled"}
     @server = JsSpec::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={})
@@ -52,11 +82,16 @@ module Spec::Example::ExampleMethods
     request(:delete, url, params)
   end
 
-  def request(method, url, params={})
-    @request = Rack::MockRequest.new(server)
-    @request.__send__(method, url, params)
+  def env_for(method, url, params)
+    Rack::MockRequest.env_for(url, params.merge({:method => method.to_s.upcase, 'js_spec.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
     JsSpec::Server.core_path
   end
@@ -82,4 +117,4 @@ module Spec::Example::ExampleMethods
       file && file.relative_path == expected_relative_path
     end
   end
-end
+end

metadata

@@ -1,91 +1,138 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.4
-specification_version: 1
 name: js_spec
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
-date: 2008-01-25 00:00:00 -08:00
-summary: The JSSpec client library (http://code.google.com/p/jsspec/) plus a convenient ruby server.
-require_paths: 
-- lib
-email: brian@pivotallabs.com
-homepage: http://pivotallabs.com
-rubyforge_project: pivotalrb
-description: The JSSpec client library (http://code.google.com/p/jsspec/) plus a convenient ruby server.
-autorequire: js_spec
-default_executable: 
-bindir: bin
-has_rdoc: true
-required_ruby_version: !ruby/object:Gem::Version::Requirement 
-  requirements: 
-  - - ">"
-    - !ruby/object:Gem::Version 
-      version: 0.0.0
-  version: 
+  version: 0.2.0
 platform: ruby
-signing_key: 
-cert_chain: 
-post_install_message: 
 authors: 
 - Brian Takita & Nathan Sobo
+autorequire: 
+bindir: bin
+cert_chain: []
+
+date: 2008-04-05 00:00:00 -07:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: Selenium
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: thin
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: uuid
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
+description: The JSSpec client library (http://code.google.com/p/jsspec/) plus a convenient ruby server.
+email: brian@pivotallabs.com
+executables: 
+- js_spec
+- js_spec_server
+extensions: []
+
+extra_rdoc_files: 
+- README
+- CHANGES
 files: 
+- Rakefile
 - CHANGES
 - README
-- Rakefile
-- lib/js_spec/rails_server.rb
+- init.rb
+- lib/js_spec/thin/backends/js_spec_server.rb
+- lib/js_spec/thin/js_spec_connection.rb
+- lib/js_spec/rack/response.rb
+- lib/js_spec/resources/spec_file_runner.rb
+- lib/js_spec/resources/spec_runner.rb
 - lib/js_spec/resources/dir.rb
+- lib/js_spec/resources/runners/firefox1_runner.rb
+- lib/js_spec/resources/runners/firefox_runner.rb
 - lib/js_spec/resources/suite_finish.rb
-- lib/js_spec/resources/runners.rb
-- lib/js_spec/resources/spec_runner.rb
 - lib/js_spec/resources/spec_dir_runner.rb
-- lib/js_spec/resources/file.rb
 - lib/js_spec/resources/web_root.rb
-- lib/js_spec/resources/runners/firefox_runner.rb
-- lib/js_spec/resources/spec_file_runner.rb
+- lib/js_spec/resources/file.rb
 - lib/js_spec/resources/suite.rb
+- lib/js_spec/resources/runners.rb
+- lib/js_spec/rails_server.rb
 - lib/js_spec/server.rb
+- lib/js_spec/client.rb
 - lib/js_spec.rb
-- core/COPYING
-- core/JSSpec.css
-- core/demo.html
-- core/exp
 - core/JSSpec.js
+- core/jquery.js
 - core/diff_match_patch.js
 - core/JSSpecExtensions.js
-- bin/js_spec
+- core/exp
+- core/JSSpec.css
+- core/demo.html
+- core/COPYING
 - bin/js_spec_server
-- spec/unit/resources/dir_spec.rb
-- spec/unit/resources/web_root_spec.rb
-- spec/unit/resources/suite_spec.rb
-- spec/unit/resources/spec_file_runner_spec.rb
-- spec/unit/resources/runner_spec.rb
-- spec/unit/resources/file_spec.rb
-- spec/unit/resources/runners/firefox_runner_spec.rb
-- spec/unit/resources/suite_finish_spec.rb
-- spec/unit/resources/spec_dir_runner_spec.rb
-- spec/unit/unit_spec_helper.rb
-- spec/unit/rails_server_spec.rb
-- spec/unit/server_spec.rb
-- spec/functional/functional_spec_helper.rb
+- bin/js_spec
+- spec/spec_suite.rb
 - spec/functional/server_spec.rb
+- spec/functional/functional_spec_helper.rb
+- spec/integration/integration_spec_helper.rb
+- spec/integration/integration_spec.rb
+- spec/integration_suite.rb
+- spec/unit/thin/js_spec_connection_spec.rb
+- spec/unit/rack/response_spec.rb
+- spec/unit/js_spec/resources/spec_file_runner_spec.rb
+- spec/unit/js_spec/resources/file_spec.rb
+- spec/unit/js_spec/resources/spec_dir_runner_spec.rb
+- spec/unit/js_spec/resources/suite_spec.rb
+- spec/unit/js_spec/resources/dir_spec.rb
+- spec/unit/js_spec/resources/suite_finish_spec.rb
+- spec/unit/js_spec/resources/web_root_spec.rb
+- spec/unit/js_spec/resources/runners/firefox_runner_spec.rb
+- spec/unit/js_spec/resources/runner_spec.rb
+- spec/unit/js_spec/server_spec.rb
+- spec/unit/js_spec/client_spec.rb
+- spec/unit/js_spec/rails_server_spec.rb
+- spec/unit/unit_spec_helper.rb
 - spec/functional_suite.rb
-- spec/spec_suite.rb
 - spec/unit_suite.rb
-test_files: []
-
+has_rdoc: true
+homepage: http://pivotallabs.com
+post_install_message: 
 rdoc_options: 
 - --main
 - README
 - --inline-source
 - --line-numbers
-extra_rdoc_files: 
-- README
-- CHANGES
-executables: 
-- js_spec_server
-extensions: []
-
+require_paths: 
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
 requirements: []
 
-dependencies: []
+rubyforge_project: pivotalrb
+rubygems_version: 1.1.0
+signing_key: 
+specification_version: 2
+summary: The JSSpec client library (http://code.google.com/p/jsspec/) plus a convenient ruby server.
+test_files: []
 

data/spec/unit/resources/runner_spec.rb

@@ -1,24 +0,0 @@
-require File.expand_path("#{File.dirname(__FILE__)}/../unit_spec_helper")
-
-module JsSpec
-  module Resources
-    describe Runners do
-    attr_reader :runner
-    before do
-      @runner = Runners.new
-    end
-
-    describe "#locate" do
-      it "when passed 'firefox', returns a FirefoxRunner" do
-        runner.locate('firefox').should be_instance_of(Runners::FirefoxRunner)
-      end
-
-      it "when not passed 'firefox', raises an error" do
-        lambda do
-          runner.locate('invalid')
-        end.should raise_error
-      end
-    end
-  end
-  end
-end

data/spec/unit/resources/runners/firefox_runner_spec.rb

@@ -1,87 +0,0 @@
-require File.expand_path("#{File.dirname(__FILE__)}/../../unit_spec_helper")
-
-module JsSpec
-  module Resources
-    describe Runners::FirefoxRunner do
-    attr_reader :runner
-    before do
-      @runner = Runners::FirefoxRunner.new
-    end
-
-    describe "#post" do
-      attr_reader :firefox_profile_path
-      before do
-        dir = ::File.dirname(__FILE__)
-        @firefox_profile_path = ::File.expand_path("#{dir}/../../../../resources/firefox")
-        ::File.should be_directory(firefox_profile_path)
-      end
-
-      it "returns ''" do
-        guid = nil
-        stub.proxy(UUID).new {|guid| guid = guid}
-        stub(runner).system {true}
-        stub(runner).sleep(0.5)
-        stub(runner).sleep {Kernel.sleep}
-
-        post_return_value = nil
-        Thread.start do
-          post_return_value = runner.post
-        end
-        wait_for do
-          Runners::FirefoxRunner.threads[guid]
-        end
-        Runners::FirefoxRunner.resume(guid, 'foobar')
-
-        wait_for do
-          post_return_value == 'foobar'
-        end
-      end
-
-      def wait_for(timeout=5)
-        Timeout.timeout(timeout) do
-          loop do
-            break if yield
-          end
-        end
-      end
-
-      it "copies the firefox profile files to a tmp directory " <<
-        "and creates a profile " <<
-        "and waits for profile to be created " <<
-        "and starts firefox" do
-        stub(runner).sleep
-
-        mock(runner).system("cp -R #{firefox_profile_path} #{runner.profile_dir}").ordered {true}
-        mock(runner).system("firefox -profile #{runner.profile_dir} -chrome chrome://killff/content/kill.html").ordered {true}
-        mock(::File).exists?("#{runner.profile_dir}/parent.lock").ordered {false}
-        mock(runner).sleep(0.5).ordered
-        mock(::File).exists?("#{runner.profile_dir}/parent.lock").ordered {false}
-        mock(runner).system(Regexp.new("firefox -profile #{runner.profile_dir} http://localhost:8080/specs")).ordered {true}
-        stub(runner).callcc
-        runner.post
-      end
-
-      it "calls #copy_profile_files, #create_profile, #wait_for_full_profile_to_be_created, and #start_browser" do
-        stub(runner).system {true}
-        stub(runner).sleep
-        stub(runner).callcc
-
-        mock.proxy(runner).copy_profile_files.ordered
-        mock.proxy(runner).create_profile.ordered
-        mock.proxy(runner).wait_for_full_profile_to_be_created.ordered
-        mock.proxy(runner).start_browser(is_a(String)).ordered
-
-        runner.post
-      end
-    end
-
-    describe "#start_browser" do
-      it "starts a firefox browser in a thread" do
-        mock(Thread).start.yields
-        mock(runner).system("firefox -profile #{runner.profile_dir} http://localhost:8080/specs?guid=foobar").ordered {true}
-        runner.__send__(:start_browser, "foobar")
-      end
-    end
-  end
-  end
-end

data/spec/unit/resources/spec_dir_runner_spec.rb

@@ -1,43 +0,0 @@
-require File.expand_path("#{File.dirname(__FILE__)}/../unit_spec_helper")
-
-module JsSpec
-  module Resources
-    describe SpecDirRunner do
-    attr_reader :dir, :runner
-
-    before do
-      @dir = Dir.new(spec_root_path, '/specs')
-      @runner = SpecDirRunner.new(dir)
-    end
-
-    describe "#spec_files" do
-      it "returns a File for each *_spec.js file in the directory" do
-        spec_files = runner.spec_files
-
-        spec_files.should contain_spec_file_with_correct_paths("/failing_spec.js")
-        spec_files.should contain_spec_file_with_correct_paths("/foo/failing_spec.js")
-        spec_files.should contain_spec_file_with_correct_paths("/foo/passing_spec.js")
-      end
-    end
-
-    describe "#get" do
-      attr_reader :html, :doc
-      before do
-        @html = runner.get()
-        @doc = Hpricot(html)
-      end
-
-      it "returns script tags for each test javascript file" do
-        doc.at("script[@src='/specs/failing_spec.js']").should exist
-      end
-
-      it "returns the js specs template" do
-        doc.at("link[@href='/core/JSSpec.css']").should exist
-        doc.at("script[@src='/core/JSSpec.js']").should exist
-        doc.at("script[@src='/core/JSSpecExtensions.js']").should exist
-        doc.at("body").inner_html.should be_empty
-      end
-    end
-  end
-  end
-end