parallel_tests 2.10.0 → 2.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f34b66a3c93d2d993a2dc48704ad2bea7efe9e9a
-  data.tar.gz: c7e7d4c3086a9d5e22f6c6aedd88af52206f1e8d
+  metadata.gz: c698774063cf365ab657b0fda5f8ff791d08a5e3
+  data.tar.gz: 6f09e57121be15de5172a2503b458e4c045d4a21
 SHA512:
-  metadata.gz: 3412a03740acb6cdbce200e985c945c49d5a686c9099639ca28811f8c49b902ff4295c1428d0cb33d500bfe75d274d74567f8dd19281a0f79c0998e420a62a68
-  data.tar.gz: d03d689a49d61238f022bc1c55179aeed768e2ad52ad341f926ae837c42dd240198db9116da54222d92faf03878e751a40c22785901ee1e12364c60e631425a6
+  metadata.gz: 4e3af2ade6a79b80babbe78426450e2b8ca5ca8ad6da942939b71b0e87f5ee6976aca3634f692b8b0b9af5c99afaea7685b539184df6e1ca70c303441b6c0a39
+  data.tar.gz: a47ed561002b35cb792ab850b14b10a4581e435fac46481bb4f3cde0ac85d5e7ef6cfb6cdcb5c89159987f955913e16287cbc40e7652aa29d3bdf25893e6249a

data/Readme.md

@@ -85,7 +85,7 @@ Running things once
 # either sleep a bit or use a lock for example File.lock
 ParallelTests.first_process? ? do_something : sleep(1)
 
-# cleanup: 
+# cleanup:
 # last_process? does NOT mean last finished process, just last started
 ParallelTests.last_process? ? do_something : sleep(1)
 
