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

Merge branch 'upstream_develop' into config-dir-659

Browse source
This commit is contained in:
Micah Jerome Ellison 2020-12-26 12:09:02 -08:00
commit 8fd545ac9f
77 changed files with 1555 additions and 1201 deletions
Download patch file Download diff file Expand all files Collapse all files

4
features/core.feature
View file

@ -4,13 +4,13 @@ Feature: Functionality of jrnl outside of actually handling journals
Given we use the config "simple.yaml"
When we run "jrnl --version"
Then we should get no error
Then the output should match "^jrnl version v\d+\.\d+(\.\d+)?(-(alpha|beta))?$"
Then the output should match "^jrnl version v\d+\.\d+(\.\d+)?(-(alpha|beta)\d*)?"
Scenario: Displaying the version number
Given we use the config "simple.yaml"
When we run "jrnl -v"
Then we should get no error
Then the output should match "^jrnl version v\d+\.\d+(\.\d+)?(-(alpha|beta))?$"
Then the output should match "^jrnl version v\d+\.\d+(\.\d+)?(-(alpha|beta)\d*)?"
Scenario: Running the diagnostic command
When we run "jrnl --diagnostic"

3
features/steps/core.py
View file

@ -1,3 +1,6 @@
# Copyright (C) 2012-2021 jrnl contributors
# License: https://www.gnu.org/licenses/gpl-3.0.html
import ast
from collections import defaultdict
import os

3
features/steps/export_steps.py
View file

@ -1,3 +1,6 @@
# Copyright (C) 2012-2021 jrnl contributors
# License: https://www.gnu.org/licenses/gpl-3.0.html
import json
import os
import shutil