Commit Graph

100 Commits

Author SHA1 Message Date
s.mehrbrodt@gmail.com02 c5ded493cf Merge from trunk 2013-10-22 10:42:56 +02:00
s.mehrbrodt@gmail.com02 c471fc79ba Add Songbeamer Import test 2013-10-07 00:07:49 +02:00
Raoul Snyman 316f33c058 Change the indentation back to 4 2013-10-02 23:37:00 +02:00
Raoul Snyman 1347ad61d1 Changed the way we create and initialise MediaManagerItems so that we can test things better. 2013-10-02 23:07:20 +02:00
Raoul Snyman 16c5ded747 HEAD 2013-09-29 23:25:42 +02:00
Tim Bentley 8f47af1732 Head 2013-09-26 22:06:57 +01:00
Raoul Snyman 148da97245 Update the tests to use a conditionally imported mock and cleaned things up a little. 2013-09-19 23:02:28 +02:00
Oliver Wieland f4ab0b23b8 Add a Checkbox at the Bibles settings tab to show or hide the verse numbers
bzr-revno: 2299
2013-09-17 23:06:27 +02:00
Tim Bentley 539ed55777 More cleanups 2013-09-14 22:00:58 +01:00
Jeffrey Smith 2511332a9e Fix strip_rtf to handle CJK encodings
bzr-revno: 2297
2013-09-13 17:13:12 +02:00
Oliver Wieland 00cb7b8adf fixes wrong url on the remotes tab
separates determination of the local ip address for easier testing

bzr-revno: 2295
2013-09-11 16:41:59 +02:00
Oliver Wieland 1106bca319 added blank line 2013-09-10 20:18:53 +02:00
Oliver Wieland 7d47010304 cleaning tests 2013-09-08 18:24:21 +02:00
Oliver Wieland 2aeaa24871 remotetab.py: separate get ip address for metter testing
test_remotetab.py:tests for get_ip_address
2013-09-08 18:16:18 +02:00
Jeffrey S. Smith 53ac150337 Fix strip_rtf to handle CJK encodings 2013-09-07 22:50:51 -05:00
Jeffrey S. Smith e0592a76e4 Remove worthless print statement in EasyWorhip song import test 2013-09-07 13:36:33 -05:00
Jeffrey S. Smith a23022d84f Fix EasyWorship importer and its tests for py3 2013-09-07 12:33:36 -05:00
Oliver Wieland 99a07ad91e added tests 2013-08-31 22:04:36 +02:00
Andreas Preikschat 3e1a863bae 2to3 and resources.py 2013-08-31 20:17:38 +02:00
Raoul Snyman c83dbe7f63 Fix bug #1212801 where the song edit form did not clear a previously set theme.
Fixes: https://launchpad.net/bugs/1212801
2013-08-15 21:49:51 +02:00
Philip Ridout 47ffa7c9e3 actually add test file 2013-07-23 19:23:45 +01:00
Andreas Preikschat 53d5cda91a - fixed presentation file mask
bzr-revno: 2279
2013-07-18 08:09:00 +02:00
Raoul Snyman 19c81c4192 Fix up the build_file_mask_string test.
- Fix up the build_file_mask_string test by mocking out the __init__() method of the PresentationMediaItem class
    - Change the way of calling the parent __init__() method to something slightly better (though it has nothing to do with the test)
2013-07-18 06:54:49 +02:00
Andreas Preikschat 11597d7252 missing empty line 2013-07-18 06:53:20 +02:00
Raoul Snyman cec9689dce Fix up the build_file_mask_string test.
- Fix up the build_file_mask_string test by mocking out the __init__() method of the PresentationMediaItem class
- Change the way of calling the parent __init__() method to something slightly better (though it has nothing to do with the test)
2013-07-17 23:07:52 +02:00
Andreas Preikschat b129010059 added assertion message 2013-07-17 16:28:22 +02:00
Andreas Preikschat 6e66cdefcf clean ups 2013-07-17 16:19:21 +02:00
Andreas Preikschat 4fee73fc37 added test 2013-07-17 15:59:35 +02:00
phill-ridout 9190019ce9 head 2013-07-08 06:39:32 +01:00
Philip Ridout 60d3a43c52 Adds a song importer for WorshipCenter Pro.
Also adds associated tests.

bzr-revno: 2274
2013-07-07 06:22:32 +01:00
Andreas Preikschat 0b93f752b8 fixed songs test 2013-07-06 22:17:24 +02:00
phill-ridout d1b2cd67c9 Fixed if statment logic.
Fixed test
2013-07-06 15:40:49 +01:00
phill-ridout d73664e54a Changed TestRecord ot inhearit from object 2013-07-06 15:22:30 +01:00
phill-ridout b344d6b52b changed test path to be "more" compatable with other os's 2013-07-02 22:10:28 +01:00
phill-ridout e9c56b6cc5 Corrected if statment and added enumeration class. 2013-06-28 22:16:44 +01:00
phill-ridout 95f75fa869 HEAD Resolved confilct 2013-06-27 19:59:52 +01:00
phill-ridout 6fabfef7d8 Made changes as suggested in previous merger comments 2013-06-27 09:36:00 +01:00
phill-ridout 0c8a13a087 HEAD 2013-06-27 09:30:34 +01:00
phill-ridout 63b0f54b25 HEAD 2013-06-23 07:14:03 +01:00
Patrick Zimmermann 4d8b6f669f Merge master. 2013-06-11 07:31:11 +02:00
Arjan Schrijver 24cefc7249 HEAD 2013-05-19 13:32:31 +02:00
Arjan Schrijver 255ed90d97 Change helper method to private 2013-05-19 13:31:02 +02:00
Tim Bentley 945a99ea24 Fix up merge issues 2013-05-19 08:35:07 +01:00
Arjan Schrijver dcd346c8e5 HEAD 2013-05-14 16:57:37 +02:00
Patrick Zimmermann 0557febe2b Merge trunk. 2013-04-29 20:23:06 +02:00
phill-ridout 9550405778 Fixed mock raising errors 2013-04-24 20:30:39 +01:00
phill-ridout 5512435c0c Changed then Givens, Whens and Thens arround 2013-04-24 18:37:15 +01:00
Tim Bentley 0ef65fb8d2 minor fixes 2013-04-23 20:17:25 +01:00
Tim Bentley fba86c5552 Add tests 2013-04-23 20:08:07 +01:00
phill-ridout 774cf24bfd renamed type attribute 2013-04-21 20:15:49 +01:00