Samuel Mehrbrodt
bdf3109aaa
Fix SongShowPlus Import for certain cases
...
Fixes: https://launchpad.net/bugs/1310623
2014-05-01 10:46:45 +02:00
Stewart Becker
a56f00ddc0
Merge from parent
2014-04-30 21:40:33 +01:00
Stewart Becker
4022cff5e5
Fix some issues I ran into when importing our OpenSong 'database'
2014-04-30 21:39:40 +01:00
Tomas Groth
cc0f0e1eb0
Support for importing ews files (EasyWorship Service files)
...
bzr-revno: 2372
2014-04-29 17:54:14 +01:00
Tomas Groth
48fe8c5e37
Restructured the tests a bit.
2014-04-26 21:47:11 +02:00
Stefan Strasser
c2d1589dcb
fixed a pep-issue in songs-lib and corrected a comment in a test
2014-04-26 07:07:08 +02:00
Stefan Strasser
1cd7d73d10
fixed bug #1312629 Error on entering invalid character in verse-order
...
Fixes: https://launchpad.net/bugs/1312629
2014-04-25 22:04:43 +02:00
Tomas Groth
bc29a01eb5
head
2014-04-23 21:30:12 +02:00
Stewart Becker
04d5a40542
Fix PEP8 issues
2014-04-22 22:48:48 +01:00
Stewart Becker
6d63a008f0
Merged in from trunk
2014-04-22 22:46:21 +01:00
Stewart Becker
57abcf9b40
Remebered to add the tests this time
2014-04-21 18:23:00 +01:00
Samuel Mehrbrodt
cc0af8845e
PEP8
2014-04-21 12:06:17 +02:00
Samuel Mehrbrodt
031868ae31
trunk
2014-04-21 11:49:17 +02:00
Samuel Mehrbrodt
cec163085c
Fix bug 1247493: OpenSong Importer fails
...
bzr-revno: 2367
Fixes: https://launchpad.net/bugs/1247493
2014-04-20 21:15:21 +01:00
Tomas Groth
4560d39ad9
head
2014-04-20 20:33:55 +02:00
Samuel Mehrbrodt
4253cd4f52
Fix Songbook search
...
bzr-revno: 2366
Fixes: https://launchpad.net/bugs/1306958
2014-04-20 16:32:28 +02:00
Samuel Mehrbrodt
d3443d12c2
Remove one test for now
2014-04-17 16:32:56 +02:00
Samuel Mehrbrodt
5f86811f82
Fix tests
2014-04-16 23:01:57 +02:00
Samuel Mehrbrodt
9010e05430
add new openlyrics file
2014-04-16 22:42:44 +02:00
Samuel Mehrbrodt
2c6da0603b
Fix tests
2014-04-16 22:33:06 +02:00
Samuel Mehrbrodt
dd4e2c8d61
More PEP8
2014-04-16 21:59:34 +02:00
Samuel Mehrbrodt
bb1af7ed00
PEP8
2014-04-16 21:56:54 +02:00
Samuel Mehrbrodt
aa5a86fba9
Trunk
2014-04-16 21:41:59 +02:00
Samuel Mehrbrodt
d65d1c016c
Attempt to fix bug #1154467 by waiting 10ms and retrying the commit
...
bzr-revno: 2365
2014-04-16 21:13:40 +02:00
Samuel Mehrbrodt
5929b02586
Test: Songbeamer Authors import
2014-04-16 10:25:17 +02:00
Samuel Mehrbrodt
be4a654298
More tests
2014-04-16 00:23:29 +02:00
Stefan Strasser
db955cbf96
Some enhancements for songbeamer-import
...
bzr-revno: 2358
2014-04-15 22:52:14 +02:00
Stefan Strasser
5e1a7ce767
replaced all occurrences of the deprecated alias assertEquals() with assertEqual()
2014-04-15 07:28:51 +02:00
Andreas Preikschat
0c2112091d
fixed spelling
2014-04-14 21:36:07 +02:00
Stefan Strasser
4a4f8c060b
Songbeamer-import-test: replaced usage of assert with the testcase-functions assertTrue, assertEqual, assertIsNone; replaced all occurrences of assertEquals() with assertEqual() (deprecated alias)
2014-04-14 20:33:34 +02:00
Stefan Strasser
0293815135
Songbeamer-import: added check_verse_marks_test to test the correct detection of different lines that may occur
2014-04-13 19:08:38 +02:00
Andreas Preikschat
2c93a5840b
head
2014-04-12 18:05:27 +02:00
Samuel Mehrbrodt
93cd8269f8
Test case
2014-04-10 21:50:30 +02:00
Samuel Mehrbrodt
9da5d290cb
Typo
2014-04-10 18:18:25 +02:00
Samuel Mehrbrodt
32f6005c98
Test for OpenLyrics Importer
2014-04-10 09:50:30 +02:00
Samuel Mehrbrodt
e0c6381762
Fix test
2014-04-08 21:02:13 +02:00
Samuel Mehrbrodt
b0d3b54f53
Trunk
2014-04-08 11:17:55 +02:00
Tomas Groth
7dc1b8b759
PEP8 fixes
2014-04-05 09:22:24 +02:00
Tomas Groth
648e0b2290
head
2014-04-05 09:06:30 +02:00
Tomas Groth
232ff2b73f
Some cleanup and comments
2014-04-04 22:28:55 +02:00
Tim Bentley
8813490bad
fix tests
2014-04-04 21:24:11 +01:00
Tim Bentley
edb38d1255
head
2014-04-04 21:22:38 +01:00
Tomas Groth
5304b6b61f
Fixed wrong dll load path.
...
bzr-revno: 2347
2014-04-04 21:22:12 +01:00
Tomas Groth
7be9613bf0
Head
2014-04-04 19:57:28 +02:00
Tomas Groth
5c405050f1
Added test for ews import.
2014-04-04 19:57:03 +02:00
Tomas Groth
7ef62293f3
Added test
2014-04-03 22:22:10 +02:00
Tim Bentley
151f1017c5
finished
2014-04-02 20:35:09 +01:00
Tim Bentley
c38c576f94
test fixes
2014-04-02 19:51:21 +01:00
Andreas Preikschat
4da90f0c6a
comments: updated comments
2014-03-31 17:36:11 +02:00
Samuel Mehrbrodt
c98970d0e4
Fix mediaitem tests
2014-03-30 20:01:03 +02:00
98a762e86c
HEAD
2014-03-29 15:58:09 +02:00
e4c3f08a2a
Fix some of the tests which were failing in Python 3.4
2014-03-29 15:31:28 +02:00
Tomas Groth
8ad47cb888
Fixes for windows tests and for starting OpenLP on windows.
2014-03-24 17:49:50 +01:00
Andreas Preikschat
11fe2045e5
fixed tests
2014-03-22 10:24:52 +01:00
Tomas Groth
734adbbd5a
Fix import of MagicMock
2014-03-19 19:33:03 +01:00
Tomas Groth
991661b169
Head
2014-03-19 18:49:46 +01:00
Tomas Groth
fa4120a4bd
Small test fixes
2014-03-18 21:58:52 +01:00
Tomas Groth
258f1db411
Merged with head.
2014-03-18 20:40:09 +01:00
Tim Bentley
22e9d6d1a9
Head
2014-03-17 07:14:51 +00:00
Tim Bentley
85111766d5
Migrate tests and add copyright
2014-03-14 22:08:44 +00:00
Tim Bentley
d2efa83e89
Head
2014-03-14 17:34:36 +00:00
Tomas Groth
ed03ec2195
Fixes for tests on wine/windows
2014-03-13 21:59:10 +01:00
Jonathan Springer
6f05711414
Fixes settings initialization in tests to actually use temporary ini file.
2014-03-12 01:31:19 -04:00
Tim Bentley
e78dac1edf
Head
2014-03-11 20:17:18 +00:00
Tim Bentley
6935adde29
Yet more tests
2014-03-11 20:10:46 +00:00
Tim Bentley
0da1b7b5f7
Presentations
2014-03-08 21:23:47 +00:00
6747dec2b5
Tests! Tests! Tests!
2014-03-06 23:28:13 +02:00
Tim Bentley
3ae188c287
FoilPresenter
2014-03-06 20:56:31 +00:00
Tim Bentley
ef97095399
Importer cleanups
2014-03-06 20:40:08 +00:00
Tim Bentley
75281b5cf1
Song import cleanups
2014-03-05 18:58:22 +00:00
c607661aee
HEAD
2014-03-04 23:51:54 +02:00
b094d48678
Add some error handling around the getting a song.
...
Add some more tests.
2014-03-04 23:28:15 +02:00
Tim Bentley
1301b4cfa3
Fix up presentation tests
2014-03-04 20:18:14 +00:00
831f2f3b69
HEAD
2014-02-27 23:39:44 +02:00
d2a5e8a4c4
Refactor SongSelect search into a separate class, and start writing some tests for that class.
2014-02-27 23:36:33 +02:00
Tomas Groth
52a73f3475
merged with head
2014-02-25 21:11:48 +01:00
Tim Bentley
3d556a9790
Head
2014-02-23 15:02:53 +00:00
Philip Ridout
b718b76c8c
HEAD
2014-02-11 21:07:06 +00:00
Philip Ridout
150ff4e980
HEAD
2014-02-11 20:29:57 +00:00
Tim Bentley
5d740a7706
Removep
...
bzr commit -mRemovep
2014-01-11 22:05:38 +00:00
Felipe Polo-Wood
b58abe45b2
Added WebSocket engine
2014-01-09 14:53:56 -05:00
Tomas Groth
f5ace2c238
merged with trunk
2013-12-31 12:20:11 +00:00
Tomas Groth
3cc69cc9fd
Changed the way a serviceitem from the servicemanager is copied and converted. Also fixed for PEP8.
2013-12-31 12:15:18 +00:00
Felipe Polo-Wood
b495c47a5a
More styling issues
2013-12-30 13:19:50 -05:00
Felipe Polo-Wood
1a83a0a557
Merge head
2013-12-30 03:53:51 -05:00
Felipe Polo-Wood
b993b0d4a8
Style changes
2013-12-30 03:35:05 -05:00
Tomas Groth
84334a039e
Merged with trunk.
2013-12-29 19:47:54 +00:00
Tomas Groth
7dd3417217
Added tests for the PdfController.
2013-12-29 19:46:04 +00:00
Tim Bentley
e6bcf7d852
Head and fix confilcts
2013-12-28 21:33:38 +00:00
Felipe Polo-Wood
08682a3bd2
formatting issues
2013-12-28 15:03:45 -05:00
Felipe Polo-Wood
1ef910463c
Merge head
2013-12-28 12:06:29 -05:00
Tim Bentley
508d050b4c
Head
2013-12-24 11:32:56 +00:00
Tim Bentley
6d8b5cadb4
Lib cleanup and 2014
2013-12-24 08:56:50 +00:00
3204a4db72
- Specify OpenLP as the user agent when querying SF.net
...
- Fix another test
- Update tests for get_web_page
2013-12-20 21:25:42 +02:00
553c93e790
Tidy up some tests
2013-12-18 23:54:56 +02:00
Tim Bentley
cd9f9e4c8d
move registry to common
2013-12-13 17:44:05 +00:00
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
b85b09c92c
Merge back to trunk
2013-12-02 11:14:09 -05:00
Felipe Polo-Wood
e9848a2653
Fix the Http router return values
...
bzr-revno: 2313
2013-12-01 20:58:09 +00:00
Felipe Polo-Wood
04abbd97d0
implemented caching thru the ImageManager
...
Styling issues
Merge with fix-router changes
2013-11-22 13:21:07 -05: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
Felipe Polo-Wood
768b1c77fc
Code was not sending the headers back
2013-11-08 12:43:36 -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
Felipe Polo-Wood
6c3253c7c0
Added caching for thumbnail images
2013-11-07 15:13:15 -05:00
Felipe Polo-Wood
6d464dec4b
Added resizing capabilities to the thumbnails
...
Fixed a problem with setting the presentation slides from the remote
2013-10-29 11:38:28 -04:00
Felipe Polo-Wood
9a07d6887b
style fixes
2013-10-28 11:16:22 -04:00
Felipe Polo-Wood
1aae38cb8e
Merging
2013-10-27 23:40:38 -04:00
Felipe Polo-Wood
b9850e6e68
bunch of cosmetic changes
2013-10-27 22:33:28 -04: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
Felipe Polo-Wood
fa32ce43d7
Implemented tests for service_item and router
2013-10-25 13:58:55 -04:00
Felipe Polo-Wood
30278b1a56
Fixed compatibility with Ubuntu on the unit tests.
2013-10-24 22:33:54 -04:00
Felipe Polo-Wood
5644e26a85
Improved unit tests
2013-10-24 21:15:44 -04:00
Felipe Polo-Wood
8072188cdf
Added tests for __get_text_from_page
2013-10-22 23:12:45 -04:00
Felipe Polo-Wood
28345808da
Added unit tests for the two new methods get_titles_and_notes and save_titles_and_notes
2013-10-22 14:24:56 -04: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
Felipe Polo-Wood
77f488e509
Removed old comments
2013-10-20 00:12:12 -04:00
Felipe Polo-Wood
d4d572bf80
Fixed and verified test on Ubuntu/Impress
2013-10-19 23:25:07 -04:00
Felipe Polo-Wood
f2a2468e01
Added tests for loading titles and notes on three presentation controllers
2013-10-19 19:18:31 -04: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