diff --git a/features/config_file.feature b/features/config_file.feature deleted file mode 100644 index 6ef6c1b6..00000000 --- a/features/config_file.feature +++ /dev/null @@ -1,60 +0,0 @@ -Feature: Multiple journals - - Scenario: Loading an alternate config with two journals - Given we use the config "multiple.yaml" - When we run "jrnl --cf features/data/configs/alternate.yaml" - Then journal "default" should have 2 entries - And journal "work" should have 0 entries - - Scenario: Write to default journal by default using an alternate config - Given we use the config "multiple.yaml" - When we run "jrnl --cf features/data/configs/alternate.yaml this goes to default" - Then journal "default" should have 3 entries - And journal "work" should have 0 entries - - Scenario: Write to specified journal using an alternate config - Given we use the config "multiple.yaml" - When we run "jrnl work --cf features/data/configs/alternate.yaml a long day in the office" - Then journal "default" should have 2 entries - And journal "work" should have 1 entry - - Scenario: Tell user which journal was used using an alternate config - Given we use the config "multiple.yaml" - When we run "jrnl --cf features/data/configs/alternate.yaml work a long day in the office" - Then we should see the message "Entry added to work journal" - - Scenario: Write to specified journal with a timestamp using an alternate config - Given we use the config "multiple.yaml" - When we run "jrnl work --cf features/data/configs/alternate.yaml 23 july 2012: a long day in the office" - Then journal "default" should have 2 entries - And journal "work" should have 1 entry - And journal "work" should contain "2012-07-23" - - Scenario: Write to specified journal without a timestamp but with colon using an alternate config - Given we use the config "multiple.yaml" - When we run "jrnl work --cf features/data/configs/alternate.yaml : a long day in the office" - Then journal "default" should have 2 entries - And journal "work" should have 1 entry - And journal "work" should contain "a long day in the office" - - Scenario: Create new journals as required using an alternate config - Given we use the config "multiple.yaml" - Then journal "ideas" should not exist - When we run "jrnl ideas --cf features/data/configs/alternate.yaml 23 july 2012: sell my junk on ebay and make lots of money" - Then journal "ideas" should have 1 entry - - Scenario: Don't crash if no default journal is specified using an alternate config - Given we use the config "multiple.yaml" - When we run "jrnl --cf features/data/configs/bug343.yaml a long day in the office" - Then we should see the message "No default journal configured" - - Scenario: Don't crash if no file exists for a configured encrypted journal using an alternate config - Given we use the config "multiple.yaml" - When we run "jrnl new_encrypted --cf features/data/configs/alternate.yaml Adding first entry" and enter - """ - these three eyes - these three eyes - n - """ - Then we should see the message "Encrypted journal 'new_encrypted' created" - diff --git a/features/data/configs/alternate.yaml b/features/data/configs/alternate.yaml deleted file mode 100644 index 65f2c256..00000000 --- a/features/data/configs/alternate.yaml +++ /dev/null @@ -1,18 +0,0 @@ -default_hour: 9 -default_minute: 0 -editor: '' -encrypt: false -highlight: true -template: false -journals: - default: features/journals/simple.journal - ideas: features/journals/nothing.journal - simple: features/journals/simple.journal - work: features/journals/work.journal - new_encrypted: - encrypt: true - journal: features/journals/new_encrypted.journal -linewrap: 80 -tagsymbols: '@' -timeformat: '%Y-%m-%d %H:%M' -indent_character: "|" diff --git a/features/data/configs/work-config.yaml b/features/data/configs/work-config.yaml deleted file mode 100644 index c60cae5a..00000000 --- a/features/data/configs/work-config.yaml +++ /dev/null @@ -1,13 +0,0 @@ -default_hour: 9 -default_hour: 9 -default_minute: 0 -editor: noop -template: false -encrypt: false -highlight: true -journals: - default: features/journals/work -linewrap: 80 -tagsymbols: '@' -timeformat: '%Y-%m-%d %H:%M' -indent_character: "|"