hiptest-publisher 0.21.1 → 0.21.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cc26b98184cc629c6043fcd9906151d8a43c03bc
-  data.tar.gz: 5726ee5f267186bd94b594736ef873f79898fef4
+  metadata.gz: 66d70051b9ee31eb07c62e4b4ee9c4bbaeff4fb5
+  data.tar.gz: 822e1a2c1a0dd0eec767dfcf1041a31dd6d32b82
 SHA512:
-  metadata.gz: d125ea477ea4029d6792ff90f9673bc70e8858cb141b3e45e2b14e6960716ca2fe92d88e60ba284bf7e463c9c846f199f20085621977eea5b8191d66eeebcc42
-  data.tar.gz: 4b084fa14cd7ac438224a68ebd138b843a713fa2be0c5bf8fce689e63311c22b27cad9c60b76a3b3c785988eba723bc766aa702c71a7e5d7244653f3e781d61f
+  metadata.gz: 0fb7cca9e673ad882baf35b3df9d99262b4059bdd7c2515db2c805121bb53222c022425fca909aedc28b425f53cc71785b6c1680844d71c142d23051deac8115
+  data.tar.gz: 643a62476439fa765cf00c82127ff115b863013e917947cb2526cea8b4019b00eb5b677f712d5e8bc6e084b5128ded23103e60f737ca8b7e2e896ab6a778c73b

data/lib/hiptest-publisher/gherkin_adder.rb

@@ -23,6 +23,7 @@ module Hiptest
           if actionword = get_actionword(call)
             @annotations_counter.increment(actionword, code_annotation(call))
             actionword.children[:gherkin_pattern] ||= pattern(actionword)
+            actionword.children[:parameters_ordered_by_pattern] ||= order_parameters_by_pattern(actionword)
           end
         end
       end
@@ -71,7 +72,7 @@ module Hiptest
         value = all_arguments[missing_parameter_name]
         prettified << " \"#{value}\""
       end
-      prettified
+      prettified.strip
     end
 
     def pattern(actionword)
@@ -95,7 +96,18 @@ module Hiptest
       missing_parameter_names.each do |missing_parameter_name|
         patterned << " \"(.*)\""
       end
