fz0x1/jrnl
1
0
Fork 0
mirror of https://github.com/jrnl-org/jrnl.git synced 2025-07-03 23:16:14 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Manually resolve merge conficts

Browse source
This commit is contained in:
MinchinWeb 2021-05-09 14:02:36 -06:00
commit c8ca3a0358
12 changed files with 190 additions and 146 deletions
Download patch file Download diff file Expand all files Collapse all files

48
features/plugins.feature
View file

@ -10,18 +10,18 @@ Feature: Functionality of Importer and Exporter Plugins
Examples:
| plugin_name | version | source | type | filename |
| jrnl | v2.7.2-beta | plugins | importer | jrnl |
| boxed | v2.7.2-beta | plugins | exporter | fancy |
| dates | v2.7.2-beta | plugins | exporter | dates |
| fancy | v2.7.2-beta | plugins | exporter | fancy |
| json | v2.7.2-beta | plugins | exporter | json |
| markdown | v2.7.2-beta | plugins | exporter | markdown |
| md | v2.7.2-beta | plugins | exporter | markdown |
| tags | v2.7.2-beta | plugins | exporter | tag |
| text | v2.7.2-beta | plugins | exporter | text |
| txt | v2.7.2-beta | plugins | exporter | text |
| xml | v2.7.2-beta | plugins | exporter | xml |
| yaml | v2.7.2-beta | plugins | exporter | yaml |
| jrnl | v.2.8.1 | plugins | importer | jrnl |
| boxed | v.2.8.1 | plugins | exporter | fancy |
| dates | v.2.8.1 | plugins | exporter | dates |
| fancy | v.2.8.1 | plugins | exporter | fancy |
| json | v.2.8.1 | plugins | exporter | json |
| markdown | v.2.8.1 | plugins | exporter | markdown |
| md | v.2.8.1 | plugins | exporter | markdown |
| tags | v.2.8.1 | plugins | exporter | tag |
| text | v.2.8.1 | plugins | exporter | text |
| txt | v.2.8.1 | plugins | exporter | text |
| xml | v.2.8.1 | plugins | exporter | xml |
| yaml | v.2.8.1 | plugins | exporter | yaml |
@skip_only_with_external_plugins
Scenario Outline: List external plugin names in --version
@ -31,19 +31,19 @@ Feature: Functionality of Importer and Exporter Plugins
And The output should contain "<plugin_name> : <version> from jrnl.<source>.<type>.<filename>"
Examples:
| plugin_name | version | source | type | filename |
| jrnl | v2.7.2-beta | plugins | importer | jrnl |
| jrnl | v.2.8.1 | plugins | importer | jrnl |
| json | v1.0.0 | contrib | importer | json |
| boxed | v2.7.2-beta | plugins | exporter | fancy |
| dates | v2.7.2-beta | plugins | exporter | dates |
| fancy | v2.7.2-beta | plugins | exporter | fancy |
| boxed | v.2.8.1 | plugins | exporter | fancy |
| dates | v.2.8.1 | plugins | exporter | dates |
| fancy | v.2.8.1 | plugins | exporter | fancy |
| json | v1.0.0 | contrib | exporter | json |
| markdown | v2.7.2-beta | plugins | exporter | markdown |
| md | v2.7.2-beta | plugins | exporter | markdown |
| tags | v2.7.2-beta | plugins | exporter | tag |
| text | v2.7.2-beta | plugins | exporter | text |
| markdown | v.2.8.1 | plugins | exporter | markdown |
| md | v.2.8.1 | plugins | exporter | markdown |
| tags | v.2.8.1 | plugins | exporter | tag |
| text | v.2.8.1 | plugins | exporter | text |
| txt | v1.0.0 | contrib | exporter | rot13 |
| xml | v2.7.2-beta | plugins | exporter | xml |
| yaml | v2.7.2-beta | plugins | exporter | yaml |
| xml | v.2.8.1 | plugins | exporter | xml |
| yaml | v.2.8.1 | plugins | exporter | yaml |
| rot13 | v1.0.0 | contrib | exporter | rot13 |
| testing | v0.0.1 | contrib | exporter | testing |
@ -56,5 +56,5 @@ Feature: Functionality of Importer and Exporter Plugins
Examples:
| plugin_name | version | source | type | filename |
| json | v2.7.2-beta | plugins | exporter | json |
| txt | v2.7.2-beta | plugins | exporter | text |
| json | v.2.8.1 | plugins | exporter | json |
| txt | v.2.8.1 | plugins | exporter | text |