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

Merge branch 'master' into HEAD

Browse source
This commit is contained in:
timetoplatypus 2017-09-09 10:23:17 -04:00
commit 7fefec0ca9
30 changed files with 725 additions and 70 deletions
Download patch file Download diff file Expand all files Collapse all files

9
features/regression.feature
View file

@ -70,6 +70,7 @@ Feature: Zapped bugs should stay dead.
| I'm feeling sore because I forgot to stretch.
"""
<<<<<<< HEAD
Scenario: DayOne tag searching should work with tags containing a mixture of upper and lower case.
# https://github.com/maebert/jrnl/issues/354
Given we use the config "dayone.yaml"
@ -78,3 +79,11 @@ Feature: Zapped bugs should stay dead.
"""
2013-05-17 11:39 This entry has tags!
"""
=======
Scenario: Writing an entry at the prompt with non-ascii characters
# https://github.com/maebert/jrnl/issues/295
Given we use the config "basic.json"
When we run "jrnl" and enter "Crème brûlée & Mötorhead"
Then we should get no error
and the journal should contain "Crème brûlée & Mötorhead"
>>>>>>> master