js-test-driver-rails 0.2.1 → 0.2.5

data/README

@@ -54,7 +54,7 @@ in your config file, somewhere before including your test files and you are gold
 
 # the fixtures will be accessible through myApp.html["<fixture name goes here>"]
 
-This gem comes with 3 rake tasks:
+This gem comes with some rake tasks:
 
 # start the js test driver server
 rake js_test_driver:start_server
@@ -65,4 +65,9 @@ rake js_test_driver:capture_browsers [BROWSERS=foo,bar,baz]
 # run the tests (all or the specified ones)
 rake js_test_driver:run_tests [TESTS=TestCase[.testMethod]]
 
+# will run the server, capture the browsers and run tests all in one command
+# this is mostly useful on CI, because it's much faster to run the server and capture the browsers once
+# and then run the tests again and again
+rake js_test_driver:run [TESTS=TestCase[.testMethod]] [BROWSERS=foo,bar,baz] [OUTPUT_XML=1 | OUTPUT_PATH=/some/dir] [CAPTURE_CONSOLE=1]
+
 You can add these tasks by requiring "js_test_driver/tasks"

data/VERSION

@@ -1 +1 @@
-0.2.1
+0.2.5

data/lib/js_test_driver/runner.rb

@@ -46,7 +46,11 @@ module JsTestDriver
 
     # starts the server on the default port specified in the config file
     def start_server
-      start_server_command.run
+      command = execute_jar
+
+      add_start_server(command)
+
+      command.run
     end
 
     # captures the browsers
@@ -54,7 +58,12 @@ 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)
-      capture_browsers_command(browsers).run
+      command = execute_jar
+
+      add_with_config(command)
+      add_capture_browsers(command, browsers)
+
+      command.run
     end
 
     # runs the tests specified by the argument
@@ -63,34 +72,62 @@ module JsTestDriver
     # 'TestCase' or 'TestCase.test'
     # to run either a single test case or a single test
     def run_tests(tests = nil)
-      run_tests_command(tests).run  
+      command = execute_jar
+
+      add_with_config(command)
+      add_run_tests(command, tests)
+
+      command.run
     end
 
-    protected
+    def start_server_capture_and_run(tests, browsers, output_xml_path = nil, console = nil)
+      command = execute_jar
+
+      add_start_server(command)
+      add_with_config(command)
+      add_capture_browsers(command, browsers)
+      add_run_tests(command, tests)
+      add_output_directory(command, output_xml_path) if output_xml_path
+      add_capture_console(command) if console
 
-    def start_server_command
-      execute_jar_command.option('--port', config.port)
+      command.run
     end
 
-    def run_tests_command(tests)
-      run_with_config.option('--tests', tests || "all") #.option('--runnerMode', 'DEBUG')
+    def add_start_server(command)
+      command.option('--port', config.port)
     end
 
-    def capture_browsers_command(browsers)
+    def add_run_tests(command, tests)
+      command.option('--tests', tests || "all")
+    end
+
+    def add_capture_browsers(command, browsers)
       browsers ||= config.browsers.join(',')
       raise ArgumentError.new("No browsers defined!") if browsers == ""
-      run_with_config.option('--browser', browsers)
+      command.option('--browser', browsers)
+    end
+
+    def add_output_directory(command, path)
+      path = File.expand_path(path)
+      FileUtils.mkdir_p(path) unless File.exists?(path)
+      command.option('--testOutput', path)
     end
 
-    def run_with_config
+    def add_capture_console(command)
+      command.option('--captureConsole')
+    end
+
+    def add_with_config(command)
       save_config_file(config_yml_path)
-      execute_jar_command.option('--config', config_yml_path)
+      command.option('--config', config_yml_path)
     end
 
-    def execute_jar_command
+    def execute_jar
       Command.new('java').option('-jar', jar_path)
     end
 
+    protected
+
     def parse_config
       source = ""
       if File.exist?(config_path)

data/lib/js_test_driver/tasks.rb

@@ -17,4 +17,12 @@ namespace :js_test_driver do
     JsTestDriver::Runner.new.capture_browsers(ENV['BROWSERS'])
   end
 
+  desc "Starts the server, captures the browsers, runs the tests - all at the same time"
+  task :run do
+    config = JsTestDriver::Runner.new
+    output_path = ENV['OUTPUT_PATH']
+    output_path = config.generated_files_dir if ENV['OUTPUT_XML']
+    config.start_server_capture_and_run(ENV['TESTS'], ENV['BROWSERS'], output_path, ENV['CAPTURE_CONSOLE'])
+  end
+
 end

data/test/unit/runner_test.rb

@@ -84,5 +84,13 @@ module JsTestDriver
       runner.capture_browsers('aaa,bbb')
     end
 
+    def test_should_run_with_all_arguments_at_once
+      runner = given_a_runner(:config => JsTestDriver::Config.new(:browsers => ['foo', 'bar', 'baz']))
+
+      expect_command_to_be_executed("java -jar #{runner.jar_path} --port 4224 --config #{runner.config_yml_path} --browser aaa,bbb --tests TestCase --testOutput #{File.expand_path('.js_test_driver')} --captureConsole")
+
+      runner.start_server_capture_and_run('TestCase', 'aaa,bbb', '.js_test_driver', true)
+    end
+
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: js-test-driver-rails
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 29
   prerelease: false
   segments: 
   - 0
   - 2
-  - 1
-  version: 0.2.1
+  - 5
+  version: 0.2.5
 platform: ruby
 authors: 
 - Adam Pohorecki
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-02 00:00:00 +02:00
+date: 2010-09-03 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency