Let gherkin-terminal-reporter-expanded enable gherkin output

pytest_bdd/cucumber_json.py

@@ -32,7 +32,7 @@ def add_options(parser):
         "--cucumberjson-expanded",
         "--cucumber-json-expanded",
         action="store_true",
-        dest="expand",
+        dest="cucumber_json_expanded",
         default=False,
         help="expand scenario outlines into scenarios and fill in the step names",
     )
@@ -42,7 +42,7 @@ def configure(config):
     cucumber_json_path = config.option.cucumber_json_path
     # prevent opening json log on slave nodes (xdist)
     if cucumber_json_path and not hasattr(config, "slaveinput"):
-        config._bddcucumberjson = LogBDDCucumberJSON(cucumber_json_path, expand=config.option.expand)
+        config._bddcucumberjson = LogBDDCucumberJSON(cucumber_json_path, expand=config.option.cucumber_json_expanded)
         config.pluginmanager.register(config._bddcucumberjson)
 
 

pytest_bdd/gherkin_terminal_reporter.py

@@ -23,14 +23,14 @@ def add_options(parser):
     group._addoption(
         "--gherkin-terminal-reporter-expanded",
         action="store_true",
-        dest="expand",
+        dest="gherkin_expanded",
         default=False,
-        help="expand scenario outlines into scenarios and fill in the step names",
+        help="enable gherkin output, expand scenario outlines into scenarios and fill in the step names",
     )
 
 
 def configure(config):
-    if config.option.gherkin_terminal_reporter:
+    if config.option.gherkin_terminal_reporter or config.option.gherkin_expanded:
         # Get the standard terminal reporter plugin and replace it with our
         current_reporter = config.pluginmanager.getplugin('terminalreporter')
         if current_reporter.__class__ != TerminalReporter:
@@ -102,7 +102,7 @@ def pytest_runtest_logreport(self, report):
                 self._tw.write(report.scenario['name'], **scenario_markup)
                 self._tw.write('\n')
                 for step in report.scenario['steps']:
-                    if self.config.option.expand:
+                    if self.config.option.gherkin_expanded:
                         step_name = self._format_step_name(step['name'], **report.scenario['example_kwargs'])
                     else:
                         step_name = step['name']

tests/feature/gherkin_terminal_reporter.feature

@@ -43,5 +43,10 @@ Feature: Gherkin terminal reporter
 
   Scenario: Should step parameters be replaced by their values
     Given there is gherkin scenario outline implemented
-    When tests are run with step expanded mode
+    When tests are run with step expanded option
+    Then output must contain parameters values
+
+  Scenario: Should step parameters be replaced by their values also when used together with gherkin reporter option
+    Given there is gherkin scenario outline implemented
+    When tests are run with step expanded and gherkin reporter options
     Then output must contain parameters values

tests/feature/test_gherkin_terminal_reporter.py

@@ -61,6 +61,12 @@ def test_Should_step_parameters_be_replaced_by_their_values():
     pass
 
 
+@scenario('gherkin_terminal_reporter.feature',
+          'Should step parameters be replaced by their values also when used together with gherkin reporter option')
+def test_Should_step_parameters_be_replaced_by_their_values_also_when_used_together_with_gherkin_reporter_option():
+    pass
+
+
 @pytest.fixture(params=[0, 1, 2],
                 ids=['compact mode', 'line per test', 'verbose'])
 def verbosity_mode(request):
@@ -185,8 +191,17 @@ def tests_are_run_with_very_verbose_mode(testdir, test_execution):
     test_execution['gherkin'] = testdir.runpytest('--gherkin-terminal-reporter', '-vv')
 
 
-@when("tests are run with step expanded mode")
-def tests_are_run_with_step_expanded_mode(testdir, test_execution):
+@when("tests are run with step expanded option")
+def tests_are_run_with_step_expanded_option(testdir, test_execution):
+    test_execution['regular'] = testdir.runpytest('-vv')
+    test_execution['gherkin'] = testdir.runpytest(
+        '--gherkin-terminal-reporter-expanded',
+        '-vv',
+    )
+
+
+@when("tests are run with step expanded and gherkin reporter options")
+def tests_are_run_with_step_expanded_and_gherkin_reporter_options(testdir, test_execution):
     test_execution['regular'] = testdir.runpytest('-vv')
     test_execution['gherkin'] = testdir.runpytest(
         '--gherkin-terminal-reporter',