Skip to content

Commit 28e25bc

Browse files
elchupanebrejelchupanebrej
authored
Merge pull request #132 from elchupanebrej/release/2.3.0
Release backmerge
2 parents 6bd3067 + 7b32474 commit 28e25bc

27 files changed

+2947
-2901
lines changed

‎CHANGES.rst

+6-3
Original file line numberDiff line numberDiff line change
@@ -53,11 +53,14 @@ Planned
5353
- Contribute to messages repository with python model
5454
- Add support of native legacy cucumber-json
5555

56-
Unreleased
57-
----------
56+
2.3.1
57+
-----
58+
- Fixup documentation generation
59+
60+
2.3.0
61+
-----
5862
- Add mobile readthedocs site support theme
5963
- Convert e2e test features definitions to markdown
60-
- Move documentation to Gherkin itself
6164
- Implement support of `Markdown <https://github.com/cucumber/gherkin/blob/main/MARKDOWN_WITH_GHERKIN.md>`_ using js based parser
6265
- Update versions:
6366

‎docs/features/Feature/Description.feature.rst

+40-40
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,40 @@
1-
Feature: Descriptions
2-
^^^^^^^^^^^^^^^^^^^^^
3-
4-
Free-form descriptions can be placed underneath Feature,
5-
Example/Scenario, Background, Scenario Outline and Rule. You can write
6-
anything you like, as long as no line starts with a keyword.
7-
Descriptions can be in the form of Markdown - formatters including the
8-
official HTML formatter support this.
9-
10-
Scenario:
11-
'''''''''
12-
13-
- Given File "Description.feature" with content:
14-
15-
.. code:: gherkin
16-
17-
Feature:
18-
My Feature description
19-
Scenario:
20-
Given I check feature description
21-
22-
- And File "conftest.py" with content:
23-
24-
.. code:: python
25-
26-
from pytest_bdd import given
27-
28-
@given('I check feature description')
29-
def step(feature):
30-
assert feature.description == "My Feature description"
31-
32-
- When run pytest
33-
34-
- Then pytest outcome must contain tests with statuses:
35-
36-
====== ======
37-
passed failed
38-
====== ======
39-
1 0
40-
====== ======
1+
Feature: Descriptions
2+
^^^^^^^^^^^^^^^^^^^^^
3+
4+
Free-form descriptions can be placed underneath Feature,
5+
Example/Scenario, Background, Scenario Outline and Rule. You can write
6+
anything you like, as long as no line starts with a keyword.
7+
Descriptions can be in the form of Markdown - formatters including the
8+
official HTML formatter support this.
9+
10+
Scenario:
11+
'''''''''
12+
13+
- Given File "Description.feature" with content:
14+
15+
.. code:: gherkin
16+
17+
Feature:
18+
My Feature description
19+
Scenario:
20+
Given I check feature description
21+
22+
- And File "conftest.py" with content:
23+
24+
.. code:: python
25+
26+
from pytest_bdd import given
27+
28+
@given('I check feature description')
29+
def step(feature):
30+
assert feature.description == "My Feature description"
31+
32+
- When run pytest
33+
34+
- Then pytest outcome must contain tests with statuses:
35+
36+
====== ======
37+
passed failed
38+
====== ======
39+
1 0
40+
====== ======

‎docs/features/Feature/Load/Autoload.feature.rst

