hiptest-publisher 2.4.0 → 3.2.0

data/config/locales/en.yml

@@ -57,6 +57,7 @@ en:
       Unable to build:
       %{node}
     title: Extracting data
+  caching_data: Caching data
   check_version:
     error: Unable to connect to Rubygem
     outdated: |
@@ -66,7 +67,7 @@ en:
     up_to_date: Your current install of hiptest-publisher (%{current}) is up-to-date.
   default: default
   errors:
-    api_error: HipTest API returned error %{code}
+    api_error: CucumberStudio API returned error %{code}
     cli_options:
       actionwords_signature_directory: 'Bad Action Words signature file: the file "%{path}" is a directory'
       filter_status_without_test_run: |
@@ -86,7 +87,7 @@ en:
 
         Found: %{incorrect_value}
       invalid_tag_value_list: |
-        %{option} should be a list of comma separated tags in HipTest
+        %{option} should be a list of comma separated tags from CucumberStudio
 
         Found: %{incorrect_value}
       invalid_test_run_id: 'Invalid format --test-run-id="%{test_run_id}": the test run id must be numeric'
@@ -100,11 +101,12 @@ en:
       missing_token: |
         Missing argument --token: you must specify project secret token with --token=<project-token>
 
-        The project secret token can be found on HipTest in the settings section, under
+        The project secret token can be found on CucumberStudio in the settings section, under
         'Test code generation'. It is a sequence of numbers uniquely identifying your
         project.
 
         Note that settings section is available only to administrators of the project.
+      multiple_build_options: 'Error with --push: you can not specify both --build-id and --build-name options'
       multiple_filters: |
         You specified multiple filters for the export.
 
@@ -128,12 +130,9 @@ en:
     no_test_runs: 'No matching test run found: this project does not have any test runs.'
     project_not_found: No project found with this secret token.
     template_not_found: no template with name %{template_name} in dirs %{dirs}
-    test_run_list_unavailable: Cannot get the list of available test runs from HipTest. Try using --test-run-id instead of --test-run-name
+    test_run_list_unavailable: Cannot get the list of available test runs from CucumberStudio. Try using --test-run-id instead of --test-run-name
   exporting_file: Exporting %{name}
-  fetching_data: Fetching data from HipTest
-  using_cached_data: Using cached data from previous export
-  caching_data: Caching data
-  using_cache: "Using cache: %{full_path}"
+  fetching_data: Fetching data from CucumberStudio
   help:
     categories:
       title: For language %{language}, available file groups are
@@ -148,7 +147,7 @@ en:
             hiptest-publisher --language=%{language} --only=%{first},%{second}
     description: |2
 
-      Exports tests from HipTest for automation.
+      Exports tests from CucumberStudio for automation.
 
       Specific options:
     header: 'Usage: hiptest-publisher [options]'
@@ -167,6 +166,10 @@ en:
     aw_deleted: Output signature of deleted action words
     aw_renamed: Output signatures of renamed action words
     aw_signature_changed: Output signatures of action words for which signature changed
+    build_id: ID of an existing build the results will be added to
+    build_name: Name for the build that will be created in CucumberStudio (build names are not unique)
+    cache_dir: Path to the directory to store cache of CucumberStudio data
+    cache_duration: Validity of the CucumberStudio data cache in seconds
     check_version: Check if a new release of hiptest-publisher is available
     color: Force [un]use of ANSI color in text output
     config: Configuration file
@@ -183,9 +186,10 @@ en:
     framework: Test framework to use
     global_failure_on_missing_reports: When there is no results file to push, report a global failure
     help: Show this message
-    http_proxy: 'Specify your http proxy to access Hiptest'
-    keep_filenames: 'Keep the same name as in HipTest for the test files (note: may cause encoding issues)'
-    keep_foldernames: 'Keep the same name as in HipTest for the folders (note: may cause encoding issues)'
+    http_proxy: Specify your http proxy to access CucumberStudio
+    indentation: Customize indentation
+    keep_filenames: 'Keep the same name as in CucumberStudio for the test files (note: may cause encoding issues)'
+    keep_foldernames: 'Keep the same name as in CucumberStudio for the folders (note: may cause encoding issues)'
     language: Target language
     languages_help: Show languages and framework options
     leafless_export: Use only last level action word
