parallel_tests 2.12.0 → 2.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d1c6f6ab148c204b15f5c6e5c6762438622d9587
-  data.tar.gz: 989f590bbd92bfbf7f485755f0c37df3e2985626
+  metadata.gz: 8c5093d00208e78bd29823d73e12a7409588adbd
+  data.tar.gz: f937ad2c7a3036ceda12fd4d2e432c45c5209822
 SHA512:
-  metadata.gz: 53f224685a44607225d7c12acea0415e2548559ab4c15b4ca5a52073a228633b9473f56e18b394049ea1cb8d884f7a65bea3989f36f130c6c08ca0fc91e8390d
-  data.tar.gz: 95e3759003ef26063f6f050410fdc1fdd2771ccef6579fea108d2cac7b83b9d5db7d72606f5a7258e3037d7f8c73ac2c4efae53e4c95cabab6586754e932fb24
+  metadata.gz: 61241e2a1133c15307e8b50ac845aa0655c2120a98356e4bd08e1e14fbfbbd5b7bde367e55e934ad538183f9daa3b83707613d933136805130a30612a7d76355
+  data.tar.gz: 1f7a44c636ade949d48cec7253186f3be7052cf9fdd711004060e445ed0b357d1263ddd010d5abae318f683ae46a5eab5900e6c6d7e00d8648c9786165ab47d2

data/lib/parallel_tests/cucumber/scenario_line_logger.rb

@@ -11,33 +11,22 @@ module ParallelTests
           @tag_expression = tag_expression
         end
 
-        def visit_feature_element(uri, feature_element)
-          tags = feature_element[:tags].map {|tag| ::Cucumber::Core::Ast::Tag.new(tag[:location], tag[:name])}
-
-          # 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(":")
-          #     }
-          #   }
+        def visit_feature_element(uri, feature_element, feature_tags)
+          scenario_tags = feature_element[:tags].map {|tag| ::Cucumber::Core::Ast::Tag.new(tag[:location], tag[:name])}
+          scenario_tags = feature_tags + scenario_tags
+          if feature_element[:examples].nil? # :Scenario
+            # We don't accept the feature_element if the current tags are not valid
+            return unless @tag_expression.evaluate(scenario_tags)
+            @scenarios << [uri, feature_element[:location][:line]].join(":")
+          else # :ScenarioOutline
+            feature_element[:examples].each do |example|
+              example_tags = example[:tags].map {|tag| ::Cucumber::Core::Ast::Tag.new(tag[:location], tag[:name])}
+              example_tags = scenario_tags + example_tags
+              next unless @tag_expression.evaluate(example_tags)
+              rows = example[:tableBody].select { |body| body[:type] == :TableRow }
+              rows.each { |row| @scenarios << [uri, row[:location][:line]].join(':') }
+            end
+          end
         end
 
         def method_missing(*args)

data/lib/parallel_tests/cucumber/scenarios.rb

@@ -42,16 +42,15 @@ module ParallelTests
             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)
+              feature_tags = result[:feature][:tags].map { |tag| ::Cucumber::Core::Ast::Tag.new(tag[:location], tag[:name]) }
 
               # 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
+                # If the type of the child is not a scenario or scenario outline, we continue, we are only interested by the name of the scenario here
+                next unless /Scenario/.match(feature_element[:type])
 
                 # It's a scenario, we add it to the scenario_line_logger
-                scenario_line_logger.visit_feature_element(document.uri, feature_element)
+                scenario_line_logger.visit_feature_element(document.uri, feature_element, feature_tags)
               end
 
             rescue StandardError => e

data/lib/parallel_tests/version.rb

@@ -1,3 +1,3 @@
 module ParallelTests
-  VERSION = Version = '2.12.0'
+  VERSION = Version = '2.13.0'
 end

metadata

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