hiptest-publisher 1.14.1 → 1.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d1673a123f0948f8bdcec1879004e28fd0d85271435169e63da0248b3cd14c8b
-  data.tar.gz: a520b8f8f7fbb031d7d596f538e7512ba6248a52a144b4e0b06fd2d2d7a2c005
+  metadata.gz: '09c7c858fbf0ec7499ca9a13ca5f4ebb9ea5cd2754811d57aaf47a8f2667a803'
+  data.tar.gz: 301b30459a64f5fd4e98e7c395e4709177f5863bad7e2f6c9706ccaa6fb2cfbc
 SHA512:
-  metadata.gz: 4409a80f24bc26a62c75d1537b002f40a61e4f1997f02aa47ca17e9235b1af6b7d861d4b8c608bf2baef88b9edf9447e885a0df161365936a7ab106763c1ced9
-  data.tar.gz: 3a904091dbb33e95488d19b1d462725cb78f887db9c15d49a3f1d761312f621c87e9997038ad1fd30c557b67a6af18a206a29cbb4d53a309cc82cec94c2fc046
+  metadata.gz: c3cfe825b36ff482f5fe516f49e3406232a06c2cdddef20c6556c64ec1c1d64babfd3da823eb37425ae307eb19143c08ed55d7c461c68ae5923fcbe5dfd61ffc
+  data.tar.gz: b60c17d5e69d9f676d7f14447a82d3a0c9db3759528166b715f4cd067b489f8453216f86700fa8028b709027058d599e1ff142a034512d445afb6403a22480a7

data/lib/config/cucumber-groovy.conf

@@ -28,13 +28,13 @@ named_filename = 'StepDefinitions%s.groovy'
 renderer_addons = 'GherkinAddon'
 
 [actionwords]
-template_dirs = cucumber/groovy/actionwords, groovy, java, common
+template_dirs = groovy/actionwords-library, groovy, java, common
 filename = 'Actionwords.groovy'
 
 [library]
-template_dirs = cucumber/groovy/actionwords-library, groovy, java, common
+template_dirs = groovy/actionwords-library, groovy, java, common
 filename = 'ActionwordLibrary.groovy'
 
 [libraries]
-template_dirs = cucumber/groovy/actionwords-library, groovy, java, common
+template_dirs = groovy/actionwords-library, groovy, java, common
 named_filename = '%sLibrary.groovy'

data/lib/config/groovy-spock.conf

@@ -1,4 +1,5 @@
 [_common]
+package = 'com.example'
 template_dirs = groovy, java, common
 indentation = '  '
 dirname_convention = 'underscore'
@@ -12,4 +13,13 @@ named_filename = '%sSpec.groovy'
 call_prefix = 'actionwords'
 
 [actionwords]
+template_dirs = groovy/actionwords-library, groovy, java, common
 filename = 'Actionwords.groovy'
+
+[library]
+template_dirs = groovy/actionwords-library, groovy, java, common
+filename = 'ActionwordLibrary.groovy'
+
+[libraries]
+template_dirs = groovy/actionwords-library, groovy, java, common
+named_filename = '%sLibrary.groovy'

data/lib/hiptest-publisher/render_context_maker.rb

@@ -111,6 +111,8 @@ module Hiptest
     def walk_uidcall(uidcall)
       {
         has_library?: !uidcall.children[:library_name].nil?,
+        has_annotation?: !uidcall.children[:annotation].nil?,
+        in_actionword?: uidcall.parent.is_a?(Hiptest::Nodes::Actionword),
         chunks: uidcall.chunks || []
       }
     end

data/lib/hiptest-publisher/renderer_addons/groovy_spock_addon.rb

@@ -4,23 +4,37 @@ module Hiptest
   module GroovySpockAddon
     def walk_call(call)
       base = super(call)
-      base[:use_expect_annotation] = needs_fixing?(call)
-      base[:use_main_annotation?] = !(call.children[:annotation].nil? || ['and', 'but'].include?(call.children[:annotation]))
+      use_annotation(call, base)
+    end
 
-      return base
+    def walk_uidcall(uidcall)
+      base = super(uidcall)
+      use_annotation(uidcall, base)
     end
 
+
     private
 
+    def use_annotation(call, base)
+      base[:use_expect_annotation] = needs_fixing?(call)
+      base[:use_main_annotation?] = !(call.children[:annotation].nil? || ['and', 'but'].include?(call.children[:annotation]))
+
+      base
+    end
+
     def needs_fixing?(call)
       scenario = call.parent
 
       return false unless scenario.is_a?(Hiptest::Nodes::Scenario)
