parallel_tests 0.7.2 → 0.7.3

data/Gemfile.lock

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

data/Readme.md

@@ -7,7 +7,7 @@ Setup for Rails
 ===============
 [still using Rails 2?](https://github.com/grosser/parallel_tests/blob/master/ReadmeRails2.md)
 
-## Install
+### Install
 If you use RSpec: ensure you got >= 2.4
 
 As gem
@@ -22,21 +22,19 @@ OR as plugin
     # add to Gemfile
     gem "parallel", :group => :development
 
-## Setup
+### Add to `config/database.yml`
 ParallelTests uses 1 database per test-process, 2 processes will use `*_test` and `*_test2`.
 
-
-### 1: Add to `config/database.yml`
     test:
       database: yourproject_test<%= ENV['TEST_ENV_NUMBER'] %>
 
-### 2: Create additional database(s)
+### Create additional database(s)
     rake parallel:create
 
-### 3: Copy development schema (repeat after migrations)
+### Copy development schema (repeat after migrations)
     rake parallel:prepare
 
-### 4: Run!
+### Run!
     rake parallel:test          # Test::Unit
     rake parallel:spec          # RSpec
     rake parallel:features      # Cucumber
@@ -53,8 +51,8 @@ Test by pattern (e.g. use one integration server per subfolder / see if you brok
     rake parallel:test['user|product']  # run user and product related tests
 
 
-Example output
---------------
+### Example output
+
     2 processes for 210 specs, ~ 105 specs per process
     ... test output ...
 
@@ -72,29 +70,27 @@ Log test runtime to give each process the same runtime.
 
 Rspec: Add to your `.rspec_parallel` (or `.rspec`) :
 
-    RSpec
-      If installed as plugin: -I vendor/plugins/parallel_tests/lib
-      --format progress
-      --format ParallelTests::RSpec::RuntimeLogger --out tmp/parallel_runtime_rspec.log
+    If installed as plugin: -I vendor/plugins/parallel_tests/lib
+    --format progress
+    --format ParallelTests::RSpec::RuntimeLogger --out tmp/parallel_runtime_rspec.log
 
 Test::Unit:  Add to your `test_helper.rb`:
 
     require 'parallel_tests/test/runtime_logger'
 
 
-SpecSummaryLogger
+RSpec: SummaryLogger
 --------------------
 
 This logger logs the test output without the different processes overwriting each other.
 
 Add the following to your `.rspec_parallel` (or `.rspec`) :
 
-    RSpec:
-      If installed as plugin: -I vendor/plugins/parallel_tests/lib
-      --format progress
-      --format ParallelTests::RSpec::SummaryLogger --out tmp/spec_summary.log
+    If installed as plugin: -I vendor/plugins/parallel_tests/lib
+    --format progress
+    --format ParallelTests::RSpec::SummaryLogger --out tmp/spec_summary.log
 
-SpecFailuresLogger
+RSpec: FailuresLogger
 -----------------------
 
 This logger produces pasteable command-line snippets for each failed example.
@@ -105,10 +101,9 @@ E.g.
 
 Add the following to your `.rspec_parallel` (or `.rspec`) :
 
-    RSpec:
-      If installed as plugin: -I vendor/plugins/parallel_tests/lib
-      --format progress
-      --format ParallelTests::RSpec::FailuresLogger --out tmp/failing_specs.log
+    If installed as plugin: -I vendor/plugins/parallel_tests/lib
+    --format progress
+    --format ParallelTests::RSpec::FailuresLogger --out tmp/failing_specs.log
 
 Setup for non-rails
 ===================
@@ -156,7 +151,7 @@ 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`
- - [RSpec] [spork](https://github.com/timcharper/spork) does not work in parallel
+ - [RSpec] [spork](https://github.com/sporkrb/spork) does not work in parallel
  - [RSpec] remove --loadby from you spec/*.opts
  - [RSpec] Instantly see failures (instead of just a red F) with [rspec-instafail](https://github.com/grosser/rspec-instafail)
  - [Bundler] if you have a `Gemfile` then `bundle exec` will be used to run tests
@@ -167,6 +162,7 @@ TIPS
  - [ActiveRecord] if you do not have `db:abort_if_pending_migrations` add this to your Rakefile: `task('db:abort_if_pending_migrations'){}`
  - `export PARALLEL_TEST_PROCESSORS=X` in your environment and parallel_tests will use this number of processors by default
  - [ZSH] use quotes to use rake arguments `rake "parallel:prepare[3]"`
+ - [email_spec and/or action_mailer_cache_delivery](https://github.com/grosser/parallel_tests/wiki)
 
 TODO
 ====
@@ -207,6 +203,7 @@ inspired by [pivotal labs](http://pivotallabs.com/users/miked/blog/articles/849-
  - [Lawrence Wang](https://github.com/levity)
  - [Potapov Sergey](https://github.com/greyblake)
  - [Łukasz Tackowiak](https://github.com/lukasztackowiak)
+ - [Pedro Carriço](https://github.com/pedrocarrico)
 
 [Michael Grosser](http://grosser.it)<br/>
 michael@grosser.it<br/>

data/lib/parallel_tests/cucumber/runner.rb

@@ -6,9 +6,14 @@ module ParallelTests
       def self.run_tests(test_files, process_number, options)
         color = ($stdout.tty? ? 'AUTOTEST=1 ; export AUTOTEST ;' : '')#display color when we are in a terminal
         runtime_logging = " --format ParallelTests::Cucumber::RuntimeLogger --out #{runtime_log}"
-        cmd = "#{color} #{executable}"
-        cmd << runtime_logging if File.directory?(File.dirname(runtime_log))
-        cmd << " #{options[:test_options]} #{test_files*' '}"
+        cmd = [
+          color,
+          executable,
+          (runtime_logging if File.directory?(File.dirname(runtime_log))),
+          options[:test_options],
+          cucumber_opts,
+          *test_files
+        ].compact.join(" ")
         execute_command(cmd, process_number, options)
       end
 
@@ -37,6 +42,13 @@ module ParallelTests
       def self.line_is_result?(line)
         line =~ /^\d+ (steps|scenarios)/
       end
+
+      def self.cucumber_opts
+        config = 'config/cucumber.yml'
+        if File.exists?(config) && File.read(config) =~ /^parallel:/
+          "--profile parallel"
+        end
+      end
     end
   end
 end

data/lib/parallel_tests/version.rb

@@ -1,3 +1,3 @@
 module ParallelTests
-  VERSION = Version = '0.7.2'
+  VERSION = Version = '0.7.3'
 end

data/spec/parallel_tests/cucumber/runner_spec.rb

@@ -52,6 +52,28 @@ describe ParallelTests::Cucumber do
       ParallelTests::Cucumber::Runner.should_receive(:open).with{|x,y| x =~ %r{script/cucumber .* -p default}}.and_return mocked_process
       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')
+    end
+
+    it "does not use parallel profile if config/cucumber.yml does not contain it" do
+      file_contents = 'blob: -f progress'
+      ParallelTests::Cucumber::Runner.should_receive(:open).with{|x,y| x =~ %r{script/cucumber .* foo bar}}.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')
+    end
+
+    it "does not use the parallel profile if config/cucumber.yml does not exist" do
+      ParallelTests::Cucumber::Runner.should_receive(:open).with{|x,y| x =~ %r{script/cucumber .*}}.and_return mocked_process
+      File.should_receive(:exists?).with('config/cucumber.yml').and_return false
+      call(['xxx'],1,{})
+    end
   end
 
   describe :find_results do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: parallel_tests
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.7.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-07 00:00:00.000000000 Z
+date: 2012-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parallel
-  requirement: &20782100 !ruby/object:Gem::Requirement
+  requirement: &22437320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *20782100
+  version_requirements: *22437320
 description: 
 email: michael@grosser.it
 executables:
@@ -81,7 +81,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3546788160221548975
+      hash: 1971171336548076619
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -90,7 +90,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3546788160221548975
+      hash: 1971171336548076619
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.15