mirror of
https://github.com/jrnl-org/jrnl.git
synced 2025-05-10 16:48:31 +02:00
bc42f74b2b
* Update and modularize exception handling cc #1024 #1141 - Stack traces are no longer shown to users unless the --debug flag is being used - Errors, warnings, and other messages contain color as needed - Converted error messages to Enum - Adds print_msg function to centralize output (this should replace all other output in other modules) Co-authored-by: Micah Jerome Ellison <micah.jerome.ellison@gmail.com> * format with black * add message to catch-all exception block * Unskip some tests (#1399) * remove skip_editor test and tag * remove useless test * unskip blank input test * formatting * rename test so it doesn't overwrite other test * unskip some dayone tests that now work * Bump ipython from 7.28.0 to 7.31.1 (#1401) Bumps [ipython](https://github.com/ipython/ipython) from 7.28.0 to 7.31.1. - [Release notes](https://github.com/ipython/ipython/releases) - [Commits](https://github.com/ipython/ipython/compare/7.28.0...7.31.1) --- updated-dependencies: - dependency-name: ipython dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Update changelog [ci skip] * Bump asteval from 0.9.25 to 0.9.26 (#1400) Bumps [asteval](https://github.com/newville/asteval) from 0.9.25 to 0.9.26. - [Release notes](https://github.com/newville/asteval/releases) - [Commits](https://github.com/newville/asteval/compare/0.9.25...0.9.26) --- updated-dependencies: - dependency-name: asteval dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Update changelog [ci skip] * Bump black from 21.12b0 to 22.1.0 (#1404) * Bump black from 21.12b0 to 22.1.0 Bumps [black](https://github.com/psf/black) from 21.12b0 to 22.1.0. - [Release notes](https://github.com/psf/black/releases) - [Changelog](https://github.com/psf/black/blob/main/CHANGES.md) - [Commits](https://github.com/psf/black/commits/22.1.0) --- updated-dependencies: - dependency-name: black dependency-type: direct:development ... Signed-off-by: dependabot[bot] <support@github.com> * Run make format Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Micah Jerome Ellison <micah.jerome.ellison@gmail.com> * Update changelog [ci skip] * Add reference documentation to docs site and separate out "Tips and Tricks" and "External Editors" from "Recipes" (#1332) * First draft of command line reference, mostly pulled from help screen * Add first draft of config file reference, mostly pulled from advanced.md * Clean up config file doc for readability * Add --config-file and remove examples from CLI reference * Add warning about time zone in timeformat * More small changes, and adding template config keyword * Cleaning up and re-ordering config file reference * Clean up reference and anything else from advanced documentation that can live elsewhere and linking to config file reference wherever config file is mentioned * Fix syntax highlighting in command line reference, clean up content a bit, include --diagnostic * Mention version config key * Apply minor changes suggested in PR review * Rename "recipes" to "Tips and Tricks", pull "External Editors" out of it into its own page, and redirect old recipes link to tips-and-tricks * Revert broken mkdocs-redirects usage from last commit * Update changelog [ci skip] * Add --co alias for --config-override (#1397) * Add hash as a default tag symbol (#1398) * Update changelog [ci skip] * Increment version to v2.8.4-beta2 * Update changelog [ci skip] * Increment version to v2.8.4 * Update changelog [ci skip] * Bump pytest from 6.2.5 to 7.0.0 (#1407) Bumps [pytest](https://github.com/pytest-dev/pytest) from 6.2.5 to 7.0.0. - [Release notes](https://github.com/pytest-dev/pytest/releases) - [Changelog](https://github.com/pytest-dev/pytest/blob/main/CHANGELOG.rst) - [Commits](https://github.com/pytest-dev/pytest/compare/6.2.5...7.0.0) --- updated-dependencies: - dependency-name: pytest dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Update changelog [ci skip] * Drop support for Python 3.7 and 3.8 (#1412) * Remove Python 3.7 and 3.8 from github actions workflows * Update lockfile after running poetry update a couple times * Update poetry lock * Remove Python 3.7 and 3.8 from pyproject.toml and run poetry lock * Update changelog [ci skip] * Tidy up git ignore (#1414) * cleaned gitignore and add comments * removed colon for readbility * alphabetize files in sections Co-authored-by: nelnog <nel.nogales@gmail.com> * fix behavior that was confusing pytest * update test to match new message * whitespace change * clean up error for manually stopping the inline editor * udpate error to use new exception handling * move some exceptions and errors to the new exception handling * add line breaks to keyboard interrupt so it looks more like other exceptions * add handling for exceptions that happen earlier in the flow * add new 'NothingToDelete' error to replace old behavior * get rid of old exception * add new exception handling to 'nothing saved to file' errors * move exception for no editor configured into new handling * move exception for no alt config to new handling * get rid of old exception handling for encrypted journal * Move error for too many wrong passwords into new handling * fix merge errors * replace sys.exit call with new exception handling * replace sys.exit call with new exception handling * replace sys.exit call with new exception handling * reformat with black * clean up old code * clean up old code * clean up linting issue * update uncaught exception for new handling * update test * fix mangled lock file Co-authored-by: Micah Jerome Ellison <micah.jerome.ellison@gmail.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Jrnl Bot <jrnl.bot@gmail.com> Co-authored-by: Nelson <35701520+nelnog@users.noreply.github.com> Co-authored-by: nelnog <nel.nogales@gmail.com>
183 lines
6.5 KiB
Gherkin
183 lines
6.5 KiB
Gherkin
Feature: Delete entries from journal
|
|
Scenario Outline: Delete flag allows deletion of single entry
|
|
Given we use the config "<config_file>"
|
|
And we use the password "test" if prompted
|
|
When we run "jrnl -1"
|
|
Then the output should contain "2020-09-24 09:14 The third entry finally"
|
|
When we run "jrnl --delete" and enter
|
|
N
|
|
N
|
|
Y
|
|
When we run "jrnl -99 --short"
|
|
Then the output should be
|
|
2020-08-29 11:11 Entry the first.
|
|
2020-08-31 14:32 A second entry in what I hope to be a long series.
|
|
|
|
Examples: Configs
|
|
| config_file |
|
|
| basic_onefile.yaml |
|
|
| basic_encrypted.yaml |
|
|
| basic_folder.yaml |
|
|
# | basic_dayone.yaml | @todo
|
|
|
|
|
|
Scenario Outline: Backing out of interactive delete does not change journal
|
|
Given we use the config "<config_file>"
|
|
When we run "jrnl --delete -n 1" and enter
|
|
N
|
|
When we run "jrnl -99 --short"
|
|
Then the output should be
|
|
2020-08-29 11:11 Entry the first.
|
|
2020-08-31 14:32 A second entry in what I hope to be a long series.
|
|
2020-09-24 09:14 The third entry finally after weeks without writing.
|
|
|
|
Examples: Configs
|
|
| config_file |
|
|
| basic_onefile.yaml |
|
|
| basic_folder.yaml |
|
|
| basic_dayone.yaml |
|
|
|
|
|
|
Scenario Outline: Delete flag with nonsense input deletes nothing (issue #932)
|
|
Given we use the config "<config_file>"
|
|
When we run "jrnl --delete asdfasdf"
|
|
Then the output should contain "No entries to delete"
|
|
When we run "jrnl -99 --short"
|
|
Then the output should be
|
|
2020-08-29 11:11 Entry the first.
|
|
2020-08-31 14:32 A second entry in what I hope to be a long series.
|
|
2020-09-24 09:14 The third entry finally after weeks without writing.
|
|
|
|
Examples: Configs
|
|
| config_file |
|
|
| basic_onefile.yaml |
|
|
| basic_folder.yaml |
|
|
| basic_dayone.yaml |
|
|
|
|
|
|
Scenario Outline: Delete flag with tag only deletes tagged entries
|
|
Given we use the config "<config_file>"
|
|
When we run "jrnl --delete @ipsum" and enter
|
|
Y
|
|
When we run "jrnl -99 --short"
|
|
Then the output should be
|
|
2020-08-31 14:32 A second entry in what I hope to be a long series.
|
|
2020-09-24 09:14 The third entry finally after weeks without writing.
|
|
|
|
Examples: Configs
|
|
| config_file |
|
|
| basic_onefile.yaml |
|
|
| basic_folder.yaml |
|
|
# | basic_dayone.yaml | @todo
|
|
|
|
|
|
Scenario Outline: Delete flag with multiple tags deletes all entries matching any of the tags
|
|
Given we use the config "<config_file>"
|
|
When we run "jrnl --delete @ipsum @tagthree" and enter
|
|
Y
|
|
Y
|
|
When we run "jrnl -99 --short"
|
|
Then the output should be
|
|
2020-08-31 14:32 A second entry in what I hope to be a long series.
|
|
|
|
Examples: Configs
|
|
| config_file |
|
|
| basic_onefile.yaml |
|
|
| basic_folder.yaml |
|
|
# | basic_dayone.yaml | @todo
|
|
|
|
|
|
Scenario Outline: Delete flag with -and deletes boolean AND of tagged entries
|
|
Given we use the config "<config_file>"
|
|
When we run "jrnl --delete -and @tagone @tagtwo" and enter
|
|
Y
|
|
When we run "jrnl -99 --short"
|
|
Then the output should be
|
|
2020-08-31 14:32 A second entry in what I hope to be a long series.
|
|
2020-09-24 09:14 The third entry finally after weeks without writing.
|
|
|
|
Examples: Configs
|
|
| config_file |
|
|
| basic_onefile.yaml |
|
|
| basic_folder.yaml |
|
|
# | basic_dayone.yaml | @todo
|
|
|
|
|
|
Scenario Outline: Delete flag with -not does not delete entries from given tag
|
|
Given we use the config "<config_file>"
|
|
When we run "jrnl --delete @tagone -not @ipsum" and enter
|
|
Y
|
|
When we run "jrnl -99 --short"
|
|
Then the output should be
|
|
2020-08-29 11:11 Entry the first.
|
|
2020-08-31 14:32 A second entry in what I hope to be a long series.
|
|
|
|
Examples: Configs
|
|
| config_file |
|
|
| basic_onefile.yaml |
|
|
| basic_folder.yaml |
|
|
# | basic_dayone.yaml | @todo
|
|
|
|
|
|
Scenario Outline: Delete flag with -from search operator only deletes entries since that date
|
|
Given we use the config "<config_file>"
|
|
When we run "jrnl --delete -from 2020-09-01" and enter
|
|
Y
|
|
When we run "jrnl -99 --short"
|
|
Then the output should be
|
|
2020-08-29 11:11 Entry the first.
|
|
2020-08-31 14:32 A second entry in what I hope to be a long series.
|
|
|
|
Examples: Configs
|
|
| config_file |
|
|
| basic_onefile.yaml |
|
|
| basic_folder.yaml |
|
|
# | basic_dayone.yaml | @todo
|
|
|
|
|
|
Scenario Outline: Delete flag with -to only deletes entries up to specified date
|
|
Given we use the config "<config_file>"
|
|
When we run "jrnl --delete -to 2020-08-31" and enter
|
|
Y
|
|
Y
|
|
When we run "jrnl -99 --short"
|
|
Then the output should be
|
|
2020-09-24 09:14 The third entry finally after weeks without writing.
|
|
|
|
Examples: Configs
|
|
| config_file |
|
|
| basic_onefile.yaml |
|
|
| basic_folder.yaml |
|
|
# | basic_dayone.yaml | @todo
|
|
|
|
|
|
Scenario Outline: Delete flag with -starred only deletes starred entries
|
|
Given we use the config "<config_file>"
|
|
When we run "jrnl --delete -starred" and enter
|
|
Y
|
|
When we run "jrnl -99 --short"
|
|
Then the output should be
|
|
2020-08-29 11:11 Entry the first.
|
|
2020-09-24 09:14 The third entry finally after weeks without writing.
|
|
|
|
Examples: Configs
|
|
| config_file |
|
|
| basic_onefile.yaml |
|
|
| basic_folder.yaml |
|
|
# | basic_dayone.yaml | @todo
|
|
|
|
|
|
Scenario Outline: Delete flag with -contains only entries containing expression
|
|
Given we use the config "<config_file>"
|
|
When we run "jrnl --delete -contains dignissim" and enter
|
|
Y
|
|
When we run "jrnl -99 --short"
|
|
Then the output should be
|
|
2020-08-31 14:32 A second entry in what I hope to be a long series.
|
|
2020-09-24 09:14 The third entry finally after weeks without writing.
|
|
|
|
Examples: Configs
|
|
| config_file |
|
|
| basic_onefile.yaml |
|
|
| basic_folder.yaml |
|
|
# | basic_dayone.yaml | @todo
|