-      return false unless call.children[:annotation].nil? || call.children[:annotation].downcase == 'then'
+      return false unless call.children[:annotation].nil? || ignore_case_equal?(call.children[:annotation], 'then')
 
       return call.parent.children[:body].select do |step|
-        step.is_a?(Hiptest::Nodes::Call) && !step.children[:annotation].nil? && step.children[:annotation].downcase == 'when'
+        (step.is_a?(Hiptest::Nodes::Call) || step.is_a?(Hiptest::Nodes::UIDCall)) && !step.children[:annotation].nil? && ignore_case_equal?(step.children[:annotation], 'when')
       end.empty?
     end
+
+    def ignore_case_equal?(string1, string2)
+      string1.casecmp(string2) == 0
+    end
   end
 end

data/lib/hiptest-publisher/xml_parser.rb

@@ -317,6 +317,12 @@ module Hiptest
       )
     end
 
+    def build_actionwordLibrarySnapshots(libraries)
+      Hiptest::Nodes::Libraries.new(
+        build_node_list(libraries.css('> actionwordLibrarySnapshot'))
+      )
+    end
+
     def build_actionwordLibrary(library)
       Hiptest::Nodes::Library.new(
         css_first_content(library, '> name'),
@@ -324,6 +330,13 @@ module Hiptest
       )
     end
 
+    def build_actionwordLibrarySnapshot(library)
+      Hiptest::Nodes::Library.new(
+        css_first_content(library, '> name'),
+        build_node_list(library.css('> libraryActionwordSnapshots actionwordSnapshot'))
+      )
+    end
+
     def build_folderSnapshots(folder_snapshots)
       build_testPlan(folder_snapshots, '> folderSnapshot')
     end
@@ -336,10 +349,12 @@ module Hiptest
         test_plan_node = css_first(project, '> testPlan')
         scenarios_node = css_first(project, '> scenarios')
         actionwords_node = css_first(project, '> actionwords')
+        libraries_node = css_first(project, '> actionwordLibraries')
       else
         test_plan_node = css_first(test_run, '> folderSnapshots')
         scenarios_node = css_first(test_run, '> scenarioSnapshots')
         actionwords_node = css_first(test_run, '> actionwordSnapshots')
+        libraries_node = css_first(test_run, '> actionwordLibrarySnapshots')
       end
 
       @project = Hiptest::Nodes::Project.new(
@@ -349,7 +364,7 @@ module Hiptest
         build_node(scenarios_node, Hiptest::Nodes::Scenarios),
         build_node(actionwords_node, Hiptest::Nodes::Actionwords),
         build_node(css_first(project, '> tests'), Hiptest::Nodes::Tests),
-        build_node(css_first(project, '> actionwordLibraries'), Hiptest::Nodes::Libraries)
+        build_node(libraries_node, Hiptest::Nodes::Libraries)
       )
 
       @project.assign_scenarios_to_folders

data/lib/templates/groovy/actionwords.hbs

