js-test-driver-rails 0.3.3 → 0.3.4

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    js-test-driver-rails (0.3.2)
+    js-test-driver-rails (0.3.4)
       json
       rake
 

data/lib/js_test_driver/config.rb

@@ -100,6 +100,9 @@ module JsTestDriver
     # but you still need to specify port for starting the server
     define_config_variable(:server) { @server || "http://#{host}:#{port}" }
 
+    # the base path to which all of the paths in the config file are relative
+    define_config_variable(:base_path) { @base_path ||= '/' }
+
     def included_files
       @includes ||= []
     end
@@ -119,7 +122,7 @@ module JsTestDriver
     end
 
     def to_s
-      hash = {'server' => server}
+      hash = {'server' => server, 'basepath' => base_path}
       hash['load'] = loaded_files unless loaded_files.empty?
       hash['exclude'] = map_paths(excluded_files) unless excluded_files.empty?
       return hash.to_yaml
@@ -165,22 +168,12 @@ module JsTestDriver
       map_paths(files)
     end
 
-    def path_relative_to_config_dir(path)
-      source = File.expand_path(path).split(File::SEPARATOR)
-      config = File.expand_path(config_dir).split(File::SEPARATOR)
-
-      while source.first == config.first && !source.empty? && !config.empty?
-        source.shift
-        config.shift
-      end
-
-      parts = (['..'] * config.size) + source
-
-      return File.join(*parts)
+    def path_relative_to_base_path(path)
+      path.gsub(/^#{Regexp.escape(base_path)}/, '')
     end
 
     def map_paths(files)
-      files.map{|file| path_relative_to_config_dir(file)}
+      files.map{|file| path_relative_to_base_path(file)}
     end
 
     def attributes=(values)

data/lib/js_test_driver/runner.rb

@@ -58,12 +58,15 @@ module JsTestDriver
     # by default it will capture the browsers specified in the config,
     # but you can pass an argument like 'opera,chrome,firefox' to capture opera, chrome and firefox
     def capture_browsers(browsers = nil)
-      command = execute_jar
+      browsers ||= ''
+      browsers = browsers.split(',')
+      browsers = config.browsers if browsers.empty?
 
-      add_with_config(command)
-      add_capture_browsers(command, browsers)
+      url = config.server + "/capture"
 
-      command.run
+      browsers.each do |browser|
+        spawn("#{browser} \'#{url}\'")
+      end
     end
 
     # runs the tests specified by the argument
@@ -171,11 +174,11 @@ module JsTestDriver
       values.each do |attr, value|
         self.send("#{attr}=", value)
       end
-    end    
+    end
 
     class Command
       def initialize(executable)
-        @command = "#{executable}"  
+        @command = "#{executable}"
       end
 
       def option(name, value = nil)

data/lib/js_test_driver/version.rb

@@ -1,3 +1,3 @@
 module JsTestDriver
-  VERSION = "0.3.3"
+  VERSION = "0.3.4"
 end

data/test/unit/config_test.rb

@@ -4,7 +4,15 @@ module JsTestDriver
   class ConfigTest < Test::Unit::TestCase
 
     def default_result
-      {'server' => 'http://localhost:4224'}
+      {'server' => 'http://localhost:4224', 'basepath' => '/'}
+    end
+
+    def path(relative_file_name)
+      return File.expand_path(relative_file_name).gsub(/^\//, '')
+    end
+
+    def paths(arr)
+      arr.map{|s| path(s)}
     end
 
     def assert_config_includes(config, hash)
@@ -78,7 +86,7 @@ module JsTestDriver
       config.includes('src/foo.js')
 
       # then
-      assert_config_includes config, 'load' => ['src/foo.js']
+      assert_config_includes config, 'load' => paths(['src/foo.js'])
     end
 
     def test_config_with_includes_with_globbing
@@ -89,7 +97,7 @@ module JsTestDriver
       config.includes('test/fixtures/foo/**/*.html')
 
       # then
-      assert_config_includes config, 'load' => ['test/fixtures/foo/bar/a.html', 'test/fixtures/foo/a.html']
+      assert_config_includes config, 'load' => paths(['test/fixtures/foo/bar/a.html', 'test/fixtures/foo/a.html'])
     end
 
     def test_config_with_browsers
@@ -114,7 +122,7 @@ module JsTestDriver
       end
 
       # then
-      assert_config_includes config, 'load' => ['a', 'b', 'c']
+      assert_config_includes config, 'load' => paths(['a', 'b', 'c'])
     end
 
     def test_config_with_excludes
@@ -125,7 +133,7 @@ module JsTestDriver
       config.excludes('test/fixtures/foo/**/*.html')
 
       # then
-      assert_config_includes config, 'exclude' => ['test/fixtures/foo/bar/a.html', 'test/fixtures/foo/a.html']
+      assert_config_includes config, 'exclude' => paths(['test/fixtures/foo/bar/a.html', 'test/fixtures/foo/a.html'])
     end
 
     def test_config_with_excludes_with_globbing
@@ -136,7 +144,7 @@ module JsTestDriver
       config.excludes('src/foo.js')
 
       # then
-      assert_config_includes config, 'exclude' => ['src/foo.js']
+      assert_config_includes config, 'exclude' => paths(['src/foo.js'])
     end
 
     def test_empty_config_file
@@ -180,7 +188,7 @@ module JsTestDriver
       config.includes "a/a", "/b/b", "../c"
 
       # then
-      assert_config_includes config, 'load' => ["../../..#{pwd}/a/a", '../../../b/b', "../../..#{File.expand_path('../c')}"]
+      assert_config_includes config, 'load' => paths(["a/a", '/b/b', "../c"])
     end
 
     def test_config_with_html_fixtures
@@ -192,7 +200,7 @@ module JsTestDriver
       config.fixtures "fixture/directory", :name => "fixture_name", :namespace => "fixture_namespace"
 
       # then
-      assert_config_includes config, 'load' => ["fixtures/fixture_namespace/fixture_name.js"]
+      assert_config_includes config, 'load' => paths(["configs/fixtures/fixture_namespace/fixture_name.js"])
     end
 
     def test_should_save_fixtures

data/test/unit/runner_test.rb

@@ -4,7 +4,7 @@ module JsTestDriver
   class RunnerTest < Test::Unit::TestCase
 
     def given_a_runner(opts = {})
-      return JsTestDriver::Runner.new(opts)  
+      return JsTestDriver::Runner.new(opts)
     end
 
     def test_should_have_default_config_path
@@ -35,6 +35,10 @@ module JsTestDriver
       JsTestDriver::Runner::Command.any_instance.expects(:system).with(cmd)
     end
 
+    def expect_spawn(cmd)
+      JsTestDriver::Runner.any_instance.expects(:spawn).with(cmd)
+    end
+
     def test_should_run_server_with_given_port_number
       config = JsTestDriver::Config.new(:port => 6666)
       runner = given_a_runner(:config => config)
@@ -60,18 +64,12 @@ module JsTestDriver
       runner.run_tests('MyTestCase.some_test')
     end
 
-    def test_should_raise_exception_if_no_browsers_defined_to_capture
-      runner = given_a_runner(:config => JsTestDriver::Config.new)
-
-      assert_raises(ArgumentError) do
-        runner.capture_browsers
-      end
-    end
-
     def test_should_capture_default_browsers
       runner = given_a_runner(:config => JsTestDriver::Config.new(:browsers => ['foo', 'bar', 'baz']))
 
-      expect_command_to_be_executed("java -jar #{runner.jar_path} --config #{runner.config_yml_path} --browser foo,bar,baz")
+      ['foo', 'bar', 'baz'].each do |browser|
+        expect_spawn("#{browser} 'http://localhost:4224/capture'")
+      end
 
       runner.capture_browsers
     end
@@ -79,7 +77,9 @@ module JsTestDriver
     def test_should_capture_given_browsers
       runner = given_a_runner(:config => JsTestDriver::Config.new(:browsers => ['foo', 'bar', 'baz']))
 
-      expect_command_to_be_executed("java -jar #{runner.jar_path} --config #{runner.config_yml_path} --browser aaa,bbb")
+      ['aaa', 'bbb'].each do |browser|
+        expect_spawn("#{browser} 'http://localhost:4224/capture'")
+      end
 
       runner.capture_browsers('aaa,bbb')
     end
@@ -93,4 +93,4 @@ module JsTestDriver
     end
 
   end
-end
+end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 3
-  - 3
-  version: 0.3.3
+  - 4
+  version: 0.3.4
 platform: ruby
 authors: 
 - Adam Pohorecki