Commit Graph

617 Commits

Author SHA1 Message Date
Philip Ridout
ec87ced59b Fixes Bug 1209515 by sub classing QFileDialog and reimplementing getOpenFileNames and attempting to urlunquote and file paths which do not exist
bzr-revno: 2314
2013-12-06 18:56:03 +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
81c2f1a4b3 updated tests 2013-11-16 21:04:16 +00:00
Philip Ridout
c41842125d HEAD 2013-11-16 20:32:50 +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
Dmitriy Marmyshev
70144c0da4 Trunk & fixes 2013-10-27 02:53:32 +04:00
Andreas Preikschat
6a839dc32a no need for MagicMock (inside another MagicMock)
bzr-revno: 2308
2013-10-26 21:03:57 +02: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
Dmitriy Marmyshev
aed25c0f0b fixes 2013-10-25 00:24:58 +04:00
Dmitriy Marmyshev
77f1878ff5 Tests for transparency 2013-10-24 22:12:41 +04:00
Tim Bentley
63d65da6c1 Head 2013-10-23 20:26:03 +01:00
Tim Bentley
b1873016c9 Move and tests 2013-10-23 20:25:46 +01:00
Tim Bentley
1022661160 Theme cleanup start and major class restructure
bzr-revno: 2307
2013-10-23 19:49:39 +01: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
Andreas Preikschat
ea8497d559 no need for MagicMock 2013-10-21 09:38:18 +02:00
Tim Bentley
28a94a06fb Duplicate line 2013-10-18 19:11:17 +01:00
Tim Bentley
ba0808f551 Fix up json 2013-10-18 19:10:47 +01:00
Tim Bentley
4f3291b2ee Fixes to tests 2013-10-14 06:01:01 +01: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
b860abb23b fix fields 2013-10-13 16:52:04 +01:00
Tim Bentley
257fba8548 Start theme clean up 2013-10-13 14:51:13 +01:00
Dmitriy Marmyshev
3c246f2d2e some start 2013-10-11 19:48:14 +04:00
Andreas Preikschat
29bdf095d3 removed import 2013-10-11 12:15:09 +02:00
Andreas Preikschat
2b3825eaf0 missing imports 2013-10-11 12:13:04 +02:00
Andreas Preikschat
f0be2ecc17 head + conflict 2013-10-11 11:48:35 +02: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
Jeffrey Smith
474f551839 Clean up language tests
bzr-revno: 2303
2013-10-05 06:24:05 +01:00
Jeffrey S. Smith
cf9ddadf35 Missed removing one line when merging 2013-10-04 16:44:58 -05:00
Jeffrey S. Smith
ba6ff95539 Merged mock changes 2013-10-04 16:14:04 -05:00
Tim Bentley
40350aec0f tests updates 2013-10-04 21:36:02 +01:00
Tim Bentley
bd7d412cc9 Head 2013-10-04 20:28:09 +01:00
Tim Bentley
2fe31991e2 Fixes 2013-10-04 20:27:53 +01:00
3994669c1b Modified the check_dependencies.py script to only require mock if we're using Python 3.2 and earlier. 2013-10-03 21:56:12 +02: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
3503c54ce4 Some bugs and minor tweaks. 2013-09-29 23:28:53 +02:00
16c5ded747 HEAD 2013-09-29 23:25:42 +02:00
c30eedda08 Some more updates to some of the tests. 2013-09-29 23:21:47 +02:00
Tim Bentley
c240068a6e head 2013-09-28 21:55:42 +01: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
1215494303 Updated more tests 2013-09-22 23:11:03 +02:00
Raoul Snyman
188f312669 Ooops. 2013-09-20 11:35:50 +02: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
52781b9628 more Py3 fixes 2013-09-15 20:42:29 +01:00
Philip Ridout
a06469fea0 head 2013-09-15 19:36:58 +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 S. Smith
1ac75c85fd Handle tests with platform-dependent behavior carefully 2013-09-13 14:23:31 -05:00
Jeffrey Smith
2511332a9e Fix strip_rtf to handle CJK encodings
bzr-revno: 2297
2013-09-13 17:13:12 +02:00
Jeffrey Smith
1ef5d00d45 Fix various tests and broken code revealed by tests.
bzr-revno: 2296
2013-09-13 17:11:27 +02:00
Jeffrey S. Smith
cb62bf5936 Need a different approach for platform-specific tests 2013-09-11 10:09:36 -05:00
Andreas Preikschat
ffe0ccb625 clean up 2013-09-11 17:08:08 +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
Andreas Preikschat
f1009fbc18 blank 2013-09-11 16:23:32 +02:00
Andreas Preikschat
4999ecb6e6 last test 2013-09-11 16:22:28 +02:00
Andreas Preikschat
1ca117532f more tests 2013-09-11 16:02:17 +02:00
Andreas Preikschat
f24f3a751f more tests 2013-09-11 15:51:49 +02:00
Andreas Preikschat
bf023ee20d more tests 2013-09-11 15:30:23 +02:00
Andreas Preikschat
0677e389c1 doc 2013-09-11 15:00:34 +02:00
Oliver Wieland
1106bca319 added blank line 2013-09-10 20:18:53 +02:00
Jeffrey S. Smith
334cef478d Fix various tests and broken code revealed by tests 2013-09-09 16:10:40 -05: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
Andreas Preikschat
a5b517fbf0 started to write tests 2013-09-08 12:30:14 +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
Tim Bentley
e98657d704 Fix up controller tests 2013-09-02 21:59:19 +01:00
Tim Bentley
8ab834c18e Fix up save and load# 2013-09-01 21:43:22 +01:00
Tim Bentley
6c2c5e8e80 to python 3 2013-09-01 07:31:09 +01:00
Tim Bentley
d55ac01a1a Tests and fixed again 2013-09-01 07:22:06 +01:00
Tim Bentley
6282b4fcb6 Tests and fixed 2013-09-01 07:21:29 +01:00
Tim Bentley
ede6adeb48 Tests added 2013-09-01 07:16:27 +01: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
Tim Bentley
e4ba5cb72a add test files and ui validation sort of works 2013-08-31 18:20:43 +01:00
Andreas Preikschat
ccf5d6535b head 2013-08-31 17:23:46 +02:00
Tim Bentley
aebe2d80df Remove last traces of pickle and clean up the tests
bzr-revno: 2289
2013-08-31 12:40:59 +01: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
Tim Bentley
ba111776ed Remove pickle from the code now 2.0.2 is in 2013-08-25 19:31:15 +01:00
Philip Ridout
49c9663dcf renamed var, removed some uneeded ()'s 2013-08-22 20:20:02 +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
364fde73c5 Fix #120515 by reimplementing QFileDialog.getOpenFileNames 2013-08-13 19:02:04 +01:00
Andreas Preikschat
4cb4a8f261 head 2013-07-31 19:36:06 +02:00
Philip Ridout
47ffa7c9e3 actually add test file 2013-07-23 19:23:45 +01:00
Andreas Preikschat
5c13035172 fixed tests 2013-07-18 20:56:15 +02:00
Andreas Preikschat
c4ead1185a head 2013-07-18 08:09:19 +02: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
55fbe75695 'fixed' tests 2013-07-17 16:38:14 +02:00
Andreas Preikschat
161a1db12d fixed test 2013-07-17 16:32:29 +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
Andreas Preikschat
ad715fec29 try to use locale.strxfrm 2013-07-15 20:02:54 +02:00
Andreas Preikschat
3a021b6804 Head 2013-07-09 21:47:12 +02:00
phill-ridout
9190019ce9 head 2013-07-08 06:39:32 +01:00
Tomas Groth
de0f5c912f Use json as services format instead of python pickle.
bzr-revno: 2275
2013-07-07 17:53:16 +02:00
Andreas Preikschat
1ce72c3674 head 2013-07-07 15:45:40 +02: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
dec7cc64b3 head 2013-07-07 00:20:17 +02: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
15153ace9c HEAD 2013-07-06 15:27:11 +01:00
phill-ridout
b26793db1f HEAD 2013-07-06 15:23:30 +01:00
phill-ridout
d73664e54a Changed TestRecord ot inhearit from object 2013-07-06 15:22:30 +01:00
Tomas Groth
4e1868983e Merged trunk into branch. 2013-07-06 12:27:08 +02:00
Andreas Preikschat
f23aafae46 head 2013-07-05 20:47:32 +02:00
Tomas Groth
3218a2e5df Fixed the use of the patch context manager. 2013-07-05 18:21:16 +02:00
Raoul Snyman
cee5132b86 Removed a remnant of Tim's test 2013-07-05 09:47:09 +02:00
8ddca0be2b HEAD 2013-07-04 21:15:24 +02:00
Andreas Preikschat
b314b59b52 r2266 2013-07-04 08:41:31 +02:00
Andreas Preikschat
e75a87c5c9 head 2013-07-03 19:03:08 +02:00
Tim Bentley
ab3fd38551 Fix broken test 2013-07-03 17:34:40 +01:00
Tim Bentley
538e885cfb Fix broken test 2013-07-03 17:34:02 +01:00
phill-ridout
b344d6b52b changed test path to be "more" compatable with other os's 2013-07-02 22:10:28 +01:00
2e4b400cbc Removed a test that seemed in the wrong place, testing the wrong things, and committed at the wrong time. 2013-07-02 22:39:39 +02:00
88e1932097 HEAD 2013-07-02 22:28:06 +02:00
8492ae6a4c Fix a bug in SQLAlchemy 0.8 2013-07-02 22:27:28 +02: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
Tomas Groth
3faec43220 Small fix in the osd2osj test, use just one context manager, and in a better way. Also added test for service item validation. 2013-06-26 22:15:30 +02:00
Tomas Groth
be84d53478 Inserted GIVEN-WHEN-THEN comments 2013-06-24 22:38:40 +02:00
Tim Bentley
32c7663a45 Convert formatting tags to json 2013-06-24 17:21:46 +01:00
9bf7284b94 HEAD 2013-06-23 17:29:16 +02:00
phill-ridout
63b0f54b25 HEAD 2013-06-23 07:14:03 +01:00
Tomas Groth
25557784c8 Added test cases for new json format in service files. 2013-06-17 21:01:11 +02:00
Andreas Preikschat
f261a95a37 head 2013-06-16 18:48:37 +02:00
Patrick Zimmermann
1aeb9bef2f Duplicate Song finder merge - UI and Services.
bzr-revno: 2252
2013-06-16 15:53:40 +01:00
Patrick Zimmermann
d5cd4aaa91 Merge master. 2013-06-14 22:38:37 +02:00
Patrick Zimmermann
4d8b6f669f Merge master. 2013-06-11 07:31:11 +02:00
Andreas Preikschat
67d12883c1 head 2013-06-04 21:36:34 +02:00
Tim Bentley
9f8a0572bc Fix Presentation plugin so it works.
Correct abuse of the service item title field
Add migration code and test to prove it