@@ -1,4 +1,6 @@
-class Actionwords {{#curly}}{{#indent}}{{#each rendered_children.actionwords}}
+package {{{ context.package }}}
+
+class Actionwords {{#if uses_library? }}extends ActionwordLibrary{{/if}}{{#curly}}{{#indent}}{{#each rendered_children.actionwords}}
 {{{this}}}
 {{/each}}
 {{/indent}}

data/lib/templates/groovy/folder.hbs

@@ -1,3 +1,5 @@
+package {{{ context.package }}}
+
 import spock.lang.*
 
 class {{{ clear_extension context.filename }}} extends Specification {{#curly}}{{#indent}}

data/lib/templates/{cucumber/groovy/actionwords-library → groovy}/libraries.hbs

@@ -1,8 +1,8 @@
-package {{{ context.package }}};
+package {{{ context.package }}}
 
 class ActionwordLibrary {{#curly}}{{#indent}}{{#each library_names}}
 {{camelize this}}Library get{{camelize this}}Library() {{#curly}}{{#indent}}
-return {{camelize this}}Library.instance;
+return {{camelize this}}Library.instance
 {{/indent}}
 {{/curly}}
 {{/each}}{{/indent}}

data/lib/templates/{cucumber/groovy/actionwords-library → groovy}/library.hbs

@@ -1,4 +1,4 @@
-package {{{ context.package }}};
+package {{{ context.package }}}
 
 @Singleton
 class {{camelize rendered_children.name}}Library {{#curly}}{{#indent}}{{#each rendered_children.actionwords}}

data/lib/templates/groovy/scenarios.hbs

@@ -1,3 +1,5 @@
+package {{{ context.package }}}
+
 import spock.lang.*
 
 class {{{ clear_extension context.filename }}} extends Specification {{#curly}}{{#indent}}

data/lib/templates/groovy/single_scenario.hbs

@@ -1,3 +1,5 @@
+package {{{ context.package }}}
+
 import spock.lang.*
 
 class {{{ clear_extension context.filename }}} extends Specification {{#curly}}{{#indent}}

data/lib/templates/groovy/single_test.hbs

@@ -1,3 +1,5 @@
+package {{{ context.package }}}
+
 import spock.lang.*
 
 class {{{ clear_extension context.filename }}} extends Specification {{#curly}}{{#indent}}

data/lib/templates/groovy/tests.hbs

@@ -1,3 +1,5 @@
+package {{{ context.package }}}
+
 import spock.lang.*
 
 class {{{ clear_extension context.filename }}} extends Specification {{#curly}}{{#indent}}

data/lib/templates/groovy/uidcall.hbs

@@ -0,0 +1,2 @@
+{{#unless in_actionword?}}{{#if use_main_annotation?}}{{#if use_expect_annotation}}expect{{else}}{{rendered_children.annotation}}{{/if}}:
+{{/if}}{{/unless}}{{#if context.call_prefix}}{{{context.call_prefix}}}.{{/if}}{{#if has_library?}}get{{{camelize rendered_children.library_name}}}Library().{{/if}}{{{ camelize_lower rendered_children.actionword_name }}}({{{ join rendered_children.all_arguments ', '}}})

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hiptest-publisher
 version: !ruby/object:Gem::Version
-  version: 1.14.1
+  version: 1.15.0
 platform: ruby
 authors:
 - Hiptest R&D
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-25 00:00:00.000000000 Z
+date: 2018-10-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
@@ -335,11 +335,6 @@ files:
 - lib/templates/csharp/while.hbs
 - lib/templates/cucumber/actionword.hbs
 - lib/templates/cucumber/actionwords.hbs
-- lib/templates/cucumber/groovy/actionwords-library/actionword.hbs
-- lib/templates/cucumber/groovy/actionwords-library/libraries.hbs
-- lib/templates/cucumber/groovy/actionwords-library/library.hbs
-- lib/templates/cucumber/groovy/actionwords-library/uidcall.hbs
-- lib/templates/cucumber/groovy/actionwords/actionwords.hbs
 - lib/templates/cucumber/groovy/step-definitions/_gherkin_pattern.hbs
 - lib/templates/cucumber/groovy/step-definitions/actionword.hbs
 - lib/templates/cucumber/groovy/step-definitions/actionwords.hbs
@@ -380,6 +375,7 @@ files:
 - lib/templates/groovy/_steps.hbs
 - lib/templates/groovy/_test.hbs
 - lib/templates/groovy/actionword.hbs
+- lib/templates/groovy/actionwords-library/actionword.hbs
 - lib/templates/groovy/actionwords.hbs
 - lib/templates/groovy/assign.hbs
 - lib/templates/groovy/call.hbs
@@ -388,6 +384,8 @@ files:
 - lib/templates/groovy/dict.hbs
 - lib/templates/groovy/folder.hbs
 - lib/templates/groovy/index.hbs
+- lib/templates/groovy/libraries.hbs
+- lib/templates/groovy/library.hbs
 - lib/templates/groovy/list.hbs
 - lib/templates/groovy/nullliteral.hbs
 - lib/templates/groovy/parameter.hbs
@@ -399,6 +397,7 @@ files:
 - lib/templates/groovy/template.hbs
 - lib/templates/groovy/test.hbs
 - lib/templates/groovy/tests.hbs
+- lib/templates/groovy/uidcall.hbs
 - lib/templates/java/_body.hbs
 - lib/templates/java/_item_as_function.hbs
 - lib/templates/java/_scenario.hbs

data/lib/templates/cucumber/groovy/actionwords-library/uidcall.hbs

@@ -1 +0,0 @@
-{{#if context.call_prefix}}{{{context.call_prefix}}}.{{/if}}{{{ camelize_lower rendered_children.actionword_name }}}({{{ join rendered_children.all_arguments ', '}}});

data/lib/templates/cucumber/groovy/actionwords/actionwords.hbs

@@ -1,7 +0,0 @@
-package {{{ context.package }}}
-
-class Actionwords {{#if uses_library? }}extends ActionwordLibrary{{/if}}{{#curly}}{{#indent}}{{#each rendered_children.actionwords}}
-{{{this}}}
-{{/each}}
-{{/indent}}
-{{/curly}}