Merge branch 'pytest-dev:master' into master

Author: elchupanebrej

.editorconfig

@@ -0,0 +1,18 @@
+# EditorConfig is awesome: https://EditorConfig.org
+
+# top-most EditorConfig file
+root = true
+
+# Unix-style newlines with a newline ending every file
+[*]
+end_of_line = lf
+insert_final_newline = true
+charset = utf-8
+
+[*.py]
+indent_style = space
+indent_size = 4
+
+[*.yml]
+indent_style = space
+indent_size = 2

.github/workflows/main.yml

@@ -0,0 +1,30 @@
+name: Main testing workflow
+
+on:
+  push:
+  pull_request:
+  workflow_dispatch:
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        python-version: ["3.6", "3.7", "3.8", "3.9", 3.10.0-alpha.6]
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Python ${{ matrix.python-version }}
+      uses: actions/setup-python@v2
+      with:
+        python-version: ${{ matrix.python-version }}
+    - name: Install dependencies
+      run: |
+        python -m pip install --upgrade pip
+        pip install -U setuptools
+        pip install tox tox-gh-actions codecov
+    - name: Test with tox
+      run: |
+        tox
+        codecov

.pre-commit-config.yaml

@@ -2,13 +2,18 @@
 # See https://pre-commit.com/hooks.html for more hooks
 repos:
 -   repo: https://github.com/psf/black
-    rev: 20.8b1
+    rev: 21.4b0
     hooks:
     - id: black
 -   repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v3.2.0
+    rev: v3.4.0
     hooks:
     -   id: trailing-whitespace
     -   id: end-of-file-fixer
     -   id: check-yaml
     -   id: check-added-large-files
+-   repo: https://github.com/asottile/pyupgrade
+    rev: v2.13.0
+    hooks:
+    -   id: pyupgrade
+        args: [--py36-plus]

.travis.yml

@@ -4,6 +4,8 @@ Changelog
 Unreleased
 -----------
 - Drop compatibility for python 2 and officially support only python >= 3.6.
+- Fix error when using `--cucumber-json-expanded` in combination with `example_converters` (marcbrossaissogeti).
+- Fix `--generate-missing` not correctly recognizing steps with parsers
 
 4.0.2
 -----

CHANGES.rst

@@ -44,7 +44,7 @@ def unconfigure(config):
         config.pluginmanager.unregister(xml)
 
 
-class LogBDDCucumberJSON(object):
+class LogBDDCucumberJSON:
 
     """Logging plugin for cucumber like json output."""
 
@@ -90,7 +90,7 @@ def _serialize_tags(self, item):
 
     def _format_name(self, name, keys, values):
         for param, value in zip(keys, values):
-            name = name.replace("<{}>".format(param), value)
+            name = name.replace(f"<{param}>", str(value))
         return name
 
     def _format_step_name(self, report, step):

pytest_bdd/cucumber_json.py

@@ -102,7 +102,7 @@ def print_missing_code(scenarios, steps):
     tw.line()
 
     features = sorted(
-        set(scenario.feature for scenario in scenarios), key=lambda feature: feature.name or feature.filename
+        {scenario.feature for scenario in scenarios}, key=lambda feature: feature.name or feature.filename
     )
     code = generate_code(features, scenarios, steps)
     tw.write(code)
@@ -116,14 +116,16 @@ def _find_step_fixturedef(fixturemanager, item, name, type_):
 
     :return: Step function.
     """
-    fixturedefs = fixturemanager.getfixturedefs(get_step_fixture_name(name, type_), item.nodeid)
-    if not fixturedefs:
-        name = find_argumented_step_fixture_name(name, type_, fixturemanager)
-        if name:
-            return _find_step_fixturedef(fixturemanager, item, name, type_)
-    else:
+    step_fixture_name = get_step_fixture_name(name, type_)
+    fixturedefs = fixturemanager.getfixturedefs(step_fixture_name, item.nodeid)
+    if fixturedefs is not None:
         return fixturedefs
 
+    argumented_step_name = find_argumented_step_fixture_name(name, type_, fixturemanager)
+    if argumented_step_name is not None:
+        return fixturemanager.getfixturedefs(argumented_step_name, item.nodeid)
+    return None
+
 
 def parse_feature_files(paths, **kwargs):
     """Parse feature files of given paths.

pytest_bdd/generation.py

@@ -101,7 +101,7 @@ def parse_feature(basedir, filename, encoding="utf-8"):
     multiline_step = False
     prev_line = None
 
-    with io.open(abs_filename, "rt", encoding=encoding) as f:
+    with open(abs_filename, encoding=encoding) as f:
         content = f.read()
 
     for line_number, line in enumerate(content.splitlines(), start=1):