@@ -194,13 +198,14 @@ en:
     not_recursive: 'Used in conjunction with filter-on-folder-ids or filter-on-folder-name: only exports those folders, not their children'
     only: Restrict export to given file categories (--only=list to list them)
     output_directory: Output directory
+    overriden_language_configs: Folder for overriden language configs
     overriden_templates: Folder for overriden templates
     parameter_delimiter: Parameter delimiter (for Gherkin based export only)
     parent_folder_tags: 'Export tags from parent folders (note: if set to false, those tags are never rendered. Only available for Gherkin base exports)'
     push: Push a results file to the server
     push_format: Format of the test results (cucumber-json, junit, nunit, robot, tap)
     site: Site to fetch from
-    sort: 'Sorting of tests in output: id will sort them by age, order will keep the same order than in hiptest (only with --with-folders option, will fallback to id otherwise), alpha will sort them by name'
+    sort: 'Sorting of tests in output: id will sort them by age, order will keep the same order as in CucumberStudio (only with --with-folders option, will fallback to id otherwise), alpha will sort them by name'
     split_scenarios: Export each scenario in a single file (except for Gherkin based languages)
     test_run_id: Export data from a test run identified by its id
     test_run_name: Export data from a test run identified by its name
@@ -211,10 +216,7 @@ en:
     with_dataset_names: 'Export dataset name when creating feature files (note: available only for Gherkin-based exports)'
     with_folders: Use folders hierarchy to export files in respective directories
     without: Exclude file categories from import (--only=list to list them)
-    xml_file: XML file to use instead of fetching it from HipTest
-    cache_dir: "Path to the directory to store cache of Hiptest data"
-    cache_duration: "Validity of the Hiptest data cache in seconds"
-    indentation: Customize indentation
+    xml_file: XML file to use instead of fetching it from CucumberStudio
   overwrite:
     ask_confirmation: 'File %{path} exists, do you want to overwrite it? [y/N] '
     warning_message: File %{path} already exists, skipping. Use --force to overwrite it.
@@ -243,4 +245,6 @@ en:
     required_version: hiptest-publisher requires Ruby version >= %{version}.
     support_ended: Official support for Ruby %{version} ended on %{year}-%{month}-%{day}
     use_more_recent: Please use a more recent ruby release to run hiptest-publisher.
+  using_cache: 'Using cache: %{full_path}'
+  using_cached_data: Using cached data from previous export
   verbose_header: 'Running hiptest-publisher %{version} with:'

data/lib/config/cucumber-typescript.conf

