parallel_tests 0.16.3 → 0.16.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 483fe80b7a68cc0f89853183082d652d9a0d4592
-  data.tar.gz: 233b2a01c1f68b53e00a8e0b60c2a728c62aa98c
+  metadata.gz: b1e3fb69bc5868e4a5321edbbc4f4527aaa7d277
+  data.tar.gz: f6dc34a502ef7a65f565ecff44bf0990154d2ed3
 SHA512:
-  metadata.gz: d546de76b8543b631efbac1feec87a799e025c7f38685b101d5e7ed9cde3d71ec17d13fd0649f35f7a82df35a2af0bb1376cc16ed8e5e128aab792358345900b
-  data.tar.gz: 0e71947a9e6a4f0fde5a44fa873bcdb5dadc577bdad83eed429ea526043c99332ab7de9b26e0d0bac63660b359a54d45305e46dd49b229aa55ad31d6c53e41dc
+  metadata.gz: 92e953b15c06a785571f9c1aafc3fcdfb4ae6adf03cd9810215079485a9780a6cc280e2052aa857ee211697930c3b0530f1c1366ac5e560052a87c7f6ab008e8
+  data.tar.gz: df03a89e62a972b117a4e8b2ac9be3ebdd296ae6031c9ff8b392d8743a95ee96eb06e001e2da41b00e58cc2d7b6c1f53367fe41ce359840fefe2d450d18ea0ee

data/Gemfile.lock

@@ -1,29 +1,29 @@
 PATH
   remote: .
   specs:
-    parallel_tests (0.16.3)
+    parallel_tests (0.16.4)
       parallel
 
 GEM
   remote: https://rubygems.org/
   specs:
-    builder (3.0.0)
+    builder (3.2.2)
     bump (0.3.8)
     colorize (0.5.8)
-    cucumber (1.1.4)
+    cucumber (1.3.10)
       builder (>= 2.1.2)
-      diff-lcs (>= 1.1.2)
-      gherkin (~> 2.7.1)
-      json (>= 1.4.6)
-      term-ansicolor (>= 1.0.6)
-    diff-lcs (1.2.4)
-    gherkin (2.7.6)
-      json (>= 1.4.6)
-    gherkin (2.7.6-java)
-      json (>= 1.4.6)
+      diff-lcs (>= 1.1.3)
+      gherkin (~> 2.12)
+      multi_json (>= 1.7.5, < 2.0)
+      multi_test (>= 0.0.2)
+    diff-lcs (1.2.5)
+    gherkin (2.12.2)
+      multi_json (~> 1.3)
+    gherkin (2.12.2-java)
+      multi_json (~> 1.3)
     gherkin-ruby (0.3.0)
-    json (1.7.5)
-    json (1.7.5-java)
+    multi_json (1.8.2)
+    multi_test (0.0.2)
     parallel (0.9.0)
     rake (10.0.3)
     rspec (2.13.0)
@@ -37,7 +37,6 @@ GEM
     spinach (0.8.3)
       colorize (= 0.5.8)
       gherkin-ruby (~> 0.3.0)
-    term-ansicolor (1.0.7)
     test-unit (2.4.4)
 
 PLATFORMS

data/Readme.md

