Commit graph

74 commits

Author SHA1 Message Date
Micah Ellison
da30eaa62f Apply Black linting 2020-02-29 14:03:54 -08:00
Micah Ellison
8a4fe0ec81 Fix FolderJournal path tests for Windows paths 2020-02-29 13:29:19 -08:00
Jonathan Wren
97cf65e516
Merge branch 'develop' into v2.5 2020-02-08 14:29:10 -08:00
Stav Shamir
630a8fcaec
Add test scenarios for the export feature (#824)
* Fix behave keyword "and" to correct case "And"
* Extract export_steps module
* Add scenario for XML export
* Add scenario for tags export
* Add scenario for fancy export
* Add scenario for yaml export
* Remove unused module export.py
* Run `make format`
* Fix `create_directory` step
2020-02-08 12:18:01 -08:00
Jonathan Wren
06970f3911
run black to get codebase into good base state 2020-01-04 12:12:00 -08:00
Jonathan Wren
e984a9a015
Merge branch 'develop' into black 2019-12-21 12:11:05 -08:00
Jonathan Wren
07a633ae51
(#770) run black formatter on codebase for standardization 2019-12-21 11:47:02 -08:00
MinchinWeb
e7cbbecaef [Black] sync to develop branch and apply black
# Conflicts:
#	jrnl/EncryptedJournal.py
#	jrnl/Journal.py
#	jrnl/__init__.py
#	jrnl/cli.py
#	jrnl/install.py
2019-12-14 13:48:17 -07:00
MinchinWeb
d8f422151d Apply black formatter to code 2019-12-07 12:32:55 -07:00
Jonathan Wren
abb81acedb
Merge pull request #706 from pspeter/password-confirmation
🛠 Add password confirmation when encrypting journals
2019-11-29 06:42:38 -08:00
MinchinWeb
cdad3230f0 [Travis] include a test in not UTC
see #742
2019-11-28 08:35:53 -07:00
Jonathan Wren
a529b70614 Squashed commit of the following:
commit 75113187432939a51486422c3f70b3a9e2bcf0aa
Merge: 74d1854 47e10fb
Author: Jonathan Wren <9453067+wren@users.noreply.github.com>
Date:   Thu Oct 24 17:02:10 2019 -0700

    Merge pull request #665 from notbalanced/issue_662

    Fixes Issue #662 - Day names not treated consistently for new entry

commit 74d1854a4bba468221b4eee254bdee2bb40f5d5a
Merge: 1bbf074 6a5726a
Author: Jonathan Wren <9453067+wren@users.noreply.github.com>
Date:   Sat Oct 5 15:30:57 2019 -0700

    Merge pull request #418 from philipsd6/2.0-fancy_exporter

    Add exporter to output entries inside unicode box character boxes

commit 47e10fbee7
Author: Craig Moyer <craig.moyer@gmail.com>
Date:   Sun Sep 29 19:06:53 2019 -0400

    Fix issue #662 to properly handle day names as new entry dates and
    command line (-on, -from, -to).

commit 9588913100
Author: Craig Moyer <craig.moyer@gmail.com>
Date:   Sun Sep 29 08:27:27 2019 -0400

    Syncing with jrnl-org/master

commit 4c68eb193d
Merge: 81dfebb 1bbf074
Author: Craig Moyer <craig.moyer@gmail.com>
Date:   Sun Sep 29 07:52:02 2019 -0400

    Merge remote-tracking branch 'upstream/master' into 2.0-rc1-maebert

commit 81dfebb2c0
Author: Manuel Ebert <manuel@1450.me>
Date:   Mon Apr 29 20:34:18 2019 +0200

    export changes

commit 6a5726acd2
Author: Philip Douglass <philip@philipdouglass.com>
Date:   Fri Dec 22 20:56:36 2017 -0500

    Enable FancyExporter plugin

commit 3d1b226871
Author: Philip Douglass <philip@philipdouglass.com>
Date:   Fri Jan 29 11:17:41 2016 -0500

    Add exporter to output entries inside unicode box character boxes
2019-11-25 20:29:34 -08:00
Peter Schmidbauer
e925fe22f9 Add password confirmation dialog 2019-11-19 14:24:36 +01:00
Aaron Lichtman
7fbb5db5e7
Fix no stdin input test 2019-11-18 15:34:31 +01:00
Aaron Lichtman
9701401946
Fix test? 2019-11-18 14:51:41 +01:00
Aaron Lichtman
0aee900ffc
Fix test? 2019-11-17 01:54:49 +01:00
Aaron Lichtman
fce60a364f
Remove extra debug line 2019-11-17 01:49:58 +01:00
Aaron Lichtman
455261c55e
Add test for empty stdin input 2019-11-17 01:49:46 +01:00
Aaron Lichtman
59a6aa3cfd
Remove extraneous code 2019-11-16 14:54:03 +01:00
Aaron Lichtman
b1c7deb9b9
Clean up debug statements 2019-11-16 14:52:19 +01:00
Aaron Lichtman
bca12b4b16
Fix test? 2019-11-16 14:46:34 +01:00
Aaron Lichtman
c23efa7f80
Fix test? 2019-11-16 14:42:39 +01:00
Aaron Lichtman
8d22283b93
Update features/steps/core.py
Co-Authored-By: pspeter <peter.schmidb@gmail.com>
2019-11-16 14:35:50 +01:00
Aaron Lichtman
7dcc91431e
Add debug statements 2019-11-16 14:16:36 +01:00
Aaron Lichtman
e63ae25433
Add return from mock function 2019-11-16 14:07:39 +01:00
Aaron Lichtman
68772d3afe
Update features/steps/core.py
Co-Authored-By: pspeter <peter.schmidb@gmail.com>
2019-11-16 13:51:55 +01:00
Aaron Lichtman
9b0ebb7d84
Add _mock_editor_function 2019-11-16 13:42:30 +01:00
Aaron Lichtman
ccb55392dd
Check message on stderr and patch subprocess.call 2019-11-16 13:18:14 +01:00
Aaron Lichtman
c0a1c171f1
Fix check_empty_output method 2019-11-16 13:06:04 +01:00
Aaron Lichtman
ac21a4facb
Merge branch 'master' into exit-after-no-text-entry 2019-11-15 09:34:50 +01:00
Aaron Lichtman
f0e5fe9653
Use native mocking 2019-11-15 09:33:47 +01:00
Aaron Lichtman
7a90f4076d
Add test for aborting jrnl entry from editor 2019-11-15 09:27:01 +01:00
Peter Schmidbauer
34f8f858f1 remove py2 remnants and use mocks in tests 2019-10-31 21:16:19 +01:00
Craig Moyer
866634035a Fix failed test scenarios for folder journal. 2019-09-23 17:20:07 -04:00
notbalanced
f4e40fc43d
Merge branch 'master' into issue-170 2019-09-22 20:50:34 -04:00
Jonathan Wren
bcfd2d4b43 Fix issue #584 YAMLLoadWarning (#585) 2019-04-14 09:47:31 -07:00
Craig Moyer
cefc2db8b7 Add support for folder base journal.
Adds feature for issue #170 (and #398) where you configure your journal to
be a directory and entries are added as sub-directories and files:
yyyy/mm/dd.txt. Multiple entries in a day will go in the same file, but a
new entry for a specific day will create a new file (and directory
structure).
2017-01-13 19:55:41 -05:00
Manuel Ebert
4b3dc38e05 Template exporting FTW 2016-08-19 23:20:31 +00:00
Manuel Ebert
b3f5c092de Fix Keyring tests 2016-08-19 21:43:27 +00:00
Manuel Ebert
ea6060d75c Fix that goddamn timezone test 2015-04-21 16:34:27 +02:00
Manuel Ebert
eb0af8f47c Fix for #322 2015-04-21 15:49:27 +02:00
Manuel Ebert
bdfe588a01 Fix test arg parsing 2015-04-20 14:12:34 +02:00
Manuel Ebert
b41b5d3376 Tests for parsing issue fix 2015-04-05 18:38:37 +02:00
Manuel Ebert
c720c15787 More encoding madness 2015-04-05 06:38:38 +04:00
Manuel Ebert
f459dd5bc2 Tests for #333 2015-04-05 03:27:09 +04:00
Manuel Ebert
dd79639095 Hardcoded salt to fix crypto 2015-04-04 17:50:44 +11:00
Manuel Ebert
359eabd56d Work on cryptography 2014-09-27 13:15:46 -07:00
Manuel Ebert
be009b08b4 Converts tests to YAML 2014-09-12 15:28:12 -07:00
Matthias Vogelgesang
044accff6d Fix failing behave tests 2014-09-12 14:27:34 -07:00
Manuel Ebert
cbab596b43 Fixes config tests 2014-09-12 14:22:45 -07:00