@@ -1,41 +1,41 @@
-[_common]
-indentation = '    '
-fallback_template = 'empty'
-
-[features]
-node_name = folders
-template_dirs = gherkin/inlined_uids, gherkin, common
-named_filename = '%s.feature'
-indentation = '  '
-renderer_addons = 'GherkinAddon'
-
-[step_definitions]
-node_name = actionwords
-template_dirs = cucumber/typescript, javascript, common
-filename = 'step_definitions.ts'
-naming_convention = 'camelize_lower'
-call_prefix = 'actionwords'
-renderer_addons = 'GherkinAddon'
-
-[step_definitions_library]
-node_name = libraries
-template_dirs = cucumber/typescript, javascript, common
-named_filename = 'steps_%s.ts'
-naming_convention = 'camelize_lower'
-call_prefix = 'actionwords'
-renderer_addons = 'GherkinAddon'
-
-[actionwords]
-template_dirs = typescript, javascript, common
-filename = 'actionwords.ts'
-naming_convention = 'camelize_lower'
-
-
-[library]
-template_dirs =  typescript, javascript, common
-filename = 'actionword_library.ts'
-
-[libraries]
-template_dirs = typescript, javascript, common
-named_filename = '%s_library.ts'
-filename_convention = 'underscore'
+[_common]
+indentation = '    '
+fallback_template = 'empty'
+
+[features]
+node_name = folders
+template_dirs = gherkin/inlined_uids, gherkin, common
+named_filename = '%s.feature'
+indentation = '  '
+renderer_addons = 'GherkinAddon'
+
+[step_definitions]
+node_name = actionwords
+template_dirs = cucumber/typescript, javascript, common
+filename = 'step_definitions.ts'
+naming_convention = 'camelize_lower'
+call_prefix = 'actionwords'
+renderer_addons = 'GherkinAddon'
+
+[step_definitions_library]
+node_name = libraries
+template_dirs = cucumber/typescript, javascript, common
+named_filename = 'steps_%s.ts'
+naming_convention = 'camelize_lower'
+call_prefix = 'actionwords'
+renderer_addons = 'GherkinAddon'
+
+[actionwords]
+template_dirs = typescript, javascript, common
+filename = 'actionwords.ts'
+naming_convention = 'camelize_lower'
+
+
+[library]
+template_dirs =  typescript, javascript, common
+filename = 'actionword_library.ts'
+
+[libraries]
+template_dirs = typescript, javascript, common
+named_filename = '%s_library.ts'
+filename_convention = 'underscore'

data/lib/config/cucumber_legacy-groovy.conf

@@ -0,0 +1,40 @@
+[_common]
+package = 'com.example'
+fallback_template = 'empty'
+indentation = '    '
+dirname_convention = 'underscore'
+filename_convention = 'camelize'
+naming_convention = 'camelize_lower'
+
+[features]
+node_name = folders
+template_dirs = gherkin/inlined_uids, gherkin/java, gherkin, common
+named_filename = '%s.feature'
+indentation = '  '
+renderer_addons = 'GherkinAddon'
+
+[step_definitions]
+node_name = actionwords
+template_dirs = cucumber_legacy/groovy/step-definitions, cucumber/groovy/step-definitions, groovy, java, common
+filename = 'StepDefinitions.groovy'
+call_prefix = 'actionwords'
+renderer_addons = 'GherkinAddon'
+
+[step_definitions_library]
+node_name = libraries
+call_prefix = 'actionwords'
+template_dirs = cucumber_legacy/groovy/step-definitions, cucumber/groovy/step-definitions, groovy, java, common
+named_filename = 'StepDefinitions%s.groovy'
+renderer_addons = 'GherkinAddon'
+
+[actionwords]
+template_dirs = groovy, java, common
+filename = 'Actionwords.groovy'
+
+[library]
+template_dirs = groovy, java, common
+filename = 'ActionwordLibrary.groovy'
+
+[libraries]
+template_dirs = groovy, java, common
+named_filename = '%sLibrary.groovy'

data/lib/config/cucumber_legacy-java.conf

@@ -0,0 +1,24 @@
+[_common]
+package = 'com.example'
+indentation = '    '
+fallback_template = 'empty'
+
+[features]
+node_name = folders
+template_dirs = gherkin/inlined_uids, gherkin/java, gherkin, common
+named_filename = '%s.feature'
+indentation = '  '
+renderer_addons = 'GherkinAddon'
+
+[step_definitions]
+node_name = actionwords
+template_dirs = cucumber_legacy/java, cucumber/java, java, common
+filename = 'StepDefinitions.java'
+naming_convention = 'camelize_lower'
+call_prefix = 'actionwords'
+renderer_addons = 'GherkinAddon'
+
+[actionwords]
+template_dirs = cucumber_legacy/java/actionwords, cucumber/java/actionwords, java, common
+filename = 'Actionwords.java'
+naming_convention = 'camelize_lower'

data/lib/config/{cucumber_expressions-typescript.conf → cucumber_legacy-typescript.conf}

