parallel_tests 0.8.4 → 0.8.5

data/Gemfile.lock

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

data/Readme.md

@@ -169,6 +169,7 @@ TIPS
  - `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)
+ - [Memcached] use different namespaces e.g. `config.cache_store = ..., :namespace => "test_#{ENV['TEST_ENV_NUMBER']}"`
 
 TODO
 ====
@@ -213,6 +214,8 @@ inspired by [pivotal labs](http://pivotallabs.com/users/miked/blog/articles/849-
  - [Pablo Manrubia Díez](https://github.com/pmanrubia)
  - [Slawomir Smiechura](https://github.com/ssmiech)
  - [Georg Friedrich](https://github.com/georg)
+ - [R. Tyler Croy](https://github.com/rtyler)
+ - [Ulrich Berkmüller](https://github.com/ulrich-berkmueller)
 
 [Michael Grosser](http://grosser.it)<br/>
 michael@grosser.it<br/>

data/lib/parallel_tests/cucumber/runner.rb

@@ -39,7 +39,27 @@ module ParallelTests
       end
 
       def self.line_is_result?(line)
-        line =~ /^\d+ (steps|scenarios)/
+        line =~ /^\d+ (steps?|scenarios?)/
+      end
+
+      # cucumber has 2 result lines per test run, that cannot be added
+      # 1 scenario (1 failed)
+      # 1 step (1 failed)
+      def self.summarize_results(results)
+        sort_order = %w[scenario step failed undefined skipped pending passed]
+
+        %w[scenario step].map do |group|
+          group_results = results.grep /^\d+ #{group}/
+          next if group_results.empty?
+
+          sums = sum_up_results(group_results)
+          sums = sums.sort_by { |word, _| sort_order.index(word) || 999 }
+          sums.map! do |word, number|
+            plural = "s" if word == group and number != 1
+            "#{number} #{word}#{plural}"
+          end
+          "#{sums[0]} (#{sums[1..-1].join(", ")})"
+        end.compact.join("\n")
       end
 
       def self.cucumber_opts(given)

data/lib/parallel_tests/test/runner.rb

@@ -60,17 +60,22 @@ module ParallelTests
       end
 
       def self.summarize_results(results)
+        sums = sum_up_results(results)
+        sums.sort.map{|word, number|  "#{number} #{word}#{'s' if number != 1}" }.join(', ')
+      end
+
+      protected
+
+      def self.sum_up_results(results)
         results = results.join(' ').gsub(/s\b/,'') # combine and singularize results
         counts = results.scan(/(\d+) (\w+)/)
         sums = counts.inject(Hash.new(0)) do |sum, (number, word)|
           sum[word] += number.to_i
           sum
         end
-        sums.sort.map{|word, number|  "#{number} #{word}#{'s' if number != 1}" }.join(', ')
+        sums
       end
 
-      protected
-
       # read output of the process and print in in chucks
       def self.fetch_output(process, options)
         all = ''

data/lib/parallel_tests/version.rb

@@ -1,3 +1,3 @@
 module ParallelTests
-  VERSION = Version = '0.8.4'
+  VERSION = Version = '0.8.5'
 end

data/spec/parallel_tests/cucumber/runner_spec.rb

@@ -91,6 +91,33 @@ describe ParallelTests::Cucumber do
     end
   end
 
+  describe :line_is_result? do
+    it "should match lines with only one scenario" do
+      line = "1 scenario (1 failed)"
+      ParallelTests::Cucumber::Runner.line_is_result?(line).should be_true
+    end
+
+    it "should match lines with multiple scenarios" do
+      line = "2 scenarios (1 failed, 1 passed)"
+      ParallelTests::Cucumber::Runner.line_is_result?(line).should be_true
+    end
+
+    it "should match lines with only one step" do
+      line = "1 step (1 failed)"
+      ParallelTests::Cucumber::Runner.line_is_result?(line).should be_true
+    end
+
+    it "should match lines with multiple steps" do
+      line = "5 steps (1 failed, 4 passed)"
+      ParallelTests::Cucumber::Runner.line_is_result?(line).should be_true
+    end
+
+    it "should not match other lines" do
+      line = '    And I should have "2" emails                                # features/step_definitions/user_steps.rb:25'
+      ParallelTests::Cucumber::Runner.line_is_result?(line).should be_false
+    end
+  end
+
   describe :find_results do
     it "finds multiple results in test output" do
       output = <<EOF
@@ -106,8 +133,41 @@ And I should not see "/en/"                                       # features/ste
 4 scenarios (4 passed)
 40 steps (40 passed)
 
+And I should not see "foo"                                       # features/step_definitions/webrat_steps.rb:87
+
+1 scenario (1 passed)
+1 step (1 passed)
+
 EOF
-      ParallelTests::Cucumber::Runner.find_results(output).should == ["7 scenarios (3 failed, 4 passed)", "33 steps (3 failed, 2 skipped, 28 passed)", "4 scenarios (4 passed)", "40 steps (40 passed)"]
+      ParallelTests::Cucumber::Runner.find_results(output).should == ["7 scenarios (3 failed, 4 passed)", "33 steps (3 failed, 2 skipped, 28 passed)", "4 scenarios (4 passed)", "40 steps (40 passed)", "1 scenario (1 passed)", "1 step (1 passed)"]
+    end
+  end
+
+  describe :summarize_results do
+    def call(*args)
+      ParallelTests::Cucumber::Runner.summarize_results(*args)
+    end
+
+    it "sums up results for scenarios and steps separately from each other" do
+      results = ["7 scenarios (3 failed, 4 passed)", "33 steps (3 failed, 2 skipped, 28 passed)", "4 scenarios (4 passed)",
+                 "40 steps (40 passed)", "1 scenario (1 passed)", "1 step (1 passed)"]
+      call(results).should == "12 scenarios (3 failed, 9 passed)\n74 steps (3 failed, 2 skipped, 69 passed)"
+    end
+
+    it "adds same results with plurals" do
+      results = ["1 scenario (1 passed)", "2 steps (2 passed)",
+                 "2 scenarios (2 passed)", "7 steps (7 passed)"]
+      call(results).should == "3 scenarios (3 passed)\n9 steps (9 passed)"
+    end
+
+    it "adds non-similar results" do
+      results = ["1 scenario (1 passed)", "1 step (1 passed)",
+                 "2 scenarios (1 failed, 1 pending)", "2 steps (1 failed, 1 pending)"]
+      call(results).should == "3 scenarios (1 failed, 1 pending, 1 passed)\n3 steps (1 failed, 1 pending, 1 passed)"
+    end
+
+    it "does not pluralize 1" do
+      call(["1 scenario (1 passed)", "1 step (1 passed)"]).should == "1 scenario (1 passed)\n1 step (1 passed)"
     end
   end
 end

data/spec/parallel_tests/rspec/summary_logger_spec.rb

@@ -4,6 +4,10 @@ describe ParallelTests::RSpec::SummaryLogger do
   let(:output){ OutputLogger.new([]) }
   let(:logger){ ParallelTests::RSpec::SummaryLogger.new(output) }
 
+  def decolorize(string)
+    string.gsub(/\e\[\d+m/,'')
+  end
+
   # TODO somehow generate a real example with an exception to test this
   xit "prints failing examples" do
     logger.example_failed XXX
@@ -20,7 +24,7 @@ describe ParallelTests::RSpec::SummaryLogger do
     logger.dump_failures
     output.output.should == []
     logger.dump_summary(1,2,3,4)
-    output.output.should == ["\nFinished in 1 seconds\n", "\e[31m2 examples, 3 failures, 4 pending\e[0m"]
+    output.output.map{|o| decolorize(o) }.should == ["\nFinished in 1 seconds\n", "2 examples, 3 failures, 4 pending"]
   end
 
   it "does not print anything for pending examples" do
@@ -28,6 +32,6 @@ describe ParallelTests::RSpec::SummaryLogger do
     logger.dump_failures
     output.output.should == []
     logger.dump_summary(1,2,3,4)
-    output.output.should == ["\nFinished in 1 seconds\n", "\e[31m2 examples, 3 failures, 4 pending\e[0m"]
+    output.output.map{|o| decolorize(o) }.should == ["\nFinished in 1 seconds\n", "2 examples, 3 failures, 4 pending"]
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: parallel_tests
 version: !ruby/object:Gem::Version
-  version: 0.8.4
+  version: 0.8.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-09 00:00:00.000000000 Z
+date: 2012-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parallel
@@ -90,7 +90,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4352567482093763960
+      hash: -2098378474977036135
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -99,7 +99,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4352567482093763960
+      hash: -2098378474977036135
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24