bzr-revno: 2247
2013-05-25 16:10:09 +01:00
Tim Bentley
6dd070f60e Add migration test 2013-05-25 06:48:08 +01:00
Arjan Schrijver
1a0e583880 Fix bugs in group images
- Fixed traceback on canceling the 'choose group' dialog
- Clear the 'new group' lineedit in the 'choose group' dialog
- Fixed traceback on adding multiple image groups to the service in one go
- Fixed a bug where new image groups added from the 'choose group' popup weren't added to the 'add group' and 'choose group' popup selectboxes
- Cleaned up obsolete line in imagetab
- Added a simple test for onResetClick()
- Added a test for recursively_delete_group()

bzr-revno: 2245
2013-05-23 16:35:56 +01:00
Andreas Preikschat
b99d9a7ac9 More Python 3 changes - division fixes
bzr-revno: 2244
2013-05-19 19:13:26 +01: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
Andreas Preikschat
6e66edce03 removed test 2013-05-18 10:49:21 +02:00
Andreas Preikschat
7a42cd3769 added test 2013-05-18 10:44:03 +02:00
Arjan Schrijver
dcd346c8e5 HEAD 2013-05-14 16:57:37 +02:00
Andreas Preikschat
d03a9a8eec added comments 2013-05-12 14:04:15 +02:00
Andreas Preikschat
75c8382188 added test 2013-05-12 14:02:48 +02:00
Patrick Zimmermann
0557febe2b Merge trunk. 2013-04-29 20:23:06 +02:00
Patrick Zimmermann
84e9f6f1b1 Add test utils and move a function to there. 2013-04-27 11:54:57 +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
Andreas Preikschat
6d414c0fdb r2240 2013-04-23 23:48:51 +02: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
3dd05a2f4d head 2013-04-20 22:25:06 +02:00
Andreas Preikschat
ab9e0d7ba2 - removed General section and introduced a Core section
- added test

bzr-revno: 2234
Fixes: https://launchpad.net/bugs/1133237
2013-04-20 22:19:53 +02:00
Andreas Preikschat
5f9d921808 - camelCase -> words_with_underscore
- fixed short lines
- fixed docs

bzr-revno: 2233
2013-04-20 22:18:26 +02:00
Andreas Preikschat
401d4d2688 close file 2013-04-20 20:39:10 +02:00
Andreas Preikschat
186ca920da fixed test 2013-04-20 20:05:01 +02:00
Andreas Preikschat
a393302a07 fixed test 2013-04-20 19:53:17 +02:00
Andreas Preikschat
58b21030e0 r2231 2013-04-20 13:38:27 +02: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
Tim Bentley
a0f4db607e Head and fix 2013-04-16 17:37:26 +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