@@ -1,41 +1,41 @@
-[_common]
-indentation = '    '
-fallback_template = 'empty'
-
-[features]
-node_name = folders
-template_dirs = gherkin/inlined_uids, gherkin, common
-named_filename = '%s.feature'
-indentation = '  '
-renderer_addons = 'GherkinAddon'
-
-[step_definitions]
-node_name = actionwords
-template_dirs = cucumber_expressions/typescript, cucumber/typescript, javascript, common
-filename = 'step_definitions.ts'
-naming_convention = 'camelize_lower'
-call_prefix = 'actionwords'
-renderer_addons = 'GherkinAddon'
-
-[step_definitions_library]
-node_name = libraries
-template_dirs = cucumber_expressions/typescript, cucumber/typescript, javascript, common
-named_filename = 'steps_%s.ts'
-naming_convention = 'camelize_lower'
-call_prefix = 'actionwords'
-renderer_addons = 'GherkinAddon'
-
-[actionwords]
-template_dirs = typescript, javascript, common
-filename = 'actionwords.ts'
-naming_convention = 'camelize_lower'
-
-
-[library]
-template_dirs =  typescript, javascript, common
-filename = 'actionword_library.ts'
-
-[libraries]
-template_dirs = typescript, javascript, common
-named_filename = '%s_library.ts'
-filename_convention = 'underscore'
+[_common]
+indentation = '    '
+fallback_template = 'empty'
+
+[features]
+node_name = folders
+template_dirs = gherkin/inlined_uids, gherkin, common
+named_filename = '%s.feature'
+indentation = '  '
+renderer_addons = 'GherkinAddon'
+
+[step_definitions]
+node_name = actionwords
+template_dirs = cucumber_legacy/typescript, cucumber/typescript, javascript, common
+filename = 'step_definitions.ts'
+naming_convention = 'camelize_lower'
+call_prefix = 'actionwords'
+renderer_addons = 'GherkinAddon'
+
+[step_definitions_library]
+node_name = libraries
+template_dirs = cucumber_legacy/typescript, cucumber/typescript, javascript, common
+named_filename = 'steps_%s.ts'
+naming_convention = 'camelize_lower'
+call_prefix = 'actionwords'
+renderer_addons = 'GherkinAddon'
+
+[actionwords]
+template_dirs = typescript, javascript, common
+filename = 'actionwords.ts'
+naming_convention = 'camelize_lower'
+
+
+[library]
+template_dirs =  typescript, javascript, common
+filename = 'actionword_library.ts'
+
+[libraries]
+template_dirs = typescript, javascript, common
+named_filename = '%s_library.ts'
+filename_convention = 'underscore'

data/lib/hiptest-publisher/cli_options_checker.rb

@@ -29,6 +29,7 @@ module Hiptest
       if cli_options.push?
         check_execution_environment
         check_push_file
+        check_build_options
       else
         check_output_directory
         check_actionwords_signature_file
@@ -213,6 +214,12 @@ module Hiptest
       end
     end
 
+    def check_build_options
+      if present?(cli_options.build_id) && present?(cli_options.build_name)
+        raise CliOptionError, I18n.t('errors.cli_options.multiple_build_options')
+      end
+    end
+
     private
 
     def numeric?(arg)

data/lib/hiptest-publisher/client.rb

@@ -41,7 +41,7 @@ module Hiptest
 
     def url
       if cli_options.push?
-        "#{cli_options.site}/import_test_results/#{cli_options.token}/#{cli_options.push_format}#{execution_environment_query_parameter}"
+        "#{cli_options.site}/import_test_results/#{cli_options.token}/#{cli_options.push_format}#{push_query_parameters}"
       elsif test_run_id
         "#{base_publication_path}/test_run/#{test_run_id}#{test_run_export_filter}"
       else
@@ -306,10 +306,21 @@ module Hiptest
       ).find_proxy
     end
 
-    def execution_environment_query_parameter
-      return "?execution_environment=#{cli_options.execution_environment}" unless cli_options.execution_environment.strip.empty?
+    def push_query_parameters
+      parameters = {}
+      unless cli_options.execution_environment.strip.empty?
+        parameters['execution_environment'] = cli_options.execution_environment
+      end
+
+      unless cli_options.build_id.strip.empty?
+        parameters['build_id'] = cli_options.build_id
+      end
+
+      unless cli_options.build_name.strip.empty?
+        parameters['build_name'] = cli_options.build_name
+      end
 
