Let gherkin-terminal-reporter-expanded enable gherkin output

Author: sliwinski-milosz

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

@@ -21,14 +21,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:
@@ -100,7 +100,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']