@@ -213,7 +213,7 @@ TIPS
  - [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
  - [Cucumber] add a `parallel: foo` profile to your `config/cucumber.yml` and it will be used to run parallel tests
- - [Cucumber] Pass in cucumber options by not giving the options an identifier ex: parallel:features[x,y,'cucumber_opts']
+ - [Cucumber] Pass in cucumber options by not giving the options an identifier ex: `rake parallel:features[,,'cucumber_opts']`
  - [Capybara setup](https://github.com/grosser/parallel_tests/wiki)
  - [Sphinx setup](https://github.com/grosser/parallel_tests/wiki)
  - [Capistrano setup](https://github.com/grosser/parallel_tests/wiki/Remotely-with-capistrano) let your tests run on a big box instead of your laptop

data/lib/parallel_tests/cli.rb

@@ -97,6 +97,7 @@ BANNER
 group tests by:
           found - order of finding files
           steps - number of cucumber/spinach steps
+          scenarios - individual cucumber scenarios
           default - runtime or filesize
 TEXT
 ) { |type| options[:group_by] = type.to_sym }

data/lib/parallel_tests/cucumber/scenario_line_logger.rb

@@ -0,0 +1,51 @@
+require 'gherkin/tag_expression'
+
+module ParallelTests
+  module Cucumber
+    module Formatters
+      class ScenarioLineLogger
+        attr_reader :scenarios
+
+        def initialize(tag_expression = ::Gherkin::TagExpression.new([]))
+          @scenarios = []
+          @tag_expression = tag_expression
+        end
+
+        def visit_feature_element(feature_element)
+          return unless @tag_expression.evaluate(feature_element.source_tags)
+
+          case feature_element
+          when ::Cucumber::Ast::Scenario
+            line = if feature_element.respond_to?(:line)
+              feature_element.line
+            else
+              feature_element.instance_variable_get(:@line)
+            end
+            @scenarios << [feature_element.feature.file, line].join(":")
+          when ::Cucumber::Ast::ScenarioOutline
+            sections = feature_element.instance_variable_get(:@example_sections)
+            sections.each { |section|
+              rows = if section[1].respond_to?(:rows)
+                section[1].rows
+              else
+                section[1].instance_variable_get(:@rows)
+              end
+              rows.each_with_index { |row, index|
+                next if index == 0  # slices didn't work with jruby data structure
+                line = if row.respond_to?(:line)
+                  row.line
+                else
+                  row.instance_variable_get(:@line)
+                end
+                @scenarios << [feature_element.feature.file, line].join(":")
+              }
+            }
+          end
+        end
+
+        def method_missing(*args)
+        end
+      end
+    end
+  end
+end

data/lib/parallel_tests/cucumber/scenarios.rb

@@ -0,0 +1,36 @@
+require 'gherkin/tag_expression'
+require 'cucumber/runtime'
+require 'cucumber'
+require 'parallel_tests/cucumber/scenario_line_logger'
+require 'parallel_tests/gherkin/listener'
+
+module ParallelTests
+  module Cucumber
+    class Scenarios
+      class << self
+        def all(files, options={})
+          tag_expressions = if options[:ignore_tag_pattern]
+            options[:ignore_tag_pattern].split(/\s*,\s*/).map {|tag| "~#{tag}" }
+          else
+            []
+          end
+          split_into_scenarios files, tag_expressions
+        end
+
+        private
+
+        def split_into_scenarios(files, tags=[])
+          tag_expression = ::Gherkin::TagExpression.new(tags)
+          scenario_line_logger = ParallelTests::Cucumber::Formatters::ScenarioLineLogger.new(tag_expression)
+          loader = ::Cucumber::Runtime::FeaturesLoader.new(files, [], tag_expression)
+
+          loader.features.each do |feature|
+            feature.accept(scenario_line_logger)
+          end
+
+          scenario_line_logger.scenarios
+        end
+      end
+    end
+  end
+end

data/lib/parallel_tests/gherkin/runner.rb

@@ -19,7 +19,7 @@ module ParallelTests
         end
 
         def test_file_name
-          "feature"
+          @test_file_name || "feature"
         end
 
         def test_suffix
@@ -37,7 +37,7 @@ module ParallelTests
           sort_order = %w[scenario step failed undefined skipped pending passed]
 
           %w[scenario step].map do |group|
-            group_results = results.grep /^\d+ #{group}/
+            group_results = results.grep(/^\d+ #{group}/)
             next if group_results.empty?
 
             sums = sum_up_results(group_results)
@@ -67,8 +67,12 @@ module ParallelTests
         end
 
         def tests_in_groups(tests, num_groups, options={})
-          if options[:group_by] == :steps
-            Grouper.by_steps(find_tests(tests, options), num_groups, options)
+          if options[:group_by] == :scenarios
+            @test_file_name = "scenario"
+          end
+          method = "by_#{options[:group_by]}"
+          if Grouper.respond_to?(method)
+            Grouper.send(method, find_tests(tests, options), num_groups, options)
           else
             super
           end
@@ -85,14 +89,14 @@ module ParallelTests
 
         def determine_executable
           case
-            when File.exists?("bin/#{name}")
-              "bin/#{name}"
-            when ParallelTests.bundler_enabled?
-              "bundle exec #{name}"
-            when File.file?("script/#{name}")
-              "script/#{name}"
-            else
-              "#{name}"
+          when File.exists?("bin/#{name}")
+            "bin/#{name}"
+          when ParallelTests.bundler_enabled?
+            "bundle exec #{name}"
+          when File.file?("script/#{name}")
+            "script/#{name}"
+          else
+            "#{name}"
           end
         end
 

data/lib/parallel_tests/grouper.rb

@@ -1,3 +1,5 @@
+require 'parallel_tests/cucumber/scenarios'
+
 module ParallelTests
   class Grouper
     class << self
@@ -6,22 +8,22 @@ module ParallelTests
         in_even_groups_by_size(features_with_steps, num_groups)
       end
 
-      def in_even_groups_by_size(items_with_sizes, num_groups, options = {})
+      def by_scenarios(tests, num_groups, options={})
+        scenarios = group_by_scenarios(tests, options)
+        in_even_groups_by_size(scenarios, num_groups)
+      end
+
+      def in_even_groups_by_size(items, num_groups, options= {})
         groups = Array.new(num_groups) { {:items => [], :size => 0} }
 
         # add all files that should run in a single process to one group
         (options[:single_process] || []).each do |pattern|
-          matched, items_with_sizes = items_with_sizes.partition { |item, size| item =~ pattern }
+          matched, items = items.partition { |item, size| item =~ pattern }
           matched.each { |item, size| add_to_group(groups.first, item, size) }
         end
 
         groups_to_fill = (options[:isolate] ? groups[1..-1] : groups)
-
-        # add all other files
-        largest_first(items_with_sizes).each do |item, size|
-          smallest = smallest_group(groups_to_fill)
-          add_to_group(smallest, item, size)
-        end
+        group_features_by_size(items_to_group(items), groups_to_fill)
 
         groups.map!{|g| g[:items].sort }
       end
@@ -51,6 +53,22 @@ module ParallelTests
         }
         listener.collect.sort_by{|_,value| -value }
       end
+
+      def group_by_scenarios(tests, options={})
+        ParallelTests::Cucumber::Scenarios.all(tests, options)
+      end
+
+      def group_features_by_size(items, groups_to_fill)
+        items.each do |item, size|
+          size ||= 1
+          smallest = smallest_group(groups_to_fill)
+          add_to_group(smallest, item, size)
+        end
+      end
+
+      def items_to_group(items)
+        items.first && items.first.size == 2 ? largest_first(items) : items
+      end
     end
   end
 end

data/lib/parallel_tests/version.rb

@@ -1,3 +1,3 @@
 module ParallelTests
-  VERSION = Version = '0.16.3'
+  VERSION = Version = '0.16.4'
 end

data/spec/integration_spec.rb

@@ -304,6 +304,36 @@ cucumber features/fail1.feature:2 # Scenario: xxx
 3 steps (2 failed, 1 passed)
 """
     end
+
+    it "groups by scenario" do
+      write "features/long.feature", <<-EOS
+      Feature: xxx
+        Scenario: xxx
+          Given I print TEST_ENV_NUMBER
+
+        Scenario: xxx
+          Given I print TEST_ENV_NUMBER
+
+        Scenario Outline: xxx
+          Given I print TEST_ENV_NUMBER
+
+        Examples:
+          | num |
+          | one |
+          | two |
+      EOS
+      result = run_tests "features", :type => "cucumber", :add => "--group-by scenarios"
+      result.should include("2 processes for 4 scenarios")
+    end
+
+    it "groups by step" do
+      write "features/good1.feature", "Feature: xxx\n  Scenario: xxx\n    Given I print TEST_ENV_NUMBER"
+      write "features/good2.feature", "Feature: xxx\n  Scenario: xxx\n    Given I print TEST_ENV_NUMBER"
+
+      result = run_tests "features", :type => "cucumber", :add => '--group-by steps'
+
+      result.should include("2 processes for 2 features")
+    end
   end
 
   context "Spinach", :fails_on_ruby_187 => true do

data/spec/parallel_tests/cucumber/scenarios_spec.rb

@@ -0,0 +1,59 @@
+require 'tempfile'
+require 'parallel_tests/cucumber/scenarios'
+
+module ParallelTests
+  module Cucumber
+    describe Scenarios do
+      describe '.all' do
+        context 'by default' do
+          let(:feature_file) do
+            Tempfile.new('grouper.feature').tap do |feature|
+              feature.write <<-EOS
+                Feature: Grouping by scenario
+
+                  Scenario: First
+                    Given I do nothing
+
+                  Scenario: Second
+                    Given I don't do anything
+              EOS
+              feature.rewind
+            end
+          end
+
+          it 'returns all the scenarios' do
+            scenarios = Scenarios.all([feature_file.path])
+            scenarios.should eq %W(#{feature_file.path}:3 #{feature_file.path}:6)
+          end
+        end
+
+        context 'with tags' do
+          let(:feature_file) do
+            Tempfile.new('grouper.feature').tap do |feature|
+              feature.write <<-EOS
+                Feature: Grouping by scenario
+
+                  @wip
+                  Scenario: First
+                    Given I do nothing
+
+                  Scenario: Second
+                    Given I don't do anything
+
+                  @ignore
+                  Scenario: Third
+                    Given I am ignored
+              EOS
+              feature.rewind
+            end
+          end
+
+          it 'ignores those scenarios' do
+            scenarios = Scenarios.all([feature_file.path], :ignore_tag_pattern => '@ignore, @wip')
+            scenarios.should eq %W(#{feature_file.path}:7)
+          end
+        end
+      end
+    end
+  end
+end

data/spec/parallel_tests/grouper_spec.rb

@@ -49,4 +49,13 @@ describe ParallelTests::Grouper do
       call(6).should == [["5"], ["4"], ["3"], ["2"], ["1"], []]
     end
   end
+
+  describe :by_scenarios do
+    let(:feature_file) { double 'file' }
+
+    it 'splits a feature into individual scenarios' do
+      ParallelTests::Cucumber::Scenarios.should_receive(:all).and_return({ 'feature_file:3' => 1 })
+      ParallelTests::Grouper.by_scenarios([feature_file], 1)
+    end
+  end
 end

data/spec/parallel_tests/tasks_spec.rb

@@ -22,6 +22,15 @@ describe ParallelTests::Tasks do
       args = {:count => 2, :pattern => "plain", :options => "-p default"}
       ParallelTests::Tasks.parse_args(args).should == [2, "plain", "-p default"]
     end
+
+    it "should return the count, pattern, and options" do
+      args = {
+        :count => 2,
+        :pattern => "plain",
+        :options => "-p default --group-by steps",
+      }
+      ParallelTests::Tasks.parse_args(args).should == [2, "plain", "-p default --group-by steps"]
+    end
   end
 
   describe ".rails_env" do

data/spec/parallel_tests/test/runner_spec.rb

@@ -43,7 +43,7 @@ describe ParallelTests::Test::Runner do
 
     it "does sort when not passed do_sort option" do
       ParallelTests::Test::Runner.stub!(:tests_with_runtime).and_return([])
-      ParallelTests::Grouper.should_receive(:largest_first).and_return([])
+      ParallelTests::Grouper.should_receive(:group_features_by_size).and_return([])
       call([], 1)
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: parallel_tests
 version: !ruby/object:Gem::Version
-  version: 0.16.3
+  version: 0.16.4
 platform: ruby
 authors:
 - Michael Grosser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-07 00:00:00.000000000 Z
+date: 2013-11-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parallel
@@ -50,6 +50,8 @@ files:
 - lib/parallel_tests/cli.rb
 - lib/parallel_tests/cucumber/failures_logger.rb
 - lib/parallel_tests/cucumber/runner.rb
+- lib/parallel_tests/cucumber/scenario_line_logger.rb
+- lib/parallel_tests/cucumber/scenarios.rb
 - lib/parallel_tests/gherkin/io.rb
 - lib/parallel_tests/gherkin/listener.rb
 - lib/parallel_tests/gherkin/runner.rb
@@ -71,6 +73,7 @@ files:
 - spec/parallel_tests/cli_spec.rb
 - spec/parallel_tests/cucumber/failure_logger_spec.rb
 - spec/parallel_tests/cucumber/runner_spec.rb
+- spec/parallel_tests/cucumber/scenarios_spec.rb
 - spec/parallel_tests/gherkin/listener_spec.rb
 - spec/parallel_tests/gherkin/runner_behaviour.rb
 - spec/parallel_tests/grouper_spec.rb
@@ -104,7 +107,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.6
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: Run Test::Unit / RSpec / Cucumber / Spinach in parallel