+96-96
Original file line numberDiff line numberDiff line change
@@ -1,96 +1,96 @@
1-
Feature: Gherkin features autoload
2-
''''''''''''''''''''''''''''''''''
3-
4-
By default gherkin features are autoloaded and treated as usual pytest
5-
tests if are placed in the tests hierarchy proposed by pytest. This
6-
behavior could be disabled
7-
8-
Rule: Feature autoload
9-
10-
11-
Background:
12-
13-
14-
- Given File "Passing.feature" with content:
15-
16-
.. code:: gherkin
17-
18-
Feature: Passing feature
19-
Scenario: Passing scenario
20-
* Passing step
21-
22-
- Given File "Another.passing.feature.md" with content:
23-
24-
.. code:: markdown
25-
26-
# Feature: Passing feature
27-
## Scenario: Passing scenario
28-
* Given Passing step
29-
30-
- Given Install npm packages
31-
32-
======== =================
33-
packages @cucumber/gherkin
34-
======== =================
35-
======== =================
36-
37-
- Given File "conftest.py" with content:
38-
39-
.. code:: python
40-
41-
from pytest_bdd import step
42-
43-
@step('Passing step')
44-
45-
def _():
46-
...
47-
48-
Scenario: Feature is loaded by default
49-
50-
51-
- When run pytest
52-
- Then pytest outcome must contain tests with statuses:
53-
54-
+--------+
55-
| passed |
56-
+========+
57-
| 2 |
58-
+--------+
59-
60-
Scenario: Feature autoload could be disabled via command line
61-
62-
63-
- When run pytest
64-
65-
======== ==========================
66-
cli_args --disable-feature-autoload
67-
======== ==========================
68-
======== ==========================
69-
70-
- Then pytest outcome must contain tests with statuses:
71-
72-
+--------+
73-
| passed |
74-
+========+
75-
| 0 |
76-
+--------+
77-
78-
Scenario: Feature autoload could be disabled via pytest.ini
79-
80-
81-
- Given Set pytest.ini content to:
82-
83-
.. code:: ini
84-
85-
[pytest]
86-
disable_feature_autoload=true
87-
88-
- When run pytest
89-
90-
- Then pytest outcome must contain tests with statuses:
91-
92-
+--------+
93-
| passed |
94-
+========+
95-
| 0 |
96-
+--------+
1+
Feature: Gherkin features autoload
2+
''''''''''''''''''''''''''''''''''
3+
4+
By default gherkin features are autoloaded and treated as usual pytest
5+
tests if are placed in the tests hierarchy proposed by pytest. This
6+
behavior could be disabled
7+
8+
Rule: Feature autoload
9+
10+
11+
Background:
12+
13+
14+
- Given File "Passing.feature" with content:
15+
16+
.. code:: gherkin
17+
18+
Feature: Passing feature
19+
Scenario: Passing scenario
20+
* Passing step
21+
22+
- Given File "Another.passing.feature.md" with content:
23+
24+
.. code:: markdown
25+
26+
# Feature: Passing feature
27+
## Scenario: Passing scenario
28+
* Given Passing step
29+
30+
- Given Install npm packages
31+
32+
======== =================
33+
packages @cucumber/gherkin
34+
======== =================
35+
======== =================
36+
37+
- Given File "conftest.py" with content:
38+
39+
.. code:: python
40+
41+
from pytest_bdd import step
42+
43+
@step('Passing step')
44+
45+
def _():
46+
...
47+
48+
Scenario: Feature is loaded by default
49+
50+
51+
- When run pytest
52+
- Then pytest outcome must contain tests with statuses:
53+
54+
+--------+
55+
| passed |
56+
+========+
57+
| 2 |
58+
+--------+
59+
60+
Scenario: Feature autoload could be disabled via command line
61+
62+
63+
- When run pytest
64+
65+
======== ==========================
66+
cli_args --disable-feature-autoload
67+
======== ==========================
68+
======== ==========================
69+
70+
- Then pytest outcome must contain tests with statuses:
71+
72+
+--------+
73+
| passed |
74+
+========+
75+
| 0 |
76+
+--------+
77+
78+
Scenario: Feature autoload could be disabled via pytest.ini
79+
80+
81+
- Given Set pytest.ini content to:
82+
83+
.. code:: ini
84+
85+
[pytest]
86+
disable_feature_autoload=true
87+
88+
- When run pytest
89+
90+
- Then pytest outcome must contain tests with statuses:
91+
92+
+--------+
93+
| passed |
94+
+========+
95+
| 0 |
96+
+--------+

0 commit comments

Comments
 (0)