Sourcery refactored master branch #649
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
![sourcery-ai[bot]](https://avatars.githubusercontent.com/in/48477?s=60&v=4){kind=small}
| elif report.failed and step["failed"]: | ||
| elif report.failed: |
There was a problem hiding this comment.
Function LogBDDCucumberJSON._get_result refactored with the following changes:
- Remove redundant conditional (
remove-redundant-if)
src/pytest_bdd/generation.py
Outdated
| if config.option.generate_missing: | ||
| return show_missing_code(config) | ||
| return None # Make mypy happy | ||
| return show_missing_code(config) if config.option.generate_missing else None |
There was a problem hiding this comment.
Function cmdline_main refactored with the following changes:
- Lift code into else after jump in control flow (
reintroduce-else) - Replace if statement with if expression (
assign-if-exp)
This removes the following comments ( why? ):
# Make mypy happy
src/pytest_bdd/generation.py
Outdated
Comment on lines
182
to
184
| scenario = getattr(item.obj, "__scenario__", None) | ||
| if scenario: | ||
| if scenario := getattr(item.obj, "__scenario__", None): | ||
| if scenario in scenarios: | ||
| scenarios.remove(scenario) | ||
| for step in scenario.steps: | ||
| fixturedefs = _find_step_fixturedef(fm, item, step=step) | ||
| if fixturedefs: | ||
| if fixturedefs := _find_step_fixturedef(fm, item, step=step): |
There was a problem hiding this comment.
Function _show_missing_code_main refactored with the following changes:
- Use named expression to simplify assignment and conditional [×2] (
use-named-expression)
Comment on lines
61
to
94
| else: | ||
| if rep.passed: | ||
| word_markup = {"green": True} | ||
| elif rep.failed: | ||
| word_markup = {"red": True} | ||
| elif rep.skipped: | ||
| word_markup = {"yellow": True} | ||
| elif rep.passed: | ||
| word_markup = {"green": True} | ||
| elif rep.failed: | ||
| word_markup = {"red": True} | ||
| elif rep.skipped: | ||
| word_markup = {"yellow": True} | ||
| feature_markup = {"blue": True} | ||
| scenario_markup = word_markup | ||
|
|
||
| if self.verbosity <= 0: | ||
| if ( | ||
| self.verbosity > 0 | ||
| and self.verbosity == 1 | ||
| and hasattr(report, "scenario") | ||
| ): | ||
| self.ensure_newline() | ||
| self._tw.write("Feature: ", **feature_markup) | ||
| self._tw.write(report.scenario["feature"]["name"], **feature_markup) | ||
| self._tw.write("\n") | ||
| self._tw.write(" Scenario: ", **scenario_markup) | ||
| self._tw.write(report.scenario["name"], **scenario_markup) | ||
| self._tw.write(" ") | ||
| self._tw.write(word, **word_markup) | ||
| self._tw.write("\n") | ||
| elif ( | ||
| self.verbosity > 0 | ||
| and self.verbosity == 1 | ||
| or self.verbosity > 0 | ||
| and self.verbosity > 1 | ||
| and not hasattr(report, "scenario") | ||
| or self.verbosity <= 0 | ||
| ): | ||
| return super().pytest_runtest_logreport(rep) | ||
| elif self.verbosity == 1: | ||
| if hasattr(report, "scenario"): | ||
| self.ensure_newline() | ||
| self._tw.write("Feature: ", **feature_markup) | ||
| self._tw.write(report.scenario["feature"]["name"], **feature_markup) | ||
| self._tw.write("\n") | ||
| self._tw.write(" Scenario: ", **scenario_markup) | ||
| self._tw.write(report.scenario["name"], **scenario_markup) | ||
| self._tw.write(" ") | ||
| self._tw.write(word, **word_markup) | ||
| self._tw.write("\n") | ||
| else: | ||
| return super().pytest_runtest_logreport(rep) | ||
| elif self.verbosity > 1: | ||
| if hasattr(report, "scenario"): | ||
| self.ensure_newline() | ||
| self._tw.write("Feature: ", **feature_markup) | ||
| self._tw.write(report.scenario["feature"]["name"], **feature_markup) | ||
| self._tw.write("\n") | ||
| self._tw.write(" Scenario: ", **scenario_markup) | ||
| self._tw.write(report.scenario["name"], **scenario_markup) | ||
| self._tw.write("\n") | ||
| for step in report.scenario["steps"]: | ||
| self._tw.write(f" {step['keyword']} {step['name']}\n", **scenario_markup) | ||
| self._tw.write(" " + word, **word_markup) | ||
| self._tw.write("\n\n") | ||
| else: | ||
| return super().pytest_runtest_logreport(rep) | ||
| self.ensure_newline() | ||
| self._tw.write("Feature: ", **feature_markup) | ||
| self._tw.write(report.scenario["feature"]["name"], **feature_markup) | ||
| self._tw.write("\n") | ||
| self._tw.write(" Scenario: ", **scenario_markup) | ||
| self._tw.write(report.scenario["name"], **scenario_markup) | ||
| self._tw.write("\n") | ||
| for step in report.scenario["steps"]: | ||
| self._tw.write(f" {step['keyword']} {step['name']}\n", **scenario_markup) | ||
| self._tw.write(f" {word}", **word_markup) | ||
| self._tw.write("\n\n") |
There was a problem hiding this comment.
Function GherkinTerminalReporter.pytest_runtest_logreport refactored with the following changes:
- Merge else clause's nested if statement into elif (
merge-else-if-into-elif) - Merge duplicate blocks in conditional (
merge-duplicate-blocks) - Use f-string instead of string concatenation (
use-fstring-for-concatenation) - Remove redundant conditional [×2] (
remove-redundant-if)
src/pytest_bdd/parser.py
Outdated
Comment on lines
55
to
62
| for prefix, _ in STEP_PREFIXES: | ||
| if line.startswith(prefix): | ||
| return prefix.strip(), line[len(prefix) :].strip() | ||
| return "", line | ||
| return next( | ||
| ( | ||
| (prefix.strip(), line[len(prefix) :].strip()) | ||
| for prefix, _ in STEP_PREFIXES | ||
| if line.startswith(prefix) | ||
| ), | ||
| ("", line), | ||
| ) |
There was a problem hiding this comment.
Function parse_line refactored with the following changes:
- Use the built-in function
nextinstead of a for-loop (use-next)
src/pytest_bdd/parsers.py
Outdated
Comment on lines
118
to
116
| if isinstance(step_name, StepParser): | ||
| return step_name | ||
|
|
||
| return string(step_name) | ||
| return step_name if isinstance(step_name, StepParser) else string(step_name) |
There was a problem hiding this comment.
Function get_parser refactored with the following changes:
- Lift code into else after jump in control flow (
reintroduce-else) - Replace if statement with if expression (
assign-if-exp)
src/pytest_bdd/reporting.py
Outdated
| if self.stopped is None: | ||
| return 0 | ||
|
|
||
| return self.stopped - self.started | ||
| return 0 if self.stopped is None else self.stopped - self.started |
There was a problem hiding this comment.
Function StepReport.duration refactored with the following changes:
- Lift code into else after jump in control flow (
reintroduce-else) - Replace if statement with if expression (
assign-if-exp)
| for i, (fixturename, fixturedefs) in enumerate(fixture_def_by_name): | ||
| for fixturename, fixturedefs in fixture_def_by_name: |
There was a problem hiding this comment.
Function find_fixturedefs_for_step refactored with the following changes:
- Remove unnecessary calls to
enumeratewhen the index is not used (remove-unused-enumerate)
Comment on lines
-247
to
-253
| # We need to evaluate these iterators and store them as lists, otherwise | ||
| # we won't be able to do the cartesian product later (the second iterator will be consumed) | ||
| contexts = list(templated_scenario.examples.as_contexts()) | ||
| if not contexts: | ||
| if contexts := list(templated_scenario.examples.as_contexts()): | ||
| return [pytest.param(context, id="-".join(context.values())) for context in contexts] | ||
| else: | ||
| return None | ||
|
|
||
| return [pytest.param(context, id="-".join(context.values())) for context in contexts] |
There was a problem hiding this comment.
Function collect_example_parametrizations refactored with the following changes:
- Use named expression to simplify assignment and conditional (
use-named-expression) - Lift code into else after jump in control flow (
reintroduce-else) - Swap if/else branches (
swap-if-else-branches)
This removes the following comments ( why? ):
# We need to evaluate these iterators and store them as lists, otherwise
# we won't be able to do the cartesian product later (the second iterator will be consumed)
Comment on lines
-266
to
+263
| scenario_name = str(scenario_name) | ||
| scenario_name = scenario_name |
There was a problem hiding this comment.
Function scenario refactored with the following changes:
- Remove unnecessary casts to int, str, float or bool (
remove-unnecessary-cast)
Codecov ReportAttention:
Additional details and impacted files@@ Coverage Diff @@
## master #649 +/- ##
==========================================
- Coverage 95.56% 95.56% -0.01%
==========================================
Files 49 49
Lines 1783 1780 -3
Branches 194 193 -1
==========================================
- Hits 1704 1701 -3
Misses 52 52
Partials 27 27
☔ View full report in Codecov by Sentry. |
youtux
force-pushed
the
sourcery/master
branch
from
39a7aa7
to
f1ba44c
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Branch
masterrefactored by Sourcery.If you're happy with these changes, merge this Pull Request using the Squash and merge strategy.
See our documentation here.
Run Sourcery locally
Reduce the feedback loop during development by using the Sourcery editor plugin:
Review changes via command line
To manually merge these changes, make sure you're on the
masterbranch, then run:Help us improve this pull request!