@@ -359,6 +359,7 @@ inspired by [pivotal labs](https://blog.pivotal.io/labs/labs/parallelize-your-rs
  - [Ryan Zhang](https://github.com/ryanus)
  - [Rhett Sutphin](https://github.com/rsutphin)
  - [Doc Ritezel](https://github.com/ohrite)
+ - [Alexandre Wilhelm](https://github.com/dogild)
 
 
 [Michael Grosser](http://grosser.it)<br/>

data/lib/parallel_tests/cucumber/runner.rb

@@ -29,8 +29,8 @@ module ParallelTests
         end
 
         def command_with_seed(cmd, seed)
-          cmd = cmd.sub(/\s--order random(:\d*)?/, '')
-          "#{cmd} --order random:#{seed}"
+          clean = cmd.sub(/\s--order\s+random(:\d+)?\b/, '')
+          "#{clean} --order random:#{seed}"
         end
       end
     end

data/lib/parallel_tests/cucumber/scenario_line_logger.rb

@@ -6,42 +6,38 @@ module ParallelTests
       class ScenarioLineLogger
         attr_reader :scenarios
 
-        def initialize(tag_expression = ::Gherkin::TagExpression.new([]))
-          raise "ScenarioLineLogger not supported anymore after upgrading to Cucumber 2.0, please fix!"
+        def initialize(tag_expression = ::Cucumber::Core::Gherkin::TagExpression.new([]))
           @scenarios = []
           @tag_expression = tag_expression
         end
 
-        def visit_feature_element(feature_element)
-          return unless @tag_expression.evaluate(feature_element.source_tags)
+        def visit_feature_element(uri, feature_element)
+          tags = feature_element[:tags].map {|tag| ::Cucumber::Core::Ast::Tag.new(tag[:location], tag[:name])}
 
-          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
+          # We don't accept the feature_element if the current tags are not valid
+          return unless @tag_expression.evaluate(tags)
+          @scenarios << [uri, feature_element[:location][:line]].join(":")
+
+          # TODO handle scenario outlines
+          # Previous code
+          # 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
 
         def method_missing(*args)

data/lib/parallel_tests/cucumber/scenarios.rb

@@ -3,6 +3,7 @@ require 'cucumber/runtime'
 require 'cucumber'
 require 'parallel_tests/cucumber/scenario_line_logger'
 require 'parallel_tests/gherkin/listener'
+require 'gherkin/errors'
 
 module ParallelTests
   module Cucumber
@@ -12,18 +13,51 @@ module ParallelTests
           tags = []
           tags.concat options[:ignore_tag_pattern].to_s.split(/\s*,\s*/).map {|tag| "~#{tag}" }
           tags.concat options[:test_options].to_s.scan(/(?:-t|--tags) (~?@[\w,~@]+)/).flatten
+
           split_into_scenarios files, tags.uniq
         end
 
         private
 
         def split_into_scenarios(files, tags=[])
-          tag_expression = ::Gherkin::TagExpression.new(tags)
+
+          # Create the tag expression instance from gherkin, this is needed to know if the scenario matches with the tags invoked by the request
+          tag_expression = ::Cucumber::Core::Gherkin::TagExpression.new(tags)
+
+          # Create the ScenarioLineLogger which will filter the scenario we want
           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)
+          # here we loop on the files map, each file will containe one or more scenario
+          features ||= files.map do |path|
+
+            # We encode the file and get the content of it
+            source = ::Cucumber::Runtime::NormalisedEncodingFile.read(path)
+            # We create a Gherkin document, this will be used to decode the details of each scenario
+            document = ::Cucumber::Core::Gherkin::Document.new(path, source)
+
+            # We create a parser for the gherkin document
+            parser  = ::Gherkin::Parser.new()
+            scanner = ::Gherkin::TokenScanner.new(document.body)
+
+            begin
+              # We make an attempt to parse the gherkin document, this could be failed if the document is not well formated
+              result = parser.parse(scanner)
+
+              # We loop on each children of the feature
+              result[:feature][:children].each do |feature_element|
+                # If the type of the child is not a scenario, we continue, we are only interested by the name of the scenario here
+                if feature_element[:type].to_s != 'Scenario'
+                  next
+                end
+
+                # It's a scenario, we add it to the scenario_line_logger
+                scenario_line_logger.visit_feature_element(document.uri, feature_element)
+              end
+
+            rescue StandardError => e
+              # Exception if the document is no well formated or error in the tags
+              raise ::Cucumber::Core::Gherkin::ParseError.new("#{document.uri}: #{e.message}")
+            end
           end
 
           scenario_line_logger.scenarios

data/lib/parallel_tests/rspec/runner.rb

@@ -47,6 +47,17 @@ module ParallelTests
           line =~ /\d+ examples?, \d+ failures?/
         end
 
+        # remove old seed and add new seed
+        # --seed 1234
+        # --order rand
+        # --order rand:1234
+        # --order random:1234
+        def command_with_seed(cmd, seed)
+          clean = cmd.sub(/\s--(seed\s+\d+|order\s+rand(om)?(:\d+)?)\b/, '')
+          "#{clean} --seed #{seed}"
+        end
+
+
         private
 
         # so it can be stubbed....

data/lib/parallel_tests/test/runner.rb

@@ -121,10 +121,10 @@ module ParallelTests
           sums.sort.map{|word, number|  "#{number} #{word}#{'s' if number != 1}" }.join(', ')
         end
 
+        # remove old seed and add new seed
         def command_with_seed(cmd, seed)
-          cmd = cmd.sub(/\s--seed(\s\d*){0,1}/, '')
-          cmd = cmd.sub(/\s--order rand(:\d*){0,1}/, '')
-          "#{cmd} --seed #{seed}"
+          clean = cmd.sub(/\s--seed\s+\d+\b/, '')
+          "#{clean} --seed #{seed}"
         end
 
         protected

data/lib/parallel_tests/version.rb

@@ -1,3 +1,3 @@
 module ParallelTests
-  VERSION = Version = '2.10.0'
+  VERSION = Version = '2.11.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: parallel_tests
 version: !ruby/object:Gem::Version
-  version: 2.10.0
+  version: 2.11.0
 platform: ruby
 authors:
 - Michael Grosser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-17 00:00:00.000000000 Z
+date: 2016-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parallel