mirror of
https://github.com/jrnl-org/jrnl.git
synced 2025-05-10 00:28:31 +02:00
1530ad39a1
* Encapsulate all multiline strings in triple-quotes in Gherkin files Since pytest-bdd v8.0.0 uses the official Gherkin parser, multiline strings must now be encapsulated by triple-quotes. See: - https://pytest-bdd.readthedocs.io/en/stable/#id2 - https://pytest-bdd.readthedocs.io/en/stable/#docstrings * Remove comments in Gherkin files causing test breakage These comments break the step matching. * Fix compatibility of step-functions matching on multiple lines In pytest-bdd v8.0.0 it is no longer possible to match based on multiple lines, which breaks essentially all steps that support docstrings. Solve this by adding a wrapper-function for each of these instances, that matches the docstring step, and calls the original function. So, what used to be: @then(parse("the output should match\n{regex}")) @then(parse('the output should match "{regex}"')) def output_should_match(regex, cli_run): ... Is now: @then(parse("the output should match")) def output_should_match_docstring(cli_run, docstring): output_should_match(docstring, cli_run) @then(parse('the output should match "{regex}"')) def output_should_match(regex, cli_run): ... There is possibly a way around this that is much better than what I've done here, but this is a start at least. * Update version requirement of pytest-bdd to >=8.0 * Update tox config to match poetry config --------- Co-authored-by: Micah Jerome Ellison <micah.jerome.ellison@gmail.com>
97 lines
4.1 KiB
Gherkin
97 lines
4.1 KiB
Gherkin
# Copyright © 2012-2023 jrnl contributors
|
|
# License: https://www.gnu.org/licenses/gpl-3.0.html
|
|
|
|
Feature: Importing data
|
|
|
|
Scenario Outline: --import allows new entry from stdin
|
|
Given we use the config "<config_file>"
|
|
And we use the password "test" if prompted
|
|
When we run "jrnl --import" and pipe "[2020-07-05 15:00] Observe and import."
|
|
When we run "jrnl -9 --short"
|
|
Then the output should contain "Observe and import"
|
|
|
|
Examples: Configs
|
|
| config_file |
|
|
| basic_onefile.yaml |
|
|
| basic_encrypted.yaml |
|
|
| basic_folder.yaml |
|
|
# | basic_dayone.yaml | @todo
|
|
|
|
Scenario Outline: --import allows new large entry from stdin
|
|
Given we use the config "<config_file>"
|
|
And we use the password "test" if prompted
|
|
When we run "jrnl --import" and pipe
|
|
"""
|
|
[2020-07-05 15:00] Observe and import.
|
|
Lorem ipsum dolor sit amet, consectetur adipiscing elit. Praesent malesuada quis
|
|
est ac dignissim. Aliquam dignissim rutrum pretium. Phasellus pellentesque augue
|
|
et venenatis facilisis. Suspendisse potenti. Sed dignissim sed nisl eu consequat.
|
|
Aenean ante ex, elementum ut interdum et, mattis eget lacus. In commodo nulla nec
|
|
tellus placerat, sed ultricies metus bibendum. Duis eget venenatis erat. In at
|
|
dolor dui end of entry.
|
|
"""
|
|
When we run "jrnl -on 2020-07-05"
|
|
Then the output should contain "2020-07-05 15:00 Observe and import."
|
|
And the output should contain "Lorem ipsum"
|
|
And the output should contain "end of entry."
|
|
|
|
Examples: Configs
|
|
| config_file |
|
|
| basic_onefile.yaml |
|
|
| basic_encrypted.yaml |
|
|
| basic_folder.yaml |
|
|
# | basic_dayone.yaml | @todo
|
|
|
|
Scenario Outline: --import allows multiple new entries from stdin
|
|
Given we use the config "<config_file>"
|
|
And we use the password "test" if prompted
|
|
When we run "jrnl --import" and pipe
|
|
"""
|
|
[2020-07-05 15:00] Observe and import.
|
|
Lorem ipsum dolor sit amet, consectetur adipiscing elit.
|
|
|
|
[2020-07-05 15:01] Twice as nice.
|
|
Sed dignissim sed nisl eu consequat.
|
|
"""
|
|
When we run "jrnl -on 2020-07-05"
|
|
Then the output should contain "2020-07-05 15:00 Observe and import."
|
|
And the output should contain "Lorem ipsum"
|
|
And the output should contain "2020-07-05 15:01 Twice as nice."
|
|
And the output should contain "Sed dignissim"
|
|
|
|
Examples: Configs
|
|
| config_file |
|
|
| basic_onefile.yaml |
|
|
| basic_encrypted.yaml |
|
|
| basic_folder.yaml |
|
|
# | basic_dayone.yaml | @todo
|
|
|
|
Scenario: --import allows import new entries from file
|
|
Given we use the config "simple.yaml"
|
|
When we run "jrnl -99"
|
|
Then the output should contain "My first entry."
|
|
And the output should contain "Life is good."
|
|
But the output should not contain "I have an @idea"
|
|
And the output should not contain "I met with"
|
|
When we run "jrnl --import --file features/journals/tags.journal"
|
|
And we run "jrnl -99"
|
|
Then the output should contain "My first entry."
|
|
And the output should contain "Life is good."
|
|
And the output should contain "PROFIT!"
|
|
|
|
Scenario: --import prioritizes --file over pipe data if both are given
|
|
Given we use the config "simple.yaml"
|
|
When we run "jrnl -99"
|
|
Then the output should contain "My first entry."
|
|
And the output should contain "Life is good."
|
|
But the output should not contain "I have an @idea"
|
|
And the output should not contain "I met with"
|
|
When we run "jrnl --import --file features/journals/tags.journal" and pipe
|
|
"""
|
|
[2020-07-05 15:00] I should not exist!
|
|
"""
|
|
And we run "jrnl -99"
|
|
Then the output should contain "My first entry."
|
|
And the output should contain "PROFIT!"
|
|
But the output should not contain "I should not exist!"
|
|
|