fixes

grosser · Oct 4, 2015 · 2d17df4 · lukaso · Oct 5, 2015 · 2d17df4
1 parent 104feed
commit 2d17df4
Show file tree

Hide file tree

Showing 10 changed files with 14 additions and 15 deletions.
diff --git a/lib/parallel_tests/cucumber/runner.rb b/lib/parallel_tests/cucumber/runner.rb
@@ -27,7 +27,7 @@ def summarize_results(results)
         end
 
         def command_with_seed(cmd, seed)
-          cmd = cmd.sub(/\s--order random(:\d*){0,1}/, '')
+          cmd = cmd.sub(/\s--order random(:\d*)?/, '')
           "#{cmd} --order random:#{seed}"
         end
 

diff --git a/spec/fixtures/minitest4/Gemfile.lock b/spec/fixtures/minitest4/Gemfile.lock
@@ -1,14 +1,14 @@
 PATH
   remote: ../../../
   specs:
-    parallel_tests (1.6.1)
+    parallel_tests (1.8.0)
       parallel
 
 GEM
   remote: https://rubygems.org/
   specs:
     minitest (4.7.5)
-    parallel (1.6.1)
+    parallel (1.4.0)
 
 PLATFORMS
   ruby

diff --git a/spec/fixtures/minitest4/vendor/cache/parallel-1.4.0.gem b/spec/fixtures/minitest4/vendor/cache/parallel-1.4.0.gem
diff --git a/spec/fixtures/minitest4/vendor/cache/parallel-1.6.1.gem b/spec/fixtures/minitest4/vendor/cache/parallel-1.6.1.gem
diff --git a/spec/fixtures/rails32/Gemfile.lock b/spec/fixtures/rails32/Gemfile.lock
@@ -1,7 +1,7 @@
 PATH
   remote: ../../../
   specs:
-    parallel_tests (1.6.0)
+    parallel_tests (1.8.0)
       parallel
 
 GEM

diff --git a/spec/fixtures/rails32/config/boot.rb b/spec/fixtures/rails32/config/boot.rb
@@ -1,6 +1 @@
-require 'rubygems'
-
-# Set up gems listed in the Gemfile.
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
-
-require 'bundler/setup' if File.exists?(ENV['BUNDLE_GEMFILE'])
+require 'bundler/setup'
diff --git a/spec/fixtures/rails42/Gemfile.lock b/spec/fixtures/rails42/Gemfile.lock
@@ -1,7 +1,7 @@
 PATH
   remote: ../../../
   specs:
-    parallel_tests (1.6.0)
+    parallel_tests (1.8.0)
       parallel
 
 GEM

diff --git a/spec/fixtures/rails42/config/boot.rb b/spec/fixtures/rails42/config/boot.rb
@@ -1,3 +1 @@
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
-
-require 'bundler/setup' # Set up gems listed in the Gemfile.
+require 'bundler/setup'
diff --git a/spec/rails_spec.rb b/spec/rails_spec.rb
@@ -10,7 +10,7 @@ def sh(command, options={})
   end
 
   ["rails32", "rails42"].each do |rails|
-    it "can create and run" do
+    it "can create and run #{rails}" do
       if RUBY_PLATFORM == "java"
         skip 'rails fixtures are not set up for java'
       elsif rails == 'rails32' && RUBY_VERSION >= '2.2.0'

diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
@@ -7,6 +7,12 @@
 require 'parallel_tests/rspec/runtime_logger'
 require 'parallel_tests/rspec/summary_logger'
 
+String.class_eval do
+  def strip_heredoc
+    gsub(/^#{self[/^\s*/]}/, '')
+  end
+end
+
 OutputLogger = Struct.new(:output) do
   attr_reader :flock, :flush
   def puts(s=nil)