Commit Graph

82 Commits

Author SHA1 Message Date
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
Andreas Preikschat 582f1aa003 code standards 2013-04-19 21:07:25 +02:00
Patrick Zimmermann 9e53873a66 Merge trunk. 2013-04-18 20:22:53 +02:00
Arjan Schrijver 9752716672 HEAD 2013-04-18 15:57:31 +02:00
phill-ridout 09955c0ca2 Moved constants. 2013-04-17 22:10:19 +01:00
phill-ridout cc1d3b3c5b finished tests 2013-04-16 18:06:42 +01:00
Patrick Zimmermann 0840480ef2 Merge trunk. 2013-04-15 23:56:56 +02:00
phill-ridout 042a3e33f5 some more tests 2013-04-15 21:30:32 +01:00
phill-ridout 6e688961d0 Removed logError from file import test as it was not needed.
Added check to see that addVerse has been called the correct ammount of times
2013-04-15 17:35:36 +01:00
phill-ridout 4d20ced421 Added logger class with help from mohij. 2013-04-14 21:10:08 +01:00
phill-ridout f5213d315d Commented out failing test 2013-04-14 20:16:31 +01:00
Tim Bentley 797a76f095 Head 2013-04-14 16:45:34 +01:00
phill-ridout 5aee3198ae Added WorshipCenter Pro song importer.
Also added associated tests.
2013-04-13 23:01:36 +01:00
phill-ridout a307824d85 Moved some directories about.
Added test files
2013-04-10 17:24:53 +01:00
Tim Bentley 31b4e561b4 Fix up code review change 2013-04-08 17:53:11 +01:00
Patrick Zimmermann 974e238850 Merge trunk. 2013-04-06 12:20:17 +02:00
Tim Bentley fc80e3d106 Cleanups and more tests 2013-04-05 20:37:15 +01:00
phill-ridout 8a88cec855 Removed the use of the mock's call helper object 2013-04-05 19:26:39 +01:00
phill-ridout 8864e1e51b Missed a few GIVEN, WHEN, THENS 2013-03-31 11:55:58 +01:00