parallel_tests 0.8.0 → 0.8.1

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    parallel_tests (0.8.0)
+    parallel_tests (0.8.1)
       parallel
 
 GEM

data/Readme.md

@@ -152,7 +152,6 @@ You can run any kind of code in parallel with -e / --execute
 
 TIPS
 ====
- - [Capybara + Selenium] add to env.rb: `Capybara.server_port = 8888 + ENV['TEST_ENV_NUMBER'].to_i`
  - [RSpec] add a `.rspec_parallel` to use different options, e.g. **no --drb**
  - [RSpec] delete `script/spec`
  - [[Spork](https://github.com/sporkrb/spork)] does not work with parallel_tests
@@ -210,6 +209,7 @@ inspired by [pivotal labs](http://pivotallabs.com/users/miked/blog/articles/849-
  - [Łukasz Tackowiak](https://github.com/lukasztackowiak)
  - [Pedro Carriço](https://github.com/pedrocarrico)
  - [Pablo Manrubia Díez](https://github.com/pmanrubia)
+ - [Slawomir Smiechura](https://github.com/ssmiech)
 
 [Michael Grosser](http://grosser.it)<br/>
 michael@grosser.it<br/>

data/lib/parallel_tests/cucumber/runner.rb

@@ -10,8 +10,7 @@ module ParallelTests
           color,
           executable,
           (runtime_logging if File.directory?(File.dirname(runtime_log))),
-          options[:test_options],
-          cucumber_opts,
+          cucumber_opts(options[:test_options]),
           *test_files
         ].compact.join(" ")
         execute_command(cmd, process_number, options)
@@ -43,7 +42,15 @@ module ParallelTests
         line =~ /^\d+ (steps|scenarios)/
       end
 
-      def self.cucumber_opts
+      def self.cucumber_opts(given)
+        if given =~ /--profile/ or given =~ /(^|\s)-p /
+          given
+        else
+          [given, profile_from_config].compact.join(" ")
+        end
+      end
+
+      def self.profile_from_config
         config = 'config/cucumber.yml'
         if File.exists?(config) && File.read(config) =~ /^parallel:/
           "--profile parallel"

data/lib/parallel_tests/version.rb

@@ -1,3 +1,3 @@
 module ParallelTests
-  VERSION = Version = '0.8.0'
+  VERSION = Version = '0.8.1'
 end

data/spec/parallel_tests/cucumber/runner_spec.rb

@@ -53,12 +53,27 @@ describe ParallelTests::Cucumber do
       call(['xxx'],1,:test_options => '-p default')
     end
 
-    it "uses parallel profile if config/cucumber.yml contains it" do
-      file_contents = 'parallel: -f progress'
-      ParallelTests::Cucumber::Runner.should_receive(:open).with{|x,y| x =~ %r{script/cucumber .* foo bar --profile parallel}}.and_return mocked_process
-      File.should_receive(:exists?).with('config/cucumber.yml').and_return true
-      File.should_receive(:read).with('config/cucumber.yml').and_return file_contents
-      call(['xxx'],1, :test_options => 'foo bar')
+    context "with parallel profile in config/cucumber.yml" do
+      before do
+        file_contents = 'parallel: -f progress'
+        File.stub(:exists?).with('config/cucumber.yml').and_return true
+        File.stub(:read).with('config/cucumber.yml').and_return file_contents
+      end
+
+      it "uses parallel profile" do
+        ParallelTests::Cucumber::Runner.should_receive(:open).with{|x,y| x =~ %r{script/cucumber .* foo bar --profile parallel xxx}}.and_return mocked_process
+        call(['xxx'],1, :test_options => 'foo bar')
+      end
+
+      it "uses given profile via --profile" do
+        ParallelTests::Cucumber::Runner.should_receive(:open).with{|x,y| x =~ %r{script/cucumber .* --profile foo xxx$}}.and_return mocked_process
+        call(['xxx'],1, :test_options => '--profile foo')
+      end
+
+      it "uses given profile via -p" do
+        ParallelTests::Cucumber::Runner.should_receive(:open).with{|x,y| x =~ %r{script/cucumber .* -p foo xxx$}}.and_return mocked_process
+        call(['xxx'],1, :test_options => '-p foo')
+      end
     end
 
     it "does not use parallel profile if config/cucumber.yml does not contain it" do

data/spec/spec_helper.rb

@@ -1,6 +1,6 @@
 $LOAD_PATH << File.expand_path("../lib", File.dirname(__FILE__))
 
-FAKE_RAILS_ROOT = '/tmp/pspecs/fixtures'
+FAKE_RAILS_ROOT = './tmp/pspecs/fixtures'
 
 require 'tempfile'
 require 'parallel_tests'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: parallel_tests
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.8.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-29 00:00:00.000000000 Z
+date: 2012-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parallel
@@ -89,7 +89,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1985471141696551729
+      hash: 2085209291365411604
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -98,7 +98,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1985471141696551729
+      hash: 2085209291365411604
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24