js-test-driver-rails 0.5.0.pre2 → 0.5.0.pre3

data/Gemfile.lock

@@ -1,29 +1,29 @@
 PATH
   remote: .
   specs:
-    js-test-driver-rails (0.5.0.pre1)
+    js-test-driver-rails (0.5.0.pre3)
       commander
-      json
+      multi_json
       rake
       selenium-webdriver
 
 GEM
   remote: http://rubygems.org/
   specs:
-    childprocess (0.1.9)
+    childprocess (0.2.1)
       ffi (~> 1.0.6)
-    commander (4.0.4)
+    commander (4.0.5)
       highline (>= 1.5.0)
     ffi (1.0.9)
     highline (1.6.2)
-    json (1.5.1)
-    json_pure (1.5.1)
+    json_pure (1.5.3)
     mocha (0.9.9)
       rake
+    multi_json (1.0.3)
     rake (0.8.7)
     rubyzip (0.9.4)
-    selenium-webdriver (0.2.1)
-      childprocess (>= 0.1.7)
+    selenium-webdriver (2.4.0)
+      childprocess (>= 0.2.1)
       ffi (>= 1.0.7)
       json_pure
       rubyzip

data/js-test-driver-rails.gemspec

@@ -14,7 +14,7 @@ Gem::Specification.new do |s|
 
   s.rubyforge_project = "js-test-driver-rails"
 
-  s.add_dependency 'json'
+  s.add_dependency 'multi_json'
   s.add_dependency 'rake'
   s.add_dependency 'commander'
   s.add_dependency 'selenium-webdriver'

data/lib/js_test_driver/cli/run_tests.rb

@@ -11,7 +11,7 @@ module JsTestDriver
       end
 
       def run(opts = {})
-        jstd_jar_command.with_config.run_tests(opts[:tests])
+        jstd_jar_command.with_config.run_tests(opts[:tests]).reset_runner
 
         runner.run(jstd_jar_command.to_s)
       end

data/lib/js_test_driver/commands/base_command.rb

@@ -3,7 +3,7 @@ module JsTestDriver
 
     class BaseCommand
       def initialize(executable)
-        @command = "#{executable}"
+        @command = executable.to_s
         ensure_installed!
 
         @options = []
@@ -25,12 +25,20 @@ module JsTestDriver
         return ([@command] + @options + @args).compact.join(' ')
       end
 
+      protected
+
+      def executable_not_found!
+        raise JsTestDriver::MissingDependencyError.new("Could not find executable: #{@command}")
+      end
+
       private
 
+      def installed?
+        !%x[which #{@command}].strip.empty?
+      end
+
       def ensure_installed!
-        if %x[which #{@command}].strip.empty?
-          raise JsTestDriver::MissingDependencyError.new("Could not find executable: #{@command}")
-        end
+        executable_not_found! unless installed?
       end
 
       def escape(value)

data/lib/js_test_driver/commands/generate_coverage_report.rb

@@ -11,6 +11,12 @@ module JsTestDriver
         arg(runtime_config.coverage_data_file)
       end
 
+      protected
+
+      def executable_not_found!
+        warn("Could not find executable: #{@command}")
+      end
+
     end
 
   end

data/lib/js_test_driver/commands/jstd_jar_command.rb

@@ -52,6 +52,10 @@ module JsTestDriver
         return option('--runnerMode', mode)
       end
 
+      def reset_runner
+        return option('--reset')
+      end
+
       def browser_timeout(timeout)
         return option('--browserTimeout', timeout)
       end

data/lib/js_test_driver/html_fixture.rb

@@ -20,7 +20,7 @@ module JsTestDriver
     def to_s
       <<JS
 if (typeof(#{namespace}) === 'undefined') { #{namespace} = {}; }
-#{namespace}.#{name} = #{self.to_h.to_json};
+#{namespace}.#{name} = #{MultiJson.encode(self.to_h)};
 JS
     end
 

data/lib/js_test_driver/version.rb

@@ -1,3 +1,3 @@
 module JsTestDriver
-  VERSION = "0.5.0.pre2"
+  VERSION = "0.5.0.pre3"
 end

data/lib/js_test_driver.rb

@@ -1,4 +1,4 @@
-require 'json'
+require 'multi_json'
 require 'yaml'
 require 'fileutils'
 

data/test/unit/run_tests_test.rb

@@ -6,13 +6,13 @@ module JsTestDriver
     def test_should_run_all_tests_by_default
       application.run_tests
 
-      assert_run("java -jar #{runtime_config.jar_path} --serverHandlerPrefix jstd --config #{runtime_config.config_yml_path} --tests all")
+      assert_run("java -jar #{runtime_config.jar_path} --serverHandlerPrefix jstd --config #{runtime_config.config_yml_path} --tests all --reset")
     end
 
     def test_should_run_selected_tests
       application.run_tests(:tests => 'MyTestCase.some_test')
 
-      assert_run("java -jar #{runtime_config.jar_path} --serverHandlerPrefix jstd --config #{runtime_config.config_yml_path} --tests MyTestCase.some_test")
+      assert_run("java -jar #{runtime_config.jar_path} --serverHandlerPrefix jstd --config #{runtime_config.config_yml_path} --tests MyTestCase.some_test --reset")
     end
 
   end

data/vendor/jasmine.js

@@ -735,12 +735,17 @@ jasmine.Env.prototype.version = function () {
  * @returns string containing jasmine version build info, if set.
  */
 jasmine.Env.prototype.versionString = function() {
-  if (jasmine.version_) {
-    var version = this.version();
-    return version.major + "." + version.minor + "." + version.build + " revision " + version.revision;
-  } else {
+  if (!jasmine.version_) {
     return "version unknown";
   }
+
+  var version = this.version();
+  var versionString = version.major + "." + version.minor + "." + version.build;
+  if (version.release_candidate) {
+    versionString += ".rc" + version.release_candidate;
+  }
+  versionString += " revision " + version.revision;
+  return versionString;
 };
 
 /**
@@ -2463,10 +2468,10 @@ jasmine.getGlobal().clearInterval = function(timeoutKey) {
   }
 };
 
-
 jasmine.version_= {
   "major": 1,
   "minor": 1,
   "build": 0,
-  "revision": 1307546962
+  "revision": 1310556152,
+  "release_candidate": 3
 };

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: js-test-driver-rails
 version: !ruby/object:Gem::Version
-  version: 0.5.0.pre2
+  version: 0.5.0.pre3
   prerelease: 6
 platform: ruby
 authors:
@@ -9,12 +9,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-07-07 00:00:00.000000000 +02:00
+date: 2011-08-23 00:00:00.000000000 +02:00
 default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: json
-  requirement: &79918640 !ruby/object:Gem::Requirement
+  name: multi_json
+  requirement: &79185930 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *79918640
+  version_requirements: *79185930
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &79918430 !ruby/object:Gem::Requirement
+  requirement: &79185720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *79918430
+  version_requirements: *79185720
 - !ruby/object:Gem::Dependency
   name: commander
-  requirement: &79918220 !ruby/object:Gem::Requirement
+  requirement: &79185510 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *79918220
+  version_requirements: *79185510
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver
-  requirement: &79918010 !ruby/object:Gem::Requirement
+  requirement: &79185300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +55,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *79918010
+  version_requirements: *79185300
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &79917800 !ruby/object:Gem::Requirement
+  requirement: &79185090 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,7 +66,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *79917800
+  version_requirements: *79185090
 description: Use ruby to configure JsTestDriver, capture browsers and run tests.
 email:
 - adam@pohorecki.pl