-      ""
+      parameters.empty? ? "" : "?#{parameters.map {|key, value| "#{key}=#{ERB::Util.url_encode(value)}"}.join("&")}"
     end
   end
 end

data/lib/hiptest-publisher/formatters/console_formatter.rb

@@ -63,6 +63,7 @@ class ConsoleFormatter
       cursor_offset = ""
     else
       return unless tty?
+      return if IO.console.nil?
       rows, columns = IO.console.winsize
       return if columns == 0
       @immediate_verbose = false

data/lib/hiptest-publisher/handlebars_helper.rb

@@ -88,7 +88,7 @@ module Hiptest
     end
 
     def hh_join_gherkin_dataset(context, items, block, else_block = nil)
-      items.map! {|item| item.gsub(/\|/, "\\|")}
+      items.map! { |item| item.gsub(/\|/, "\\|").gsub("\n", "\\n") }
 
       hh_join(context, items, ' | ', block, else_block)
     end

data/lib/hiptest-publisher/options_parser.rb

@@ -203,14 +203,14 @@ class OptionsParser
     {
       'Ruby' => ['Rspec', 'MiniTest'],
       'Cucumber' => ['Ruby', 'Java', 'Javascript', 'Groovy', 'TypeScript'],
-      'Cucumber_Expressions' => ['TypeScript'],
+      'Cucumber_Legacy' => ['Java', 'Groovy', 'TypeScript'],
       'Java' => ['JUnit', 'Test NG', 'Espresso'],
       'Python' => ['Unittest'],
       'Robot Framework' => [''],
       'Selenium IDE' => [''],
       'Javascript' => ['qUnit', 'Jasmine', 'Mocha', 'Protractor', 'CodeceptJS'],
       'CSharp' => ['NUnit'],
-      'PHP' => ['PHPUnit', 'UnitTest'],
+      'PHP' => ['PHPUnit'],
       'SpecFlow' => [''],
       'Behave' => [''],
       'Behat' => [''],
@@ -229,6 +229,7 @@ class OptionsParser
       Option.new(nil, 'filename-pattern=PATTERN', nil, String, I18n.t('options.filename_pattern'), :filename_pattern),
       Option.new('c', 'config-file=PATH', nil, String, I18n.t('options.config'), :config),
       Option.new(nil, 'overriden-templates=PATH', '', String, I18n.t('options.overriden_templates'), :overriden_templates),
+      Option.new(nil, 'overriden-language-configs=PATH', '', String, I18n.t('options.overriden_language_configs'), :overriden_language_configs),
       Option.new(nil, 'test-run-id=ID', '', String, I18n.t('options.test_run_id'), :test_run_id),
       Option.new(nil, 'test-run-name=NAME', '', String, I18n.t('options.test_run_name'), :test_run_name),
       Option.new(nil, 'only=CATEGORIES', nil, String, I18n.t('options.only'), :only),
@@ -251,12 +252,14 @@ class OptionsParser
       Option.new(nil, 'empty-folders', false, nil, I18n.t('options.empty_folders'), :empty_folders),
       Option.new(nil, 'split-scenarios', false, nil, I18n.t('options.split_scenarios'), :split_scenarios),
       Option.new(nil, 'leafless-export', false, nil, I18n.t('options.leafless_export'), :leafless_export),
-      Option.new('s', 'site=SITE', 'https://app.hiptest.com', String, I18n.t('options.site'), :site),
+      Option.new('s', 'site=SITE', 'https://studio.cucumber.io', String, I18n.t('options.site'), :site),
       Option.new(nil, 'http-proxy=PROXY_URL', nil, String, I18n.t('options.http_proxy'), :http_proxy),
       Option.new('p', 'push=FILE.TAP', '', String, I18n.t('options.push'), :push),
       Option.new(nil, 'global-failure-on-missing-reports', false, nil, I18n.t('options.global_failure_on_missing_reports'), :global_failure_on_missing_reports),
       Option.new(nil, 'push-format=tap', 'tap', String, I18n.t('options.push_format'), :push_format),
       Option.new(nil, 'execution-environment=NAME', '', String, I18n.t('options.execution_environment'), :execution_environment),
+      Option.new(nil, 'build-id=ID', '', String, I18n.t('options.build_id'), :build_id),
+      Option.new(nil, 'build-name=NAME', '', String, I18n.t('options.build_name'), :build_name),
       Option.new(nil, 'sort=[id,order,alpha]', 'order', String, I18n.t('options.sort'), :sort),
       Option.new(nil, '[no-]uids', false, nil, I18n.t('options.uids'), :uids),
       Option.new(nil, '[no-]parent-folder-tags', true, nil, I18n.t('options.parent_folder_tags'), :parent_folder_tags),
@@ -383,6 +386,7 @@ class NodeRenderingContext
 
   def renderer_addons
     addons = @properties.renderer_addons || ""
+
     addons.split.map do |addon_name|
       Hiptest.const_get(addon_name)
     end
@@ -390,11 +394,12 @@ class NodeRenderingContext
 end
 
 class TemplateFinder
-  attr_reader :template_dirs, :overriden_templates, :forced_templates, :fallback_template
+  attr_reader :template_dirs, :overriden_templates, :overriden_language_configs, :forced_templates, :fallback_template
 
   def initialize(
     template_dirs: nil,
     overriden_templates: nil,
+    overriden_language_configs: nil,
     indentation: '  ',
     forced_templates: nil,
     fallback_template: nil,
@@ -696,7 +701,21 @@ class LanguageConfigParser
                   else
                     "#{cli_options.language}-#{cli_options.framework}.conf"
                   end
-    config_path = File.expand_path("#{hiptest_publisher_path}/lib/config/#{config_name.downcase}")
+    config_path = "/lib/config/#{config_name.downcase}"
+    config_prefix = if !cli_options.overriden_language_configs.to_s.empty?
+                      # If the user has specified a overiden language config path, check it first. If the config
+                      # exists there, return that, otherwise fall back to the default setup and look for a config there.
+                      expanded = File.expand_path("#{cli_options.overriden_language_configs}/#{config_name.downcase}")
+
+                      # If the file exists in the path the user specified, set the config path to blank so we will be
+                      # looking in the exact path that the user requested.
+                      if File.file?(expanded)
+                        config_path = ''
+                        expanded
+                      end
+                    end
+
+    config_path = File.expand_path("#{config_prefix || hiptest_publisher_path}#{config_path}")
 
     if !File.file?(config_path)
       if cli_options.framework.to_s.empty?

data/lib/hiptest-publisher/renderer.rb

@@ -27,7 +27,11 @@ module Hiptest
       if node.is_a? Hiptest::Nodes::Node
         @rendered_children = {}
 
-        node.children.each {|name, child| @rendered_children[name] = @rendered[child]}
+        node.children.each do |name, child| 
+          @rendered_children[name] = @rendered[child]
+
+          @rendered_children[name].uniq! if name == :actionwords && @rendered_children[name].is_a?(Array)
+        end
         @rendered[node] = render_node(node, super(node))
       elsif node.is_a? Array
         @rendered[node] = node.map {|item| @rendered[item]}

data/lib/templates/cucumber/groovy/step-definitions/actionword.hbs

@@ -1,4 +1,4 @@
-{{#if rendered_children.gherkin_annotation }}{{{ rendered_children.gherkin_annotation }}}(~"^{{#escape_backslashes_and_double_quotes}}{{> gherkin_pattern}}{{/escape_backslashes_and_double_quotes}}\$") { {{{ join rendered_children.parameters_ordered_by_pattern ', '}}} ->{{#indent}}
+{{#if rendered_children.gherkin_annotation }}{{{ rendered_children.gherkin_annotation }}}("{{#escape_backslashes_and_double_quotes}}{{> gherkin_typed_pattern}}{{/escape_backslashes_and_double_quotes}}") { {{{ join rendered_children.parameters_ordered_by_pattern ', '}}} ->{{#indent}}
 {{{ context.call_prefix }}}.{{{camelize_lower uniq_name}}}({{#if has_parameters?}}{{#join raw_parameter_names ', ' as |param|}}{{{camelize_lower param}}}{{/join}}{{/if}})
 {{/indent}}
 }

data/lib/templates/cucumber/groovy/step-definitions/actionwords.hbs

@@ -1,8 +1,9 @@
 package {{{ context.package }}}
 
-import cucumber.api.DataTable
+import io.cucumber.datatable.DataTable
+import io.cucumber.groovy.EN
 
-this.metaClass.mixin(cucumber.api.groovy.EN)
+this.metaClass.mixin(EN)
 
 Actionwords {{{ context.call_prefix }}} = new Actionwords()
 

data/lib/templates/cucumber/groovy/step-definitions/library.hbs

@@ -1,8 +1,9 @@
 package {{{ context.package }}}
 
-import cucumber.api.DataTable
+import io.cucumber.datatable.DataTable
+import io.cucumber.groovy.EN
 
-this.metaClass.mixin(cucumber.api.groovy.EN)
+this.metaClass.mixin(EN)
 
 Actionwords {{{ context.call_prefix }}} = new Actionwords()
 

data/lib/templates/cucumber/groovy/step-definitions/libraryactionword.hbs

@@ -1,4 +1,4 @@
-{{#if rendered_children.gherkin_annotation }}{{{ rendered_children.gherkin_annotation }}}(~"^{{#escape_backslashes_and_double_quotes}}{{> gherkin_pattern}}{{/escape_backslashes_and_double_quotes}}\$") { {{{ join rendered_children.parameters_ordered_by_pattern ', '}}} ->{{#indent}}
+{{#if rendered_children.gherkin_annotation }}{{{ rendered_children.gherkin_annotation }}}("{{#escape_backslashes_and_double_quotes}}{{> gherkin_typed_pattern}}{{/escape_backslashes_and_double_quotes}}") { {{{ join rendered_children.parameters_ordered_by_pattern ', '}}} ->{{#indent}}
 {{{ context.call_prefix }}}.get{{{camelize library_name}}}Library().{{{camelize_lower uniq_name}}}({{#if has_parameters?}}{{#join raw_parameter_names ', ' as |param|}}{{{camelize_lower param}}}{{/join}}{{/if}})
 {{/indent}}
 }

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

@@ -1,4 +1,4 @@
-{{#if rendered_children.gherkin_annotation }}@{{{ rendered_children.gherkin_annotation }}}("{{#escape_backslashes_and_double_quotes}}{{> gherkin_pattern}}{{/escape_backslashes_and_double_quotes}}")
+{{#if rendered_children.gherkin_annotation }}@{{{ rendered_children.gherkin_annotation }}}("{{#escape_backslashes_and_double_quotes}}{{> gherkin_typed_pattern}}{{/escape_backslashes_and_double_quotes}}")
 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 ', ' as |param|}}{{{camelize_lower param}}}{{/join}}{{/if}});
 {{/indent}}

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

@@ -1,7 +1,7 @@
 package {{{ context.package }}};
 
-import cucumber.api.DataTable;
-import cucumber.api.java.en.*;
+import io.cucumber.datatable.DataTable;
+import io.cucumber.java.en.*;
 
 public class StepDefinitions {{#curly}}{{#indent}}
 public Actionwords {{{ context.call_prefix }}} = new Actionwords();

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

@@ -1,5 +1,5 @@
 {{#if rendered_children.gherkin_annotation }}
-{{{ rendered_children.gherkin_annotation }}}(/{{> gherkin_pattern}}/, async ({{#if rendered_children.parameters}}{{{ join rendered_children.parameters_ordered_by_pattern ', '}}}{{/if}}) => {{#curly}}{{#indent}}
+{{{ rendered_children.gherkin_annotation }}}('{{> gherkin_typed_pattern}}', async ({{#if rendered_children.parameters}}{{{ join rendered_children.parameters_ordered_by_pattern ', '}}}{{/if}}) => {{#curly}}{{#indent}}
 actionWords.{{{camelize_lower rendered_children.name}}}({{#if has_parameters?}}{{#join raw_parameter_names ', ' as |param|}}{{{underscore param}}}{{/join}}{{/if}});
 {{/indent}}
 {{/curly}});{{/if}}

data/lib/templates/cucumber/typescript/libraryactionword.hbs

@@ -1,5 +1,5 @@
 {{#if rendered_children.gherkin_annotation}}
-{{{ rendered_children.gherkin_annotation }}}(/{{> gherkin_pattern}}/, async ({{#if rendered_children.parameters}}{{{ join rendered_children.parameters_ordered_by_pattern ', '}}}{{/if}}) => {{#curly}}{{#indent}}
+{{{ rendered_children.gherkin_annotation }}}('{{> gherkin_typed_pattern}}', async ({{#if rendered_children.parameters}}{{{ join rendered_children.parameters_ordered_by_pattern ', '}}}{{/if}}) => {{#curly}}{{#indent}}
 libraryActionWord.getDefaultLibrary().{{{camelize_lower rendered_children.name}}}({{#if has_parameters?}}{{#join raw_parameter_names ', ' as |param|}}{{{underscore param}}}{{/join}}{{/if}});
 {{/indent}}
 {{/curly}});{{/if}}

data/lib/templates/cucumber_legacy/groovy/step-definitions/actionword.hbs

@@ -0,0 +1,5 @@
+{{#if rendered_children.gherkin_annotation }}{{{ rendered_children.gherkin_annotation }}}(~"^{{#escape_backslashes_and_double_quotes}}{{> gherkin_pattern}}{{/escape_backslashes_and_double_quotes}}\$") { {{{ join rendered_children.parameters_ordered_by_pattern ', '}}} ->{{#indent}}
+{{{ context.call_prefix }}}.{{{camelize_lower uniq_name}}}({{#if has_parameters?}}{{#join raw_parameter_names ', ' as |param|}}{{{camelize_lower param}}}{{/join}}{{/if}})
+{{/indent}}
+}
+{{/if}}

data/lib/templates/cucumber_legacy/groovy/step-definitions/actionwords.hbs

@@ -0,0 +1,10 @@
+package {{{ context.package }}}
+
+import cucumber.api.DataTable
+
+this.metaClass.mixin(cucumber.api.groovy.EN)
+
+Actionwords {{{ context.call_prefix }}} = new Actionwords()
+
+{{#each rendered_children.actionwords as |actionword|}}{{{actionword}}}
+{{/each}}

data/lib/templates/cucumber_legacy/groovy/step-definitions/library.hbs

@@ -0,0 +1,10 @@
+package {{{ context.package }}}
+
+import cucumber.api.DataTable
+
+this.metaClass.mixin(cucumber.api.groovy.EN)
+
+Actionwords {{{ context.call_prefix }}} = new Actionwords()
+
+{{#each rendered_children.library_actionwords as |actionword|}}{{{actionword}}}
+{{/each}}

data/lib/templates/cucumber_legacy/groovy/step-definitions/libraryactionword.hbs

@@ -0,0 +1,5 @@
+{{#if rendered_children.gherkin_annotation }}{{{ rendered_children.gherkin_annotation }}}(~"^{{#escape_backslashes_and_double_quotes}}{{> gherkin_pattern}}{{/escape_backslashes_and_double_quotes}}\$") { {{{ join rendered_children.parameters_ordered_by_pattern ', '}}} ->{{#indent}}
+{{{ context.call_prefix }}}.get{{{camelize library_name}}}Library().{{{camelize_lower uniq_name}}}({{#if has_parameters?}}{{#join raw_parameter_names ', ' as |param|}}{{{camelize_lower param}}}{{/join}}{{/if}})
+{{/indent}}
+}
+{{/if}}