-      "^#{patterned}$"
+      "^#{patterned.strip}$"
+    end
+
+    def order_parameters_by_pattern(actionword)
+      inline_parameter_names = actionword.children[:name].scan(/\"(.*?)\"/).flatten
+      actionword_parameters = {}
+      actionword.children[:parameters].map {|p| actionword_parameters[p.children[:name]] = p}
+
+      missing_parameter_names = actionword_parameters.keys - inline_parameter_names - @special_params
+      [inline_parameter_names, missing_parameter_names, @special_params].flatten.map do |name|
+        actionword_parameters[name]
+      end.compact
     end
 
     def all_valued_arguments_for(call)

data/lib/templates/behat/actionword.hbs

@@ -2,7 +2,7 @@
 /**
  * @{{{ rendered_children.gherkin_annotation }}} /{{{ rendered_children.gherkin_pattern }}}/
  */
-public function {{{ camelize_lower rendered_children.name }}}({{#if has_parameters?}}{{{ join rendered_children.parameters ', '}}}{{/if}}){{#curly}}{{#indent}}
+public function {{{ camelize_lower rendered_children.name }}}({{#if has_parameters?}}{{{ join rendered_children.parameters_ordered_by_pattern ', '}}}{{/if}}){{#curly}}{{#indent}}
 $this->actionwords->{{{ camelize_lower rendered_children.name }}}({{#if has_parameters?}}{{#join raw_parameter_names ', '}}${{{underscore this}}}{{/join}}{{/if}});
 {{/indent}}
 {{/curly}}{{/if}}

data/lib/templates/behave/actionword.hbs

@@ -1,4 +1,4 @@
 {{#if rendered_children.gherkin_used_annotations}}
 {{#each rendered_children.gherkin_used_annotations}}@{{{downcase this }}}(r'{{#remove_last_character ':'}}{{{ strip_regexp_delimiters rendered_children.gherkin_pattern }}}{{/remove_last_character}}')
-{{/each}}def impl(context{{#if has_parameters?}}, {{{ join rendered_children.parameters ', '}}}{{/if}}):{{#indent}}
+{{/each}}def impl(context{{#if has_parameters?}}, {{{ join rendered_children.parameters_ordered_by_pattern ', '}}}{{/if}}):{{#indent}}
 context.actionwords.{{{ underscore rendered_children.name }}}({{#if has_parameters?}}{{#join raw_parameter_names ', '}}{{#replace "__datatable" "context.table"}}{{#replace "__free_text" "context.text"}}{{{underscore this}}}{{/replace}}{{/replace}}{{/join}}{{/if}}){{/indent}}{{/if}}

data/lib/templates/cucumber/actionword.hbs

@@ -1,5 +1,5 @@
 {{#if rendered_children.gherkin_annotation }}
-{{{ rendered_children.gherkin_annotation }}} /{{{ rendered_children.gherkin_pattern }}}/ do{{#if has_parameters?}} |{{{ join rendered_children.parameters ', '}}}|{{/if}}
+{{{ rendered_children.gherkin_annotation }}} /{{{ rendered_children.gherkin_pattern }}}/ do{{#if has_parameters?}} |{{{ join rendered_children.parameters_ordered_by_pattern ', '}}}|{{/if}}
 {{#indent}}{{ underscore rendered_children.name }}{{#if has_parameters?}}({{{ join rendered_children.parameters ', '}}}){{/if}}{{/indent}}
 end
 {{/if}}

data/lib/templates/cucumber/java/actionword.hbs

@@ -1,5 +1,5 @@
 {{#if rendered_children.gherkin_annotation }}@{{{ rendered_children.gherkin_annotation }}}("{{{escape_backslashes_and_double_quotes rendered_children.gherkin_pattern }}}")
-public void {{{camelize_lower rendered_children.name}}}({{{ join rendered_children.parameters ', '}}}) {{#curly}}{{#indent}}
+public void {{{camelize_lower rendered_children.name}}}({{{ join rendered_children.parameters_ordered_by_pattern ', '}}}) {{#curly}}{{#indent}}
 {{{ context.call_prefix }}}.{{{camelize_lower rendered_children.name}}}({{#if has_parameters?}}{{#join raw_parameter_names ', '}}{{{camelize_lower this}}}{{/join}}{{/if}});
 {{/indent}}
 {{/curly}}

data/lib/templates/cucumber/javascript/actionword.hbs

@@ -1,5 +1,5 @@
 {{#if rendered_children.gherkin_annotation }}
-this.{{{ rendered_children.gherkin_annotation }}}(/{{{rendered_children.gherkin_pattern }}}/, function ({{#if rendered_children.parameters}}{{{ join rendered_children.parameters ', '}}}, {{/if}}callback) {{#curly}}{{#indent}}
+this.{{{ rendered_children.gherkin_annotation }}}(/{{{rendered_children.gherkin_pattern }}}/, function ({{#if rendered_children.parameters}}{{{ join rendered_children.parameters_ordered_by_pattern ', '}}}, {{/if}}callback) {{#curly}}{{#indent}}
 this.actionwords.{{{camelize_lower rendered_children.name}}}({{#if has_parameters?}}{{#join raw_parameter_names ', '}}{{{underscore this}}}{{/join}}{{/if}});
 callback();
 {{/indent}}

data/lib/templates/specflow/actionword.hbs

@@ -1,5 +1,6 @@
-[Given("{{{escape_double_quotes rendered_children.gherkin_pattern }}}"), When("{{{escape_double_quotes rendered_children.gherkin_pattern }}}"), Then("{{{escape_double_quotes rendered_children.gherkin_pattern }}}")]
-public void {{{ camelize_upper rendered_children.name }}}({{#if has_parameters?}}{{{join rendered_children.parameters ', '}}}{{/if}}) {{#curly}}{{#indent}}
+{{#if rendered_children.gherkin_annotation }}[Given("{{{escape_double_quotes rendered_children.gherkin_pattern }}}"), When("{{{escape_double_quotes rendered_children.gherkin_pattern }}}"), Then("{{{escape_double_quotes rendered_children.gherkin_pattern }}}")]
+public void {{{ camelize_upper rendered_children.name }}}({{#if has_parameters?}}{{{join rendered_children.parameters_ordered_by_pattern ', '}}}{{/if}}) {{#curly}}{{#indent}}
 {{{ context.call_prefix }}}.{{ camelize_upper rendered_children.name }}({{#if has_parameters?}}{{#join raw_parameter_names ', '}}{{{camelize_lower this}}}{{/join}}{{/if}});
 {{/indent}}
 {{/curly}}
+{{/if}}

data/lib/templates/specflow/actionwords.hbs

@@ -7,8 +7,7 @@ public class StepDefinitions {{#curly}}{{#indent}}
 
 public Actionwords {{{ context.call_prefix }}} = new Actionwords();
 {{#each rendered_children.actionwords}}
-{{{this}}}
-{{/each}}
+{{{this}}}{{/each}}
 {{/indent}}
 {{/curly}}
 {{/indent}}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hiptest-publisher
 version: !ruby/object:Gem::Version
-  version: 0.21.1
+  version: 0.21.2
 platform: ruby
 authors:
 - Hiptest R&D
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-27 00:00:00.000000000 Z
+date: 2017-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
@@ -214,26 +214,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.4'
-- !ruby/object:Gem::Dependency
-  name: jeweler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.1.1
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.1.1
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
 description: Provides a command-line tool that generates Java, Python or Ruby code
   to run the tests.
 email: contact@hiptest.net