hiptest-publisher 0.9.0 → 0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 39afe8e077af4429d7ca2396b0b49191f18a8690
-  data.tar.gz: 409aeaf3cc6bed1a076d68517a2533d7517ee983
+  metadata.gz: c4bf556535d34f99a46d459419144b12850f835a
+  data.tar.gz: 4d25694d6dd6bc45e91e58128fa5000f6ed1bd18
 SHA512:
-  metadata.gz: f03ab8b780cee93cb22d5c36fccfaf63300986a7690f982193452ba703351521d921d17b051c653a556f9e6f1c4499f4488413a86059a84486541cfec806b444
-  data.tar.gz: c04410ae58e6f8fc1fbb3a0cd2a4f52be7e7b596ebff9a7b6854761f33e7edb977af1a5a271a3115b23b98ef8d1e2460522f39d5b85c60a3504ec9b35a46a514
+  metadata.gz: 74ce1abdf0334e8528e08dcc6201b8bff3a158606a79e69fc67a98a068794080008d2b4fa791abc02db20b1749abf1998a44316a54259c665e09854c93c69e78
+  data.tar.gz: 2482949cd5d0d0682c9bcc86cd652128e7644331769612fc85e6ac74f92d24acf3e8fed883919e2d80d1a24ffc30ddace5dacaab0c886dc75b17d2861bae9d02

data/lib/hiptest-publisher/gherkin_adder.rb

@@ -10,16 +10,24 @@ module Hiptest
     def initialize(project)
       @project = project
       @indexer = ActionwordIndexer.new(project)
+      @annotations_counter = AnnotationsCounter.new
     end
 
     def update_calls
-      @project.each_sub_nodes(Hiptest::Nodes::Call) do |call|
-        call.children[:gherkin_text] ||= "#{text_annotation(call)} #{prettified(call)}"
-        if actionword = get_actionword(call)
-          actionword.children[:gherkin_annotation] ||= code_annotation(call)
-          actionword.children[:gherkin_pattern] ||= pattern(actionword)
+      @project.each_sub_nodes(Hiptest::Nodes::Scenario, Hiptest::Nodes::Actionword, Hiptest::Nodes::Test) do |item|
+        @last_annotation = nil
+        item.each_sub_nodes(Hiptest::Nodes::Call) do |call|
+          call.children[:gherkin_text] ||= "#{text_annotation(call)} #{prettified(call)}"
+          if actionword = get_actionword(call)
+            @annotations_counter.increment(actionword, code_annotation(call))
+            actionword.children[:gherkin_pattern] ||= pattern(actionword)
+          end
         end
       end
+
+      @annotations_counter.actionwords.each do |actionword|
+        actionword.children[:gherkin_annotation] = @annotations_counter.most_used_annotation(actionword) || "Given"
+      end
     end
 
     def annotation(call)
@@ -31,7 +39,13 @@ module Hiptest
     end
 
     def code_annotation(call)
-      annotation(call) || "Given"
+      call_annotation = annotation(call)
+      if call_annotation
+        if call_annotation == "And"
+          call_annotation = @last_annotation || "Given"
+        end
+        @last_annotation = call_annotation
+      end
     end
 
     def prettified(call)
@@ -126,4 +140,24 @@ module Hiptest
       end
     end
   end
+
+  class AnnotationsCounter
+    def initialize
+      @counts_by_actionword = Hash.new {|counts, actionword| counts[actionword] = Hash.new(0) }
+    end
+
+    def actionwords
+      @counts_by_actionword.keys
+    end
+
+    def increment(actionword, annotation)
+      counts = @counts_by_actionword[actionword]
+      counts[annotation] += 1 if annotation
+    end
+
+    def most_used_annotation(actionword)
+      max = @counts_by_actionword[actionword].values.max
+      @counts_by_actionword[actionword].key(max)
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hiptest-publisher
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.9.1
 platform: ruby
 authors:
 - Hiptest R&D