@@ -170,14 +170,14 @@ def parse_feature(basedir, filename, encoding="utf-8"):
             except exceptions.ExamplesNotValidError as exc:
                 if scenario:
                     raise exceptions.FeatureError(
-                        """Scenario has not valid examples. {0}""".format(exc.args[0]),
+                        f"Scenario has not valid examples. {exc.args[0]}",
                         line_number,
                         clean_line,
                         filename,
                     )
                 else:
                     raise exceptions.FeatureError(
-                        """Feature has not valid examples. {0}""".format(exc.args[0]),
+                        f"Feature has not valid examples. {exc.args[0]}",
                         line_number,
                         clean_line,
                         filename,
@@ -195,7 +195,7 @@ def parse_feature(basedir, filename, encoding="utf-8"):
     return feature
 
 
-class Feature(object):
+class Feature:
     """Feature."""
 
     def __init__(self, scenarios, filename, rel_filename, name, tags, examples, background, line_number, description):
@@ -213,7 +213,7 @@ def __init__(self, scenarios, filename, rel_filename, name, tags, examples, back
         self.background = background
 
 
-class Scenario(object):
+class Scenario:
 
     """Scenario."""
 
@@ -283,14 +283,14 @@ def validate(self):
         example_params = self.get_example_params()
         if params and example_params and params != example_params:
             raise exceptions.ScenarioExamplesNotValidError(
-                """Scenario "{0}" in the feature "{1}" has not valid examples. """
-                """Set of step parameters {2} should match set of example values {3}.""".format(
+                """Scenario "{}" in the feature "{}" has not valid examples. """
+                """Set of step parameters {} should match set of example values {}.""".format(
                     self.name, self.feature.filename, sorted(params), sorted(example_params)
                 )
             )
 
 
-class Step(object):
+class Step:
 
     """Step."""
 
@@ -345,15 +345,15 @@ def name(self, value):
 
     def __str__(self):
         """Full step name including the type."""
-        return '{type} "{name}"'.format(type=self.type.capitalize(), name=self.name)
+        return f'{self.type.capitalize()} "{self.name}"'
 
     @property
     def params(self):
         """Get step params."""
         return tuple(frozenset(STEP_PARAM_RE.findall(self.name)))
 
 
-class Background(object):
+class Background:
 
     """Background."""
 
@@ -373,7 +373,7 @@ def add_step(self, step):
         self.steps.append(step)
 
 
-class Examples(object):
+class Examples:
 
     """Example table."""
 
@@ -407,7 +407,7 @@ def add_example_row(self, param, values):
         """
         if param in self.example_params:
             raise exceptions.ExamplesNotValidError(
-                """Example rows should contain unique parameters. "{0}" appeared more than once""".format(param)
+                f"""Example rows should contain unique parameters. "{param}" appeared more than once"""
             )
         self.example_params.append(param)
         self.vertical_examples.append(values)
@@ -454,7 +454,7 @@ def get_tags(line):
     """
     if not line or not line.strip().startswith("@"):
         return set()
-    return set((tag.lstrip("@") for tag in line.strip().split(" @") if len(tag) > 1))
+    return {tag.lstrip("@") for tag in line.strip().split(" @") if len(tag) > 1}
 
 
 STEP_PARAM_RE = re.compile(r"\<(.+?)\>")

pytest_bdd/parser.py

@@ -1,6 +1,5 @@
 """Step parsers."""
 
-from __future__ import absolute_import
 
 import re as base_re
 from functools import partial
@@ -9,7 +8,7 @@
 from parse_type import cfparse as base_cfparse
 
 
-class StepParser(object):
+class StepParser:
     """Parser of the individual step."""
 
     def __init__(self, name):
@@ -32,7 +31,7 @@ class re(StepParser):
 
     def __init__(self, name, *args, **kwargs):
         """Compile regex."""
-        super(re, self).__init__(name)
+        super().__init__(name)
         self.regex = base_re.compile(self.name, *args, **kwargs)
 
     def parse_arguments(self, name):
@@ -52,7 +51,7 @@ class parse(StepParser):
 
     def __init__(self, name, *args, **kwargs):
         """Compile parse expression."""
-        super(parse, self).__init__(name)
+        super().__init__(name)
         self.parser = base_parse.compile(self.name, *args, **kwargs)
 
     def parse_arguments(self, name):

pytest_bdd/parsers.py

@@ -9,7 +9,7 @@
 from .utils import get_parametrize_markers_args
 
 
-class StepReport(object):
+class StepReport:
     """Step excecution report."""
 
     failed = False
@@ -59,7 +59,7 @@ def duration(self):
         return self.stopped - self.started
 
 
-class ScenarioReport(object):
+class ScenarioReport:
     """Scenario execution report."""
 
     def __init__(self, scenario, node):