js_spec 0.2.1 → 0.3.0

data/CHANGES

@@ -1,3 +1,15 @@
+0.3.0
+- Client accepts selenium_server_start_command parameter, which allows the user to parameterize the selenium_server_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
+- Added JSSpec.session_id method
+- Removed JSSpec.guid property
+- Sending session_id post parameter instead of guid
+- Using Selenium session_id instead of a generated guid to identify the session.
+- ExampleGroups no longer need to be constructors
+- Fixed finalize for nil error when running specs from the browser
+
 0.2.1
 - Using thin 0.8.1
 - Fixed server crashing on exception issue.

data/README

@@ -36,5 +36,6 @@ To use JsSpec in a CI environment,
     selenium
   * Run the js_spec_server on the machine that has the files.
     script/js_spec_server
-  * Run the js_spec client. The js_spec client has --selenium_host, --selenium_port, and --spec_url arguments to specify
+  * Run the js_spec client. The js_spec client has --selenium_browser_start_command, --selenium_host, --selenium_port, and --spec_url arguments to specify
     where the Selenium server is relative to the js_spec server, and where the js_spec server is relative to the browser.
+  * Running `script/js_spec_server` is equivalent to running `script/js_spec_server --selenium_browser_start_command *firefox --selenium_host localhost --selenium_port 4444 --spec_url http://localhost:8080/specs`

data/Rakefile

@@ -26,7 +26,7 @@ def run_suite
 end
 
 PKG_NAME = "js_spec"
-PKG_VERSION = "0.2.1"
+PKG_VERSION = "0.3.0"
 PKG_FILES = FileList[
   '[A-Z]*',
   '*.rb',
@@ -58,8 +58,7 @@ spec = Gem::Specification.new do |s|
   s.homepage = "http://pivotallabs.com"
   s.rubyforge_project = "pivotalrb"
   s.add_dependency('Selenium')
-  s.add_dependency('thin')
-  s.add_dependency('uuid')
+  s.add_dependency('thin', '=0.8.1')
 end
 
 Rake::GemPackageTask.new(spec) do |pkg|

data/core/JSSpecExtensions.js

@@ -1,17 +1,17 @@
 function Spec() {
 }
 
-Spec.register = function(spec_constructor) {
-  spec_constructor.describe = function(context, definition) {
+Spec.register = function(example_group) {
+  example_group.describe = function(context, definition) {
     var custom_before = definition['before each'];
     if(custom_before) {
       definition['before each'] = function() {
-        if(spec_constructor['before each']) spec_constructor['before each']();
+        if(example_group['before each']) example_group['before each']();
         custom_before();
       }
     } else {
       definition['before each'] = function() {
-        if(spec_constructor['before each']) spec_constructor['before each']();
+        if(example_group['before each']) example_group['before each']();
       };
     }
 
@@ -19,17 +19,16 @@ Spec.register = function(spec_constructor) {
     if(custom_after) {
       definition['after each'] = function() {
         custom_after();
-        if(spec_constructor['after each']) spec_constructor['after each']();
+        if(example_group['after each']) example_group['after each']();
         Spec.reset();
       }
     } else {
       definition['after each'] = function() {
-        if(spec_constructor['after each']) spec_constructor['after each']();
+        if(example_group['after each']) example_group['after each']();
         Spec.reset();
       }
     }
-    new spec_constructor();
-    describe(spec_constructor.name.toString() + context.toString(), definition);
+    describe(example_group.name.toString() + context.toString(), definition);
   }
 }
 
@@ -93,16 +92,19 @@ function parse_url(url) {
 JSSpec.Logger.prototype.onRunnerEndWithoutServerNotification = JSSpec.Logger.prototype.onRunnerEnd;
 JSSpec.Logger.prototype.onRunnerEndWithServerNotification = function() {
   this.onRunnerEndWithoutServerNotification();
-  var xml = window.ActiveXObject ? new ActiveXObject("Microsoft.XMLHTTP") : new XMLHttpRequest();
-  xml.open("POST", '/suites/1/finish', true);
-  xml.setRequestHeader("X-Requested-With", "XMLHttpRequest");
-  var body = [];
-  body.push(encodeURIComponent("guid") + "=" + encodeURIComponent( JSSpec.guid ));
-  body.push(encodeURIComponent("text") + "=" + encodeURIComponent( this.get_error_message_text() ));
-  xml.send(body.join("&"));
+  var suite_id = JSSpec.suite_id();
+  if(suite_id) {
+    var xml = window.ActiveXObject ? new ActiveXObject("Microsoft.XMLHTTP") : new XMLHttpRequest();
+    xml.open("POST", '/suites/' + suite_id + '/finish', true);
+    xml.setRequestHeader("X-Requested-With", "XMLHttpRequest");
+    xml.send("text=" + encodeURIComponent(this.get_error_message_text()));
+  }
 }
 JSSpec.Logger.prototype.onRunnerEnd = JSSpec.Logger.prototype.onRunnerEndWithServerNotification;
-JSSpec.guid = null;
+
+JSSpec.suite_id = function() {
+  return top.runOptions ? top.runOptions.getSessionId() : 'user';
+}
 
 JSSpec.Logger.prototype.get_error_message_text = function() {
   var error_messages = [];

data/lib/js_spec/resources/{spec_runner.rb → spec.rb}

@@ -1,8 +1,7 @@
 module JsSpec
   module Resources
-    class SpecRunner
-      def get(request, response)
-        guid = (request && request['guid']) || 'null';
+    module Spec
+      def get
         html = <<-HTML
         <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
         <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="ko">
@@ -12,7 +11,6 @@ module JsSpec
         <link rel="stylesheet" type="text/css" href="/core/JSSpec.css" />
         <script type="text/javascript" src="/core/diff_match_patch.js"></script>
         <script type="text/javascript" src="/core/JSSpec.js"></script>
-        <script type="text/javascript" src="/core/jquery.js"></script>
         <script type="text/javascript" src="/core/JSSpecExtensions.js"></script>
         HTML
         spec_files.each do |file|
@@ -20,16 +18,14 @@ module JsSpec
         end
 
         html << <<-HTML
-        <script type="text/javascript">
-          JSSpec.guid = '#{guid}';
-        </script>
         </head>
         <body>
         <div id="js_spec_content"></div>
         </body>
         </html>
         HTML
-        response.body = html.gsub(/^        /, "")
+        connection.send_head
+        connection.send_body(html.gsub(/^        /, ""))
       end
     end
   end

data/lib/js_spec/resources.rb

@@ -1,11 +1,2 @@
 dir = File.dirname(__FILE__)
-require "#{dir}/resources/runners"
-require "#{dir}/resources/runners/firefox_runner"
-require "#{dir}/resources/spec_runner"
-require "#{dir}/resources/spec_file_runner"
-require "#{dir}/resources/spec_dir_runner"
-require "#{dir}/resources/file"
-require "#{dir}/resources/dir"
-require "#{dir}/resources/web_root"
-require "#{dir}/resources/suite"
-require "#{dir}/resources/suite_finish"
+require "#{dir}/resources/spec"

data/lib/js_spec.rb

@@ -1,27 +1,26 @@
 require "rubygems"
-gem "eventmachine", "0.10.0"
-gem "thin", "0.8.0"
-
-require "thin"
-require "fileutils"
-require "tmpdir"
-require "timeout"
-require "cgi"
-require "net/http"
-require "selenium"
-require "optparse"
 
 dir = File.dirname(__FILE__)
-require "#{dir}/js_spec/guid"
-require "#{dir}/js_spec/thin"
-require "#{dir}/js_spec/rack"
-require "#{dir}/js_spec/resources"
+$:.unshift(File.expand_path("#{dir}/../vendor/js-test-core/lib"))
+require "js_test_core"
+JsTestCore::Resources::WebRoot.dispatch_specs
 
-require "#{dir}/js_spec/client"
-require "#{dir}/js_spec/server"
-require "#{dir}/js_spec/rails_server"
+require "#{dir}/js_spec/resources"
 
 module JsSpec
-  DEFAULT_HOST = "0.0.0.0"
-  DEFAULT_PORT = 8080  
+  DEFAULT_HOST = JsTestCore::DEFAULT_HOST
+  DEFAULT_PORT = JsTestCore::DEFAULT_PORT
+
+  Server = JsTestCore::Server
+  RailsServer = JsTestCore::RailsServer
+  Client = JsTestCore::Client
+end
+JsTestCore.core_path = File.expand_path("#{dir}/../core")
+
+class JsTestCore::Resources::Specs::SpecFile
+  include JsSpec::Resources::Spec
+end
+
+class JsTestCore::Resources::Specs::SpecDir
+  include JsSpec::Resources::Spec
 end

data/spec/integration/integration_spec.rb

@@ -1,14 +1,25 @@
 require File.expand_path("#{File.dirname(__FILE__)}/integration_spec_helper")
 
 describe "JsSpec" do
+  attr_reader :stdout, :request
+  before do
+    @stdout = StringIO.new
+    JsSpec::Client.const_set(:STDOUT, stdout)
+    @request = "http request"
+  end
+
+  after do
+    JsSpec::Client.__send__(:remove_const, :STDOUT)
+  end
+
   it "runs a full passing Suite" do
-    mock(JsSpec::Client).puts("SUCCESS")
     JsSpec::Client.run(:spec_url => "#{root_url}/specs/foo/passing_spec")
+    stdout.string.strip.should == "SUCCESS"
   end
 
   it "runs a full failing Suite" do
-    mock(JsSpec::Client).puts("FAILURE")
-    mock(JsSpec::Client).puts(/A failing spec in foo fails/)
     JsSpec::Client.run(:spec_url => "#{root_url}/specs/foo/failing_spec")
+    stdout.string.strip.should include("FAILURE")
+    stdout.string.strip.should include("A failing spec in foo fails")
   end
 end

data/spec/integration/integration_spec_helper.rb

@@ -1,8 +1,7 @@
 require "rubygems"
-dir = File.dirname(__FILE__)
-$LOAD_PATH.unshift "#{dir}/../../../plugins/rspec/lib"
 require "spec"
 
+dir = File.dirname(__FILE__)
 $LOAD_PATH.unshift "#{dir}/../../lib"
 require "js_spec"
 require "hpricot"

data/spec/unit/js_test_core/resources/spec_dir_spec.rb

@@ -0,0 +1,35 @@
+require File.expand_path("#{File.dirname(__FILE__)}/../../unit_spec_helper")
+
+module JsTestCore
+  module Resources
+    module Specs
+      describe SpecDir do
+        describe "GET /specs" do
+          attr_reader :html, :doc
+          before do
+            mock(connection).send_head
+            mock(connection).send_body(anything) do |@html|
+              # do nothing
+            end
+
+            connection.receive_data("GET /specs HTTP/1.1\r\nHost: _\r\n\r\n")
+            @doc = Hpricot(html)
+          end
+
+          it "returns script tags for each test javascript file" do
+            doc.at("script[@src='/specs/failing_spec.js']").should exist
+            doc.at("script[@src='/specs/foo/failing_spec.js']").should exist
+            doc.at("script[@src='/specs/foo/passing_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/#js_spec_content").should_not be_nil
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,33 @@
+require File.expand_path("#{File.dirname(__FILE__)}/../../unit_spec_helper")
+
+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
+            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 exist
+          end
+
+          it "returns the screw unit 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/#js_spec_content").should_not be_nil
+          end
+        end
+      end
+    end
+  end
+end

data/spec/unit/unit_spec_helper.rb

@@ -1,11 +1,11 @@
 require "rubygems"
-dir = File.dirname(__FILE__)
-$LOAD_PATH.unshift "#{dir}/../../../plugins/rspec/lib"
 require "spec"
+dir = File.dirname(__FILE__)
 
 $LOAD_PATH.unshift "#{dir}/../../lib"
 require "js_spec"
 require "hpricot"
+require "guid"
 
 Spec::Runner.configure do |config|
   config.mock_with :rr
@@ -43,7 +43,7 @@ module Spec::Example::ExampleMethods
   end
 
   before(:each) do
-    JsSpec::Server.instance = JsSpec::Server.new(spec_root_path, implementation_root_path, public_path)
+    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
@@ -53,10 +53,10 @@ module Spec::Example::ExampleMethods
     stub(EventMachine).send_data do
       raise "Calls to EventMachine.send_data must be mocked or stubbed"
     end
-    @connection = Thin::JsSpecConnection.new(Guid.new)
+    @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 = JsSpec::Server.instance
+    @server = JsTestCore::Server.instance
     Thin::Logging.silent = !self.class.thin_logging
     Thin::Logging.debug = self.class.thin_logging
   end
@@ -83,7 +83,7 @@ module Spec::Example::ExampleMethods
   end
 
   def env_for(method, url, params)
-    Rack::MockRequest.env_for(url, params.merge({:method => method.to_s.upcase, 'js_spec.connection' => connection}))
+    Rack::MockRequest.env_for(url, params.merge({:method => method.to_s.upcase, 'js_test_core.connection' => connection}))
   end
 
   def create_request(method, url, params={})
@@ -93,17 +93,17 @@ module Spec::Example::ExampleMethods
   alias_method :request, :create_request
 
   def core_path
-    JsSpec::Server.core_path
+    JsTestCore::Server.core_path
   end
 
   def spec_file(relative_path)
     absolute_path = spec_root_path + relative_path
-    JsSpec::Resources::File.new(absolute_path, "/specs#{relative_path}")
+    JsTestCore::Resources::File.new(absolute_path, "/specs#{relative_path}")
   end
 
   def spec_dir(relative_path="")
     absolute_path = spec_root_path + relative_path
-    JsSpec::Resources::Dir.new(absolute_path, "/specs#{relative_path}")
+    JsTestCore::Resources::SpecDir.new(absolute_path, "/specs#{relative_path}")
   end
 
   def contain_spec_file_with_correct_paths(path_relative_to_spec_root)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: js_spec
 version: !ruby/object:Gem::Version 
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors: 
 - Brian Takita & Nathan Sobo
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-04-22 00:00:00 -07:00
+date: 2008-09-02 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,18 +26,9 @@ dependencies:
   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: 0.8.1
     version: 
 description: The JSSpec client library (http://code.google.com/p/jsspec/) plus a convenient ruby server.
 email: brian@pivotallabs.com
@@ -54,29 +45,10 @@ files:
 - CHANGES
 - README
 - init.rb
-- lib/js_spec/rack.rb
-- lib/js_spec/thin/backends/js_spec_server.rb
-- lib/js_spec/thin/js_spec_connection.rb
-- lib/js_spec/rack/commonlogger.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/firefox_runner.rb
-- lib/js_spec/resources/suite_finish.rb
-- lib/js_spec/resources/spec_dir_runner.rb
-- lib/js_spec/resources/web_root.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/resources/spec.rb
 - lib/js_spec/resources.rb
-- lib/js_spec/thin.rb
-- lib/js_spec/guid.rb
-- lib/js_spec/server.rb
-- lib/js_spec/client.rb
 - lib/js_spec.rb
 - core/JSSpec.js
-- core/jquery.js
 - core/diff_match_patch.js
 - core/JSSpecExtensions.js
 - core/exp
@@ -91,19 +63,8 @@ files:
 - 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/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/js_test_core/resources/spec_dir_spec.rb
+- spec/unit/js_test_core/resources/spec_file_spec.rb
 - spec/unit/unit_spec_helper.rb
 - spec/functional_suite.rb
 - spec/unit_suite.rb