Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix all skipped tests on Travis Windows builds by preserving newlines #823

Merged
merged 3 commits into from
Jan 26, 2020
Merged

Fix all skipped tests on Travis Windows builds by preserving newlines #823

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9f61519
Prevent Travis from turning LF to CRLF in Windows
micahellison Jan 25, 2020
25a7577
Remove all skip_win directives now that Travis is not mangling newlin…
micahellison Jan 25, 2020
9cc8539
Keep skip_win directive for empty entry test that still stalls on Travis
micahellison Jan 25, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ cache:

git:
depth: false
autocrlf: false

before_install:
- date
Expand Down
1 change: 0 additions & 1 deletion features/dayone_regressions.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ Feature: Zapped Dayone bugs stay dead!
| I'm feeling sore because I forgot to stretch.
"""

@skip_win
Scenario: Opening an folder that's not a DayOne folder gives a nice error message
Given we use the config "empty_folder.yaml"
When we run "jrnl Herro"
Expand Down
3 changes: 0 additions & 3 deletions features/encryption.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
Then we should see the message "Journal decrypted"
And the journal should have 2 entries

@skip_win
Scenario: Encrypting a journal
Given we use the config "basic.yaml"
When we run "jrnl --encrypt" and enter
Expand All @@ -27,7 +26,6 @@
Then the output should contain "Password"
And the output should contain "2013-06-10 15:40 Life is good"

@skip_win
Scenario: Mistyping your password
Given we use the config "basic.yaml"
When we run "jrnl --encrypt" and enter
Expand All @@ -45,7 +43,6 @@
Then the output should contain "Password"
And the output should contain "2013-06-10 15:40 Life is good"

@skip_win
Scenario: Storing a password in Keychain
Given we use the config "multiple.yaml"
When we run "jrnl simple --encrypt" and enter
Expand Down
3 changes: 0 additions & 3 deletions features/upgrade.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
Feature: Upgrading Journals from 1.x.x to 2.x.x

@skip_win
Scenario: Upgrade and parse journals with square brackets
Given we use the config "upgrade_from_195.json"
When we run "jrnl -9" and enter "Y"
Expand All @@ -12,7 +11,6 @@ Feature: Upgrading Journals from 1.x.x to 2.x.x
"""
Then the journal should have 2 entries

@skip_win
Scenario: Upgrading a journal encrypted with jrnl 1.x
Given we use the config "encrypted_old.json"
When we run "jrnl -n 1" and enter
Expand All @@ -24,7 +22,6 @@ Feature: Upgrading Journals from 1.x.x to 2.x.x
Then the output should contain "Password"
and the output should contain "2013-06-10 15:40 Life is good"

@skip_win
Scenario: Upgrade and parse journals with little endian date format
Given we use the config "upgrade_from_195_little_endian_dates.json"
When we run "jrnl -9" and enter "Y"
Expand Down