Samuel Mehrbrodt
7e484086dc
Merge trunk
2013-12-07 18:35:06 +01:00
Philip Ridout
0883eb8a5d
Fixes #1184869 Ensures that there is text in the anchor tag
...
bzr-revno: 2315
2013-12-06 18:57:21 +00:00
Felipe Polo-Wood
e9848a2653
Fix the Http router return values
...
bzr-revno: 2313
2013-12-01 20:58:09 +00:00
Philip Ridout
f5573502f3
HEAD
2013-11-16 21:24:18 +00:00
Philip Ridout
875fa00b03
Adds song test helper and fixes up SongShowPlus
...
bzr-revno: 2312
2013-11-16 19:58:44 +00:00
Philip Ridout
96e1bb15fc
Fix doc strings
2013-11-16 10:54:24 +00:00
Philip Ridout
20ae5d13b0
some final cleanups
2013-11-16 10:16:06 +00:00
Philip Ridout
4c8f817269
HEAD
2013-11-16 10:07:38 +00:00
Philip Ridout
cc3cdf7126
added some tests for PresentationController
2013-11-16 10:05:41 +00:00
Felipe Polo-Wood
e56414e22c
Fixed OS specific string
...
Coding standard fixes
2013-11-14 15:33:46 -05:00
Samuel Mehrbrodt
dd1d08749e
Fix SongBeamer Import and add Testcase
...
bzr-revno: 2311
2013-11-14 21:12:52 +02:00
Felipe Polo-Wood
649494589a
Added unit tests for serve_file
2013-11-10 19:55:06 -05:00
Felipe Polo-Wood
20a1a2ad70
Fixed router so response and headers are sent correctly
...
Fixed tests so they run on Windows
Added unit test for new method get_content_type
2013-11-08 13:26:27 -05:00
Philip Ridout
47292d3ec7
Changed test path
2013-11-07 20:42:21 +00:00
Philip Ridout
2535bda1bb
Added tests for load presentation
2013-11-07 20:33:55 +00:00
Samuel Mehrbrodt
0ed0b2148e
Small changes to the test
2013-10-27 21:33:58 +01:00
Samuel Mehrbrodt
abdc3937ef
Small test for PresentationController Constructor
2013-10-27 13:39:13 +01:00
Samuel Mehrbrodt
f74697a987
Try to fix encoding...
2013-10-26 19:31:35 +02:00
Samuel Mehrbrodt
636dead5c3
Fix vim header (textwidth=120)
2013-10-26 19:25:07 +02:00
Samuel Mehrbrodt
24dba52640
Fix Import, use system-independent path
2013-10-22 17:09:10 +02:00
s.mehrbrodt@gmail.com02
c5ded493cf
Merge from trunk
2013-10-22 10:42:56 +02:00
Tim Bentley
63685cb29e
Move Settings and translate
2013-10-13 21:36:42 +01:00
Tim Bentley
a82c64237c
Fix move of check_directory_exists
2013-10-13 18:23:52 +01:00
Tim Bentley
a013d17bdd
fix tests and add basic test
2013-10-13 18:02:12 +01:00
Tim Bentley
257fba8548
Start theme clean up
2013-10-13 14:51:13 +01:00
Philip Ridout
b5831c2f38
Moved song file import helper
2013-10-10 20:58:52 +01:00
s.mehrbrodt@gmail.com02
c471fc79ba
Add Songbeamer Import test
2013-10-07 00:07:49 +02:00
Philip Ridout
beeea8ab9a
changed line spacing arround imports
2013-10-05 10:16:04 +01:00
Philip Ridout
b5a2ecfa3f
Fixed up imports and added Copyright/License header.
2013-10-05 08:56:08 +01:00
Philip Ridout
3b9df96b42
HEAD
2013-10-05 08:54:14 +01:00
316f33c058
Change the indentation back to 4
2013-10-02 23:37:00 +02:00
1347ad61d1
Changed the way we create and initialise MediaManagerItems so that we can test things better.
2013-10-02 23:07:20 +02:00
16c5ded747
HEAD
2013-09-29 23:25:42 +02:00
Tim Bentley
8f47af1732
Head
2013-09-26 22:06:57 +01:00
Philip Ridout
e8302e9e95
Added test for bug 1184869
2013-09-24 21:40:51 +01:00
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
Philip Ridout
91bb04f03a
Changed to using super()
2013-09-17 21:31:19 +01:00
Philip Ridout
ca3e32c294
Fix for py3
2013-09-14 22:43:46 +01:00
Tim Bentley
539ed55777
More cleanups
2013-09-14 22:00:58 +01:00
Philip Ridout
78e5ad4af7
HEAD
2013-09-14 00:33:21 +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
Philip Ridout
bc30365e0e
Missed a py2 file
2013-09-07 17:02:28 +00:00
Philip Ridout
dc9d3cd74e
changed test_songshowplusimport.py to py3
2013-09-07 16:55:09 +00:00
Philip Ridout
3f4bb93500
HEAD
2013-09-07 16:43:40 +00: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
Philip Ridout
bd6c2bea42
Added a helper class for song importers and modified the shongshowplus test to use it
2013-08-29 21:04:23 +00:00
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
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