Commit Graph

1861 Commits

Author SHA1 Message Date
Raoul Snyman 6126546977 Add tests around set_visible 2015-05-01 17:15:14 +02:00
Raoul Snyman f5301cc9f2 Add a test around reset 2015-05-01 17:09:32 +02:00
Raoul Snyman f5b883d40b Add tests around seeking 2015-05-01 17:05:42 +02:00
Raoul Snyman 9232e75582 Add tests around pausing 2015-05-01 15:05:38 +02:00
Raoul Snyman dd9e12d2b5 Fixed an interface test, added some more VLC tests 2015-04-30 23:14:23 +02:00
Tomas Groth 335d8d2d17 pep8 fix 2015-04-29 09:20:25 +02:00
Raoul Snyman 54ce226ad8 Add tests for stop(), resize(), check_available() and volume() 2015-04-28 22:27:55 +02:00
Raoul Snyman d09c5acd0a Silence a Phonon warning by providing an application name in the tests. 2015-04-28 20:20:03 +02:00
Raoul Snyman 64695b9c33 Strip out unnecessary asserts 2015-04-28 16:06:36 +02:00
Raoul Snyman fda7ab562c Add some tests 2015-04-28 16:01:09 +02:00
Raoul Snyman 2a1778c878 Add a test for the constructor 2015-04-28 01:04:16 +02:00
Raoul Snyman 07b7d9b6a9 Fix a problem with VLC 2.2 on Mac OS X, where VLC could not find it's plugins, and would bomb out.
bzr-revno: 2533
2015-04-27 17:02:16 +01:00
Raoul Snyman f638418b7b Fix the tests on OS X to remove the plugin path and the module when re-running the tests 2015-04-27 11:33:29 +02:00
Raoul Snyman 1ad2578065 WIP: Add another test to check that both tests are working properly 2015-04-27 11:12:28 +02:00
Raoul Snyman 1387bfc838 Fixed up the test 2015-04-25 21:29:39 +02:00
Raoul Snyman ab54b04468 Fix VLC 2.2 on OS X which cannot be loaded due to an incorrect plugin path 2015-04-25 16:32:09 +02:00
Jonathan Springer 8e0fc05b82 Inital stab at test 2015-04-25 10:06:32 -04:00
Tomas Groth ae785815c8 Fix test on windows. 2015-04-22 22:05:46 +01:00
Tomas Groth cbeece7375 Added test for on_delete_click in the image plugin. 2015-04-22 21:57:33 +01:00
Tomas Groth 67ecf9b901 Take focus back if Powerpoint steals it - fixes bug 1423913.
Optionally advance a Powerpoint slides animation when clicked in the slidecontroller - fixes bug 1194847.
Made OpenLP respect hidden slides. Improved logging in case of errors.
For Impress, go to previous effect instead of the previous slide.

bzr-revno: 2527
Fixes: https://launchpad.net/bugs/1423913, https://launchpad.net/bugs/1194847
2015-04-03 20:36:02 +02:00
Tomas Groth cff0b412f8 Mark a custom slide edited from preview as coming from plugin. Fixes bug 1439671.
Use html.escape instead of the deprecated cgi.escape
Fix support for special characters in theme names. Fixes bug 1438563.
Fix another case of traceback when playing media with no players available/enabled (bug 1422761).

bzr-revno: 2526
Fixes: https://launchpad.net/bugs/1439671, https://launchpad.net/bugs/1438563, https://launchpad.net/bugs/1422761
2015-04-03 20:31:19 +02:00
Tomas Groth 335c804e8f Fix support for special characters in theme names. Fixes bug 1438563.
Fixes: https://launchpad.net/bugs/1438563
2015-04-02 10:04:56 +01:00
Tomas Groth d5804567b5 Added test + some cleaning 2015-04-02 09:33:46 +01:00
Raoul Snyman 02128c85f0 Fix bug #1437771: Clear the song after every import
- Set processed song to None after importing
- Update tests to check that song is None after importing
- Remove tests that were testing OptionParser, and replace with tests testing parse_options()
- Fix some docstring typos causing some tests to have a name of " (yes, a single double-quote)

Fixes: https://launchpad.net/bugs/1437771
2015-03-31 22:58:51 +02:00
Tomas Groth 3f8a7975ee Test fix 2015-03-30 15:31:41 +02:00
Tomas Groth f8084059ba Added test + small fixes. 2015-03-18 22:04:30 +00:00
Raoul Snyman cecde62157 Fix bug #1411433 by moving some stuff around.
bzr-revno: 2522
2015-03-11 18:47:29 +00:00
Tomas Groth 8fe254e576 Added test 2015-03-10 23:46:37 +00:00
Raoul Snyman 3c130cf201 Fix bug #1411433 by rearranging methods within the media plugin
Fixes: https://launchpad.net/bugs/1411433
2015-03-10 23:33:35 +02:00
Tomas Groth aefe3e9cad trunk 2015-03-09 20:42:28 +00:00
Tomas Groth 512df1451d Use the language id when importing bibles. And fixed presentationcontroller tests. 2015-03-09 20:42:03 +00:00
Raoul Snyman 54c23cc7bd Fix bug #1419300 by checking if we are doing single-click previewing and not engaging preview on double-click
Fixes: https://launchpad.net/bugs/1419300
2015-03-07 00:18:51 +02:00
Raoul Snyman 88ceae517a Fix code analysis 2015-03-02 21:21:41 +02:00
Oliver Wieland 408dd440ce Fix bug #1424555 by setting the verse and not allowing it to change
bzr-revno: 2516
Fixes: https://launchpad.net/bugs/1424555
2015-02-28 20:46:31 +02:00
Raoul Snyman e14c03166d Minor style fixes 2015-02-28 01:02:19 +02:00
Raoul Snyman f843e5a8a0 HEAD 2015-02-28 00:30:47 +02:00
Raoul Snyman 7d7fec194e Fix bug #1423699 so that you're not logged out when you want to import more songs.
Fixes: https://launchpad.net/bugs/1423699
2015-02-28 00:28:24 +02:00
Oliver Wieland 6aff21c784 Changed test descrition 2015-02-27 20:33:49 +01:00
Oliver Wieland 07c997817d added test 2015-02-23 19:30:45 +01:00
Ken Roberts 85b8cb2c50 Fix bug 1422683: Added exception checks to get_web_page() to help with changed description. Rearrange calls so thumbnail downloads don't hang other event threads. Reraise exception when retries > CONNECTION_RETRIES.
bzr-revno: 2512
Fixes: https://launchpad.net/bugs/1422683
2015-02-21 21:11:25 +02:00
Tomas Groth 66b898f2c3 Don't try to play media if no players are available. Fixes bug 1422761.
Do not display alert on a single screen when 'Display on a single screen' is not checked. Fixes bug 1423956.

bzr-revno: 2510
Fixes: https://launchpad.net/bugs/1422761, https://launchpad.net/bugs/1423956
2015-02-21 21:03:59 +02:00
Phill Ridout a6fed0a3e5 HEAD 2015-02-21 13:10:28 +00:00
Phill Ridout 4b52fde1da Fixes possible bug and adds test 2015-02-21 13:08:56 +00:00
Tomas Groth df9594e11d trunk 2015-02-21 12:45:44 +00:00
Ken Roberts 3a2cd7472b Fix duplicate test names in songselect test
bzr-revno: 2507
2015-02-21 12:43:09 +00:00
Phill Ridout 79204ea723 PEP fix 2015-02-19 22:04:54 +00:00
Phill Ridout a255faa95b HEAD 2015-02-19 21:53:21 +00:00
Tomas Groth dde3684cf0 Added test 2015-02-19 20:53:42 +00:00
Phill Ridout 75c9391d8e Tests 2015-02-19 18:57:05 +00:00
Ken Roberts e0c44c4b9f Rename test to match file import type 2015-02-18 14:39:02 -08:00
Ken Roberts 872d5b9d26 Fix duplicate test names 2015-02-18 14:04:29 -08:00
Ken Roberts 80055b7ec0 Fix ftw socket.timeout bug 1422683 2015-02-17 13:27:51 -08:00
Tim Bentley 870b69b497 Remove cache for http authentication
bzr-revno: 2503
2015-02-17 19:49:16 +00:00
Tomas Groth 1b2b1c74cc Use the doubleclick-go-live setting in the preview controller. Fixes bug 1422197.
If no copyright info is given for bible, don't print it. Fixes bug 1420785.
Make csv-bible import work with python3. Fixes bug 1421136.
Add default shortcut bindings for preview next/prev, and make the appear in the shortcut edit dialog. Fixes bug 1412570.

bzr-revno: 2502
2015-02-17 18:50:10 +00:00
Philip Ridout f7cb420a31 Fixes bug1419691 by checking the theme version number (OpenLP1 themes didn't have a version no.) and by removing the *.theme filter from the file dialog.
Also added a ValidationError exception class, to tidy up the unzip code slightly

bzr-revno: 2501
2015-02-17 05:51:24 +00:00
Philip Ridout 16758d1b80 Fixes bug1073931 "Corrupted databases stop OpenLP from starting"
Checks if the database session is available before trying to use it.
Use a sha256 hash to verify downloaded files. See also: https://code.launchpad.net/~phill-ridout/openlp/sha256

bzr-revno: 2500
2015-02-17 05:47:19 +00:00
Tomas Groth 0617ce3dc9 trunk 2015-02-16 21:02:58 +00:00
Tim Bentley 57efed63a3 fix comments 2015-02-16 20:56:39 +00:00
Tomas Groth aef91445ca Handle OSError exception when creating files in various places. Fixes bug 1416888.
Fix parsing biblestudytools.com. Fixes bug 1418212.
Make Zefania import guess book from number if name is unavailable. Fixes bug 1417033.

bzr-revno: 2498
2015-02-14 15:11:11 +00:00
Tim Bentley 58f10d3b6b Fix cache for http authentication 2015-02-14 09:12:35 +00:00
Phill Ridout 2eb58a56bd PEP fixes 2015-02-13 23:21:57 +00:00
Phill Ridout 498d17b000 Added tests 2015-02-13 23:10:16 +00:00
Tomas Groth 81de433df4 Added test for csvbible import 2015-02-13 23:01:07 +00:00
Phill Ridout 3e697dc213 HEAD 2015-02-13 20:41:54 +00:00
Phill Ridout 126873ddaa fixes bug1416703 by implementing a function to do the conversion
Fixes: https://launchpad.net/bugs/1416703
2015-02-13 20:41:34 +00:00
Phill Ridout e35a1d7763 head 2015-02-12 21:35:26 +00:00
Phill Ridout f6de8a4f7a Fix 1416703 2015-02-12 20:44:34 +00:00
Ken Roberts 88cb02bb3d Fix bug #1417809: Remove default ascii encoding so md5hash can be used to hash other data.
bzr-revno: 2497
Fixes: https://launchpad.net/bugs/1417809
2015-02-10 21:38:53 +02:00
Tomas Groth 1e9430b435 Fix bug 1414980: Make xml parsing of presentation manager files recover if errors are encountered.
Fix bug 1414978: Set the cursor back to normal after deleting a presentation.
Fix bug 1410738: Added a cancel-button to FTW when no internet is available. 
Fix bug 1412517: Fix support for 'end' mark in bible-search.

bzr-revno: 2495
Fixes: https://launchpad.net/bugs/1414978, https://launchpad.net/bugs/1414980, https://launchpad.net/bugs/1410738, https://launchpad.net/bugs/1412517
2015-02-10 21:24:33 +02:00
Tomas Groth 2cdc1b2fe4 Remove print 2015-02-06 22:21:01 +00:00
Phill Ridout dbd25822f2 Add tests 2015-02-05 17:22:31 +00:00
Ken Roberts a4235aafe9 Remove new functions - fix tests 2015-02-04 08:43:04 -08:00
Ken Roberts fd5b8112f9 sha1_filecheck test 2015-02-03 14:59:59 -08:00
Tomas Groth 5b717db63a Make Zefania import guess book from number if name is unavailable. Fixes bug 1417033.
Fixes: https://launchpad.net/bugs/1417033
2015-02-02 20:40:31 +00:00
Ken Roberts b02d44416a Allow md5check to use non-ascii encoding, added md5_filecheck 2015-02-02 10:00:39 -08:00
Philip Ridout cfa8e4f2df Fixes #1414585 Thumbnail of images isn't shown in stage view and remote control
and #1414585 2.1.2 Traceback on Presentations for MAC

bzr-revno: 2494
2015-02-01 19:51:54 +00:00
Philip Ridout b40f931618 Fix - Preview media slider repeatedly shows "Error Occurred" dialogue box
bzr-revno: 2493
2015-02-01 15:04:37 +00:00
Tim Bentley 93038bb27d Move delete option to support ham fisted users
bzr-revno: 2492
2015-02-01 13:37:54 +00:00
Tim Bentley 6f76c164e0 fix delete 2015-01-30 21:15:03 +00:00
Tomas Groth 1b75cc9c6b Fallback to manual encoding detection. 2015-01-29 21:15:39 +00:00
Phill Ridout b33fe701df Make Phonon optional
Fixes: https://launchpad.net/bugs/1224404
2015-01-29 20:57:02 +00:00
Tomas Groth 4c53cb5184 Added tests 2015-01-29 20:54:06 +00:00
Phill Ridout 52a1033505 test tidies 2015-01-29 18:26:00 +00:00
Phill Ridout 0cc2ae5998 Fix exception raised on mac
Fixes: https://launchpad.net/bugs/1414360
2015-01-27 19:57:09 +00:00
Phill Ridout 091cb079e7 Fix up tests 2015-01-26 20:43:53 +00:00
Phill Ridout 1712464e8c Fix up tests 2015-01-26 20:42:19 +00:00
Phill Ridout 3dc248e556 Typo 2015-01-25 22:13:35 +00:00
Phill Ridout 34f8cbc09b Typos & tests 2015-01-25 22:12:33 +00:00
Philip Ridout 5390ed5bac Fixes Bug #1367141: Presentations/Images with same name gets the same thumbnail
Uses the database id for thumbnails. Uses an md5 hash of the path and file name for presentations (as there is no db for presentations)

Also added code to remove the old thumbnails.

bzr-revno: 2487
2015-01-24 18:24:51 +00:00
Phill Ridout 4a52a90a4e test fix. Test options in order as per --help 2015-01-24 10:21:13 +00:00
Philip Ridout fe3d887fd7 Corrects Translation strings
bzr-revno: 2485
2015-01-22 19:47:16 +00:00
Philip Ridout c43823a2b0 Fixes the copyright headers
bzr-revno: 2484
2015-01-22 19:46:04 +00:00
Phill Ridout 92eee52d3f pep fixes 2015-01-22 18:07:56 +00:00
Phill Ridout 125f019486 test fixes 2015-01-22 17:52:48 +00:00
Phill Ridout 051db41e20 removed python3 string 2015-01-22 17:42:29 +00:00
Phill Ridout 75dff3d2be HEAD 2015-01-22 17:31:00 +00:00
Phill Ridout a64fdd8697 fix tests 2015-01-22 15:35:52 +00:00
Phill Ridout 833c6fb800 Add test 2015-01-22 15:05:03 +00:00
Phill Ridout 7750f1ec11 Correct the rest of the headers 2015-01-22 13:31:25 +00:00
Philip Ridout fa05d3110e Image Name in Service Manager - bug1410456
bzr-revno: 2483
2015-01-21 21:12:30 +00:00
Tomas Groth f53187e26a Fix layout in player-settings. Fixes bug 1410772
Make sure we use dnd position if available. Fixes bug 1410843.
Set the default delay-spinbox value from the appropriate setting. Fixes bug 1411765.
Improve OpenLyrics import handling of authortypes. Fixes bug 1405172 and 1405175.

bzr-revno: 2482
2015-01-21 20:35:36 +00:00
Phill Ridout e7793fc9fa Pep fixes 2015-01-20 21:45:37 +00:00
Phill Ridout 7fda8043f5 Improve translation string
Fixes: https://launchpad.net/bugs/1412234
2015-01-20 21:38:34 +00:00
Ken Roberts 9c5ba940da Refactor source record test 2015-01-20 07:44:55 -08:00
Phill Ridout 88f69ea7c4 doc strings an typos 2015-01-20 07:14:58 +00:00
Phill Ridout f1f0ab9c3d pep fixes 2015-01-19 22:59:49 +00:00
Phill Ridout 63f68d344f pep fixes 2015-01-19 22:56:30 +00:00
Phill Ridout e3f147a226 Fixes 1410456 and adds a couple tests
Fixes: https://launchpad.net/bugs/1410456
2015-01-19 22:49:18 +00:00
Ken Roberts 745a3e3ef8 Remove translations from error code number strings 2015-01-19 14:36:53 -08:00
Raoul Snyman de213b0f66 Copyright cleanup time,
bzr-revno: 2479
2015-01-19 08:34:29 +00:00
Tomas Groth 685b2fde32 Improve OpenLyrics import handling of authortypes. Fixes bug 1405172 and 1405175
Fixes: https://launchpad.net/bugs/1405172, https://launchpad.net/bugs/1405175
2015-01-18 20:38:03 +00:00
Raoul Snyman ffcea13021 Updated the copyright. 2015-01-18 15:39:21 +02:00
Ken Roberts deb8ae8656 Fix First Time Wizard fail on URL error (ex: proxy authorization)
Fix spelling

bzr-revno: 2478
Fixes: https://launchpad.net/bugs/1409627
2015-01-16 22:43:47 +02:00
Tomas Groth cf30667fb5 Fix Windows tests when running on WINE
bzr-revno: 2477
2015-01-16 22:42:00 +02:00
Tomas Groth 255b7d8495 pep8 fix 2015-01-16 20:23:56 +00:00
Tomas Groth 36e4b0c8eb Attempt to fix WorshipCenterProImport init under wine tests 2015-01-16 16:25:25 +01:00
Tomas Groth 76b47019b6 Mock out AudioPlayer to avoid loading Phonon during test. 2015-01-16 14:51:38 +01:00
Phill Ridout e5bae7e885 Fixes1410694 by fixing typo, also added additional error. Added the OS Name and version to the version file request headers
Fixes: https://launchpad.net/bugs/1410694
2015-01-14 21:35:02 +00:00
Tomas Groth 1efc145cdf PEP8 fixes 2015-01-14 12:32:27 +01:00
Ken Roberts 9551920821 Catch network error in FTW 2015-01-13 11:03:05 -08:00
Ken Roberts 5bfb5b5426 Add .bin file import support.
Sometime prior to 2015, SongSelect changed the default file name for USR files to .bin.

bzr-revno: 2474
2015-01-11 20:27:27 +00:00
Raoul Snyman 3774cf3704 Update the credits in the About dialog 2015-01-11 21:46:41 +02:00
Ken Roberts 4859e9866d Add .bin support for CCLI file import 2015-01-11 10:37:50 -08:00
Raoul Snyman 172f13b12e Fix an erroneous import (probably PyCharm) 2015-01-11 17:18:17 +02:00
Raoul Snyman 0bb325fea7 HEAD 2015-01-11 17:17:33 +02:00
0deb0a10cc [bug 1397606] Set the file dialogue box to the currently selected background image
bzr-revno: 2471
Fixes: https://launchpad.net/bugs/1397606
2015-01-11 17:17:01 +02:00
Ken Roberts 91933c3e2f [bug 1409031] Fix retry counter when fetching a webpage
bzr-revno: 2470
Fixes: https://launchpad.net/bugs/1409031
2015-01-11 17:13:13 +02:00
Raoul Snyman 8758020568 HEAD 2015-01-11 17:02:32 +02:00
Phill Ridout dac7185692 Remove extra line 2015-01-09 19:51:39 +00:00
Ken Roberts 5c7777fd5a Fix line spacing 2015-01-09 10:55:46 -08:00
Ken Roberts 0b2445b9a2 Fix spacing 2015-01-09 10:53:36 -08:00
Ken Roberts d2fb2d47eb Tests for bug 1409031 2015-01-09 10:46:50 -08:00
Phill Ridout e0fa70e47e Set the last file location in the file dialog box
Fixes: https://launchpad.net/bugs/1397606
2015-01-08 22:05:32 +00:00
Ken Roberts 7277e3e92a Remove unneeded Registry modification 2015-01-08 10:55:26 -08:00
Ken Roberts 3f3c4cf80b remote next/previous call test 2015-01-08 10:07:36 -08:00
Tomas Groth 9461f334ce Disable webkit and phonon mediaplayers on Mac OS X,
bzr-revno: 2467
2015-01-04 09:01:18 +00:00
Phill Ridout 3cafbfd0ed Typo in comments fixed 2015-01-02 11:54:42 +00:00
Phill Ridout 9fef267fd3 Changed the year 2015-01-02 11:42:17 +00:00
Phill Ridout b9f09142ed HEAD 2015-01-02 11:40:51 +00:00
Phill Ridout 20d927b270 Rework to use a subclassed QLabel to allow dynamic resizing 2015-01-02 11:40:07 +00:00
Tomas Groth 9b2660bf7f Rewrote tests for webkit and phonon player 2015-01-01 17:41:32 +00:00
Tomas Groth e5c5a229a4 Update to 2015 2014-12-31 15:06:35 +00:00
Tomas Groth 1e95bc7fbb Added simple tests for webkit and phonon players 2014-12-31 14:57:41 +00:00
Tim Bentley f3c09af379 Years go by 2014-12-31 10:58:13 +00:00
Phill Ridout 52c7d89706 removal of util function 2014-12-30 11:23:01 +00:00
Phill Ridout 19cb16d65b Moved 'eliding' code to a sublass of qlabel to enable the text to be rendrawn when resized 2014-12-30 11:21:06 +00:00
Phill Ridout 3cf2a21ca2 fix tests 2014-12-30 09:03:35 +00:00
Phill Ridout 36417083ce head 2014-12-29 17:25:36 +00:00
Samuel Mehrbrodt c5d716f565 Test 2014-12-24 14:21:17 +01:00
Phill Ridout c9e1dcceff head 2014-12-23 18:57:04 +00:00
Tim Bentley 98a3cd127f Update code to 2.2 from 2.1 so translators can get working!
bzr-revno: 2460
2014-12-22 21:55:44 +00:00
Tim Bentley 93d0314b7e General fixes 2014-12-22 17:34:43 +00:00
Phill Ridout 4a9a7f2829 adds tests for bible media item 2014-12-19 22:02:45 +00:00
Phill Ridout cb0e4dc7ba added copyright header to test 2014-12-19 22:01:15 +00:00
Tim Bentley 927e610977 Fix tests 2014-12-18 21:15:14 +00:00
Tim Bentley 5686e85384 Fix custom duplication bug 2014-12-16 07:47:46 +00:00
Raoul Snyman fe02a80e26 HEAD 2014-12-14 22:37:36 +02:00
Raoul Snyman 5742f7546e Fixed up merge conflicts. 2014-12-12 22:57:42 +02:00
Phill Ridout 2642a21d53 Refactor get_uno_command & get_uno_instance 2014-12-08 07:19:51 +00:00
Phill Ridout 6fd0612748 set connection type for each test 2014-12-07 19:13:21 +00:00
Phill Ridout 2aff850b64 HEAD 2014-12-07 17:46:46 +00:00
Phill Ridout 9d54d6351a Tests 2014-12-07 17:46:23 +00:00
Tomas Groth 4ed9e9a722 Added a refresh call to the hide-toolbar so that it gets updated if needed. Makes the blank-to-theme button visible in the toolbar.
Fix for loading songs with linked audio + test. Fixes bug 1398403
Remove dummy initialization of preview_display to solve issue of mediaplayer preview being hidden.
When cloning a song copy the mediafiles as well. Fixes bug 1309998.
Use shutil.which instead of calling which with check_output, when detecting mudraw/gs.
Moved test service files into appropriate folder.
Set the default song search to search as type.

bzr-revno: 2454
2014-12-07 08:21:37 +00:00
Philip Ridout c9a2b87ac5 Fix links and Color buttons
bzr-revno: 2452
2014-12-07 08:16:15 +00:00
Tomas Groth df6c533387 Fix upgrade on song db with lost version. Fixes bug 1391638.
Treat slide notes and servicemanager notes differently in the web remote and stage view. Fixes bug 1390015.
When escaping live display stop looping to prevent display to reappear. Fixes bug 1266271.

bzr-revno: 2451
2014-12-07 08:13:52 +00:00
Tomas Groth da7ff60697 Moved test service files into appropriate folder. 2014-12-06 21:05:45 +00:00
Tomas Groth 0038ffcbe6 Add test for loading song with linked audio - the actual test 2014-12-03 22:29:20 +00:00
Phill Ridout 563347c8b8 HEAD 2014-11-30 07:44:57 +00:00
Raoul Snyman 34406385fb HEAD 2014-11-26 22:50:54 +02:00
Tomas Groth e3bd817c5b Merge with trunk 2014-11-26 09:04:09 +00:00
Tomas Groth 92a6831b15 Fix slidecontroller test 2014-11-25 22:31:18 +00:00
Tim Bentley 21db63b032 remove blank line 2014-11-25 21:36:52 +00:00
Tomas Groth 80a8434458 Added one more test for song db upgrade 2014-11-25 15:11:18 +01:00
Tomas Groth 4ca013e211 Added test for song db upgrade 2014-11-25 12:25:41 +01:00
Raoul Snyman bd79b1d059 [bug 1314469] Fix the border seen in the main display on KDE by not overwriting that bit of the stylesheet
Fixes: https://launchpad.net/bugs/1314469
2014-11-24 21:43:34 +02:00
Tim Bentley 22a4974d86 Comments 2014-11-22 07:07:08 +00:00
Tim Bentley 4fb0e43c04 New start old bugs 2014-11-20 06:58:33 +00:00
93706f8d99 Fix for overwriting files on song export + test. Fixes bug 1216232.
Only show slide-dropdown on live-slidecontroller when it is populated. Fixes bug 1390238.
Make sure that the slidecontroller toolbar layout is correctly adjusted to fit its size. Fixes bug 1387304.
Mark a song edited from preview as coming from plugin. Fixes bug 1382672
Make the settingswindow higher to make room for the new settings. Fixes bug 1377283.

bzr-revno: 2447
2014-11-19 20:59:27 +00:00
Tomas Groth c85f49a16c Added test for openlyrics export of songs with same title and author 2014-11-16 22:44:44 +00:00
Tomas Groth 378132d82f Moved Settings KeyError handling to the export. 2014-11-13 20:15:43 +00:00
Tomas Groth 9b517cd569 Improved support for verseorder in WA import 2014-11-11 11:38:24 +01:00
Phill Ridout 5cc1fa2261 Fixes a few typos 2014-11-10 20:48:22 +00:00
Tomas Groth 61e42a9782 When querying values from Setting, return None if key does not exists. Fixes bug 1387278
Fixes: https://launchpad.net/bugs/1387278
2014-11-10 11:51:03 +01:00
Philip Ridout 1ed8100537 Added new ColorButton subclassed from QPushButton to select colours reducing code duplication
Added tests for ColorButton
Renamed some methods to take in to account the new signal that ColorButton emits
Fixed some tests for FileDialog

bzr-revno: 2444
2014-11-09 13:18:53 +00:00
Raoul Snyman e9ec5d202c [bug 1306950] Set the username, password and "save" checkbox back to enabled when the login fails
[refactor] Make the SongSelectForm slightly more testable
[test] Write some tests for the form itself
2014-11-09 02:41:30 +02:00
Raoul Snyman 14377f3329 [refactor] Renamed "was_download_cancelled" to "was_cancelled"
[refactor] Put some more stuff back into initalise() where it belongs
[refactor] Rewrote old tests, wrote new tests
2014-11-08 23:15:25 +02:00
Tomas Groth 519119aecb Fixed test to reflect 30 sec timeout in get_web_page 2014-11-07 10:41:37 +01:00
Tomas Groth 48c561e34b Made the FTW able to handle if the downloaded config file is invalid.
Fixes: https://launchpad.net/bugs/1222944
2014-11-07 10:32:45 +01:00
Tomas Groth ff4ddefa77 pep8 fix 2014-11-06 10:42:54 +01:00
Tomas Groth 02a159bf65 Added one more test file for WoW import 2014-11-05 14:04:43 +01:00
Tomas Groth 77c7da2d20 Change duplicate check to pass int-string tuples to workers, to workaround windows issue, see bug #1388850
Fixes: https://launchpad.net/bugs/1388850
2014-11-05 09:42:33 +01:00
Tomas Groth 51f4539822 Added test for Word of Worship import 2014-11-03 15:36:27 +01:00
Phill Ridout b119cc40be HEAD 2.1.1 release 2014-11-02 17:19:27 +00:00
Phill Ridout b464b5613c pep fixes 2014-11-02 17:19:02 +00:00
Phill Ridout b682117f92 Completed tests for ColorButton 2014-11-02 16:50:18 +00:00
Tim Bentley 616565fe19 Head 2014-11-01 11:12:27 +00:00
Raoul Snyman b692e11d82 Filter out ampersands and angle brackets
bzr-revno: 2437
2014-11-01 11:11:48 +00:00
Tomas Groth 146a505ee6 #1387286, playing audio CD clips on windows.
#1247025, Position fix for d'n'd to servicelist, copied from lp:~oliwee/openlp/bug-1247025.
Fix traceback on theme import in windows.

bzr-revno: 2436
2014-11-01 11:09:10 +00:00
Tim Bentley b20b114a7b test fix 2014-11-01 11:06:17 +00:00
Tim Bentley 6323f8bba7 Add tests 2014-11-01 10:59:45 +00:00
Raoul Snyman 0e46a05ccc Apparently pylint doesnt like blank lines at the end of the file. fussy.
Fixes: https://launchpad.net/bugs/1387309
2014-10-31 22:15:44 +02:00
Raoul Snyman ee7fb49e49 Fix some linting issues 2014-10-31 22:12:06 +02:00
Raoul Snyman 6a67a77240 Fix bug #1387309: Filter out ampersands and angle brackets 2014-10-31 21:47:36 +02:00
Tomas Groth 74b582032f Fix theme import in windows. Test included. 2014-10-31 13:01:07 +01:00
Raoul Snyman 69873c0db3 Two fixes:
- Fix bug #1386896 by catching the OSError on Mac OS X and just ignoring it
- Found a potential bug where the settings form was canceled, with one or more inactive plugins
- Wrote a test for the above settings form bug

Fixes: https://launchpad.net/bugs/1386896
2014-10-31 00:53:06 +02:00
Phill Ridout 8c0f480b0e Start of ColorButton tests 2014-10-29 19:18:01 +00:00
Phill Ridout 3685948ed5 HEAD 2014-10-29 19:11:43 +00:00
Phill Ridout 013e59c527 fixes to FileDialog tests 2014-10-29 19:07:13 +00:00
Ken Roberts ddd94ba061 Upstream merges 2014-10-28 13:48:20 -07:00
Ken Roberts 6ae179d672 Upstream merges 2014-10-28 13:45:53 -07:00
Raoul Snyman 00455847a7 HEAD 2014-10-28 22:27:09 +02:00
Raoul Snyman 743dc59d51 [fix 1386710] Fix traceback after settings form is saved
Fixes: https://launchpad.net/bugs/1386710
2014-10-28 21:40:01 +02:00
Raoul Snyman ae7c863333 [fix 1385979] Check if the item is valid first 2014-10-28 21:02:06 +02:00
Tomas Groth c19613ce82 Various small bugfixes:
- Fixes adding of images and media to the media manager. Copied from lp:~rafaellerm/openlp/media_import_fix
- Fix for another occurrence of bug #1296574. Copied from lp:~erik-lundin/openlp/bug-1296574
- Fixed a tiny glitch, remove author button became always disabled even if not needed to. Copied from lp:~mahfiaz/openlp/author-delete-button-not-active-in-edit-dialog
- Remove prints in http_router
- Change filename encoding in PptviewDocument to only apply to local variable, to avoid backtrace.

bzr-revno: 2431
Fixes: https://launchpad.net/bugs/1296574
2014-10-28 20:36:54 +02:00
Tomas Groth 11b2b4dc3b Added test for checking extension list creation 2014-10-27 21:38:19 +00:00
Tim Bentley afde4a25ad Fix missing dummy values for debug 2014-10-27 20:22:57 +00:00
Raoul Snyman b34da371ba [fix #1385438] Make list widget items select tab pages via user data rather than just their position.
Fixes: https://launchpad.net/bugs/1385438
2014-10-25 22:26:19 +02:00
Ken Roberts f81903bbcf Merge upstream 2014-10-23 15:16:38 -07:00
Raoul Snyman 3771cb42a8 HEAD 2014-10-22 22:47:47 +02:00
Raoul Snyman 76f4b6e3ad Forgot to add test file 2014-10-22 22:44:05 +02:00
Raoul Snyman 551a10d311 Added and updated tests:
- Refactored FirstTimeForm to use an initalise() method, in order to be more testable
- Rewrote FTW tests to test initialise()
- Refactored TestMixin get_application() to setup_application() since it doesn't actually return an application object
- Refactored ListPreviewWidget to make it more testable
- Wrote tests for ListPreviewWidget
- Refactored FormattingTagsForm somewhat
- Updated FormattingTagsForm tests

Updated setup.py with some Python3 changes.
2014-10-22 22:43:05 +02:00
Ken Roberts d08594ab55 Upstream changes 2014-10-21 18:27:01 -07:00
Tomas Groth 5662f4b2af Ask the user if a backup of the data folder should be created after upgrading
bzr-revno: 2427
2014-10-21 22:08:26 +01:00
Samuel Mehrbrodt 674cf930ef Update jQuery and jQuery Mobile
bzr-revno: 2426
2014-10-21 22:07:19 +01:00
Tomas Groth 5ecbfa61fd Fix tests so they can run individually.
Fix for importing custom tags from openlyricsxml.
Fixed console popping up on windows when running mudraw.exe.
Added oxps as supported presentation filetype (by mudraw).

bzr-revno: 2425
2014-10-21 22:06:02 +01:00
Tim Bentley d6dc19ae5e Correct Version to Mainwindow communications.
bzr-revno: 2424
2014-10-21 22:03:31 +01:00
Phill Ridout 07c693c8c8 Changed some of the comments 2014-10-21 21:08:37 +01:00
Tim Bentley 2b3e3d777e Add Test and fix more code 2014-10-21 21:05:08 +01:00
Tomas Groth cbd1b7c223 Changed setting version name 2014-10-14 09:52:59 +02:00
Samuel Mehrbrodt 806bb5973e Merge trunk 2014-10-13 19:40:12 +02:00
Tomas Groth 5091b3de37 Added a test 2014-10-13 16:08:06 +02:00
Samuel Mehrbrodt 637c0060f9 Add test 2014-10-13 13:38:13 +02:00
Ken Roberts 7545fb534f Fix changed imports in mockups 2014-10-06 14:19:08 -07:00
Phill Ridout 3ea58aa4ca change line endings 2014-10-06 20:41:29 +01:00
Ken Roberts 0227e0a2bd Initial projector code 2014-10-06 12:10:03 -07:00
Phill Ridout ddec0e00cd Patch changes from botched branch 2014-10-06 19:09:47 +01:00
Tomas Groth 2b9d36702b Added oxps as supported presentation filetype (by mudraw) 2014-09-29 21:11:07 +01:00
Tomas Groth 60dc075e3b pep8 fix 2014-09-25 21:46:09 +01:00
Tomas Groth 9b8b114a59 Fixed the new test. 2014-09-25 21:31:31 +01:00
Tomas Groth 3e66b4aa98 Fix for importing custom tags from openlyricsxml + test in progress 2014-09-25 17:01:11 +02:00
Tomas Groth 977fd1d187 Fix tests so they can run individually. 2014-09-25 16:59:56 +02:00
Tomas Groth 31a868ca61 Moved thumbnail creation to httprouter.py 2014-09-23 22:45:42 +01:00
Tomas Groth 78d9da5c26 Fix comments and typos 2014-09-22 22:19:02 +01:00
Tomas Groth 4bacaab205 trunk 2014-09-21 20:23:40 +01:00
Samuel Mehrbrodt b24ba5322b Merge trunk 2014-09-14 15:44:32 +02:00
Samuel Mehrbrodt e6a6015c21 Fix tests 2014-09-14 15:32:38 +02:00
Raoul Snyman efe030b020 Update the UI on Mac OS to make it look and feel more like a first-class Mac app.
* Removed the icons from the menus (thanks to Jonathan S. for that)
* Use Mac OS X wizards instead of our Windows-style wizards when on OS X

bzr-revno: 2419
2014-09-14 15:07:31 +02:00
Samuel Mehrbrodt aef7bb55c4 Add test 2014-09-14 00:00:43 +02:00
Tomas Groth 489f2266b2 Fix test for windows 2014-09-10 10:54:03 +02:00
Tomas Groth 74391978e8 pep8 fix 2014-09-10 10:07:10 +02:00
Tomas Groth 2e0c3e24f7 Changed thememanager test so it doesn't make the zipfile module unuseable. 2014-09-10 10:05:45 +02:00
Tomas Groth d767990280 Adjusted tests 2014-09-10 09:34:38 +02:00
Tomas Groth 3769a01682 Small fixes 2014-09-08 22:48:49 +01:00
Tomas Groth dab4ad7080 trunk 2014-09-08 22:08:49 +01:00
Raoul Snyman bf488da516 Added tests for with and without os x menu icon, renamed some tests to use our test name convention, fixed up and added more tests for the FormattingTagsForm. 2014-09-08 00:17:20 +02:00
Tomas Groth 98d5ed7acf Fix the OSIS bible importer
bzr-revno: 2418
2014-09-06 07:44:08 +01:00
Tomas Groth df28a6799b trunk 2014-09-02 21:17:56 +01:00
Jonathan Springer f3207dac8e Consolidate platform specific checks into the common module 2014-08-27 19:18:06 -04:00
Tomas Groth 7fecaa1d70 Added language detection when importing
Fixes: https://launchpad.net/bugs/1214875
2014-08-27 15:10:33 +02:00
Tomas Groth 36326085f8 trunk 2014-08-26 22:19:08 +01:00
Phill Ridout 9ca8be20fb HEAD 2014-08-26 17:09:28 +01:00
Tomas Groth c50619212d trunk 2014-08-25 21:34:54 +01:00
Tomas Groth 359a209341 Fixed copy/paste error. 2014-08-25 21:31:35 +01:00
Tomas Groth a48589752f Moved thumbnail setting into the main settingstab. 2014-08-25 21:04:33 +01:00
Tomas Groth 71a1b26e1c Changed test desciption. 2014-08-24 16:14:29 +01:00
Tomas Groth 3101d72b48 Rewrote OSIS import, added tests. 2014-08-24 15:40:45 +01:00
Tomas Groth 43d3823bfb trunk 2014-08-24 15:38:17 +01:00
Tomas Groth 254acf4601 trunk 2014-08-24 15:37:51 +01:00
Tim Bentley 2f8d8f912e Fix conversion error and add tests for service manager context menu
bzr-revno: 2412
2014-08-24 15:37:47 +01:00
Samuel Mehrbrodt c1d82bdf54 Merge trunk 2014-08-24 13:34:14 +02:00
Tim Bentley 565c2312d0 head 2014-08-24 10:37:49 +01:00
Tim Bentley 09bb622af8 Final tests 2014-08-24 10:32:26 +01:00
Tim Bentley 516fd30bc7 fix conversion bug 2014-08-23 21:42:10 +01:00
Phill Ridout a2a4e6c4c7 HEAD 2014-08-22 17:26:46 +01:00
Tomas Groth fd4dc4caf7 Fixed another windows test by properly constructing paths. 2014-08-21 15:07:02 +02:00
Tomas Groth 3a1fda85d5 Fixed windows test failure by removing special char from filenames 2014-08-21 14:51:34 +02:00
Tomas Groth 49fca807f4 deleted file leftover from merge 2014-08-21 14:41:46 +02:00
Tomas Groth 3b092319c9 trunk 2014-08-21 11:24:40 +02:00
Samuel Mehrbrodt 0bf256070a Add test 2014-08-18 21:04:46 +02:00
Tomas Groth db477f8d9c trunk 2014-08-04 18:12:03 +01:00
Stewart Becker 04bafa62fa Added an option to wrap footer text
bzr-revno: 2409
2014-08-04 06:06:34 +01:00
Samuel Mehrbrodt 16399e2ea5 This prevents updates from running (which should only run on outdated databases that existed before)
bzr-revno: 2408
2014-08-04 06:02:58 +01:00
Samuel Mehrbrodt 82b3c00863 Add importer for PresentationManager
bzr-revno: 2407
2014-08-04 06:01:41 +01:00
Samuel Mehrbrodt 933ec66efc Fix theme export and add unit test.
bzr-revno: 2406
2014-08-04 06:00:34 +01:00
Stewart Becker 2f984c45c4 Style fixes for Tim 2014-07-24 22:57:16 +01:00
Stewart Becker d90fcface2 Style fixes for Tim 2014-07-24 20:28:57 +01:00
Stewart Becker 668864c38d Tidy up tests and formatting 2014-07-22 21:06:48 +01:00
Stewart Becker 9a1ce000b7 Patch Registry.execute so that it is undoen at end of test 2014-07-21 22:45:27 +01:00
Stewart Becker 2555bc50d4 Add test for wrap footer setting 2014-07-21 18:13:20 +01:00
Phill Ridout 6a09b727b5 HEAD 2014-07-20 21:17:50 +01:00
Phill Ridout 67ab508286 Tweeked test to use a call list 2014-07-20 21:00:06 +01:00
Samuel Mehrbrodt fa5787e5d8 Add test 2014-07-17 23:16:00 +02:00
Tomas Groth a0b7c72e09 Changed Image dimension-key into width and height + a bunch of small changes 2014-07-15 20:52:59 +02:00
Tomas Groth 00693b8cce trunk 2014-07-15 15:41:34 +02:00
Tomas Groth b6cd13fc91 pep8 fixes 2014-07-15 12:02:56 +02:00
Tomas Groth e1c00f9689 Fix tests for pptview - again 2014-07-15 11:50:52 +02:00
Tomas Groth 0a018a59fb Fix tests for pptview 2014-07-15 11:45:23 +02:00
Tomas Groth 597e06153c Removed ppinterface.py, restructured test_impresscontroller.py, and small cleanup/fixes 2014-07-15 11:23:45 +02:00
Samuel Mehrbrodt d5a3651c95 Merge trunk 2014-07-14 18:48:48 +02:00
Samuel Mehrbrodt b2afbd688d Add an importer for PowerPraise
bzr-revno: 2404
2014-07-14 17:26:50 +01:00
Samuel Mehrbrodt 6c40962afb Allow editing of author types and fix bug in servicemanager
bzr-revno: 2403
2014-07-14 17:25:59 +01:00
Tomas Groth 88fc41a5eb Merged test_powerpointviewercontroller.py into test_pptviewcontroller.py 2014-07-14 16:15:08 +02:00
Tomas Groth 29f8eedeaf Merged with trunk and reverted changes to the tag test 2014-07-14 09:19:47 +02:00
Tomas Groth 022ac9bfac trunk 2014-07-14 09:08:41 +02:00
Samuel Mehrbrodt af64bece26 Improve Song Copyright
bzr-revno: 2402
2014-07-13 21:57:05 +01:00
Raoul Snyman ba9ff89354 [fix] PEP8 error: no whitespace 2014-07-13 13:04:37 +02:00
Raoul Snyman f2d3bbee47 Added the name of the current item to the service controller, and added some more tests 2014-07-13 01:47:53 +02:00
Samuel Mehrbrodt 79c5d61d94 Negative test 2014-07-12 22:00:58 +02:00
Tomas Groth 3edabb268e removed websockets 2014-07-11 22:35:23 +02:00
Tomas Groth 98a58d45bf pep8 fixes 2014-07-11 15:35:44 +02:00
Tomas Groth 52f298fdc1 change to unix style lineending 2014-07-11 14:54:00 +02:00
Tomas Groth 9d64837602 fixed image test 2014-07-11 14:43:40 +02:00
Tomas Groth 4920f86351 removed leftover file from merge 2014-07-11 14:21:49 +02:00
Tomas Groth 406cc506c1 Merged with trunk and fixed tests 2014-07-11 13:35:56 +02:00
Samuel Mehrbrodt 7f731146a3 Merge trunk 2014-07-09 14:47:29 +02:00
Samuel Mehrbrodt 79009a1a7f Add test 2014-07-09 14:41:55 +02:00
Tomas Groth e0c8709ad1 trunk 2014-07-07 19:24:23 +02:00
Tomas Groth e6f5136708 Suggested changes to tests 2014-07-07 19:22:58 +02:00
Samuel Mehrbrodt b211ddd99c Merge trunk 2014-07-07 18:21:45 +02:00
Samuel Mehrbrodt 2296be7418 Merge trunk 2014-07-07 18:16:32 +02:00
Tomas Groth 695079dd00 Improve powerpoint error handling.
bzr-revno: 2399
2014-07-07 17:10:16 +01:00
Samuel Mehrbrodt 520c251923 Cleanup: Move song import plugins into subfolder
bzr-revno: 2398
2014-07-07 17:08:32 +01:00
Tim Bentley 2770c76895 Fix setup.py for python3 to remove binary strings.
Fix desktop file
Fix issue with Theme displaying on import, theme regeneration and FTW.
Remove bogus test
Add new tests for minin.

bzr-revno: 2397
2014-07-07 17:07:04 +01:00
Samuel Mehrbrodt b7a141f75c Add Presentation Manager import
Fixes: https://launchpad.net/bugs/957017
2014-07-07 15:30:55 +02:00
Samuel Mehrbrodt 8e8288ddaa Add test 2014-07-05 22:04:17 +02:00
Samuel Mehrbrodt cfd9631d04 Parse verse names 2014-07-05 18:21:43 +02:00
Samuel Mehrbrodt 686f8d2437 More renaming 2014-07-04 11:31:06 +02:00
Tomas Groth 33e104d57d Tried to fix some linux vs windows issues. Also added a test. 2014-07-04 10:45:17 +02:00
Samuel Mehrbrodt 87eb8804de Fixes 2014-07-04 00:06:18 +02:00
Samuel Mehrbrodt 9f34552364 PowerPraise importer
Fixes: https://launchpad.net/bugs/1336929
2014-07-03 23:30:41 +02:00
Samuel Mehrbrodt c9b47e8e6f PEP8 2014-07-03 19:57:46 +02:00
Samuel Mehrbrodt 3b7d5f53ba PEP8 2014-07-03 19:57:13 +02:00
Samuel Mehrbrodt d59be6ca82 Move song import plugins to subfolder 2014-07-03 18:54:51 +02:00
Tomas Groth 79c7c58398 Added test for powerpointcontroller 2014-07-03 13:21:12 +02:00
Tim Bentley 12c8663f8e indent 2014-07-02 20:52:26 +01:00
Tim Bentley 6847ee2e37 remove bl 2014-07-02 20:47:54 +01:00
Tomas Groth 376f8f3dc7 Added test for thememanager 2014-07-02 21:18:18 +02:00
Tim Bentley f71c4cc7af remove nonvalid test 2014-07-02 19:58:52 +01:00
Tim Bentley 4ac921a2e7 tests 2014-07-02 19:38:10 +01:00
Phill Ridout 05f4f2d72e fixed tests 2014-06-30 21:54:11 +01:00
Samuel Mehrbrodt 66827a7676 Parse verse order 2014-06-26 09:58:59 +02:00
Samuel Mehrbrodt 93c3a57ea9 Add missing files 2014-06-25 17:04:28 +02:00
Samuel Mehrbrodt c3e9d0c5b3 Add test 2014-06-25 17:03:00 +02:00
Samuel Mehrbrodt aa0e1ca107 Add test 2014-06-23 15:51:56 +02:00
Tomas Groth 44eccb8360 trunk 2014-06-16 09:01:12 +02:00
Samuel Mehrbrodt d61111ab89 Add proper error messages to EasyWorship import.
Also make sure that Songs.db (lowercase ending) is also being recognized.

bzr-revno: 2394
Fixes: https://launchpad.net/bugs/1326664
2014-06-12 20:53:53 +02:00
Samuel Mehrbrodt 340857cecc Detect languages in source code folder when running from source
bzr-revno: 2393
2014-06-11 06:09:38 +01:00
Samuel Mehrbrodt 95b816c843 ProPresenter Import
bzr-revno: 2392
2014-06-11 06:08:10 +01:00
Andreas Preikschat 2791b37525 pep fixes 2014-06-10 11:48:42 +02:00
Andreas Preikschat 3235c334eb sorted imports 2014-06-10 11:42:11 +02:00
Andreas Preikschat 837d95ae41 added a test case 2014-06-10 11:39:24 +02:00
Andreas Preikschat 6d0ee83de1 moved tests 2014-06-10 11:24:50 +02:00
Samuel Mehrbrodt 543f4f37dd Add test for ProPresenter Import 2014-06-09 12:27:17 +02:00
Samuel Mehrbrodt b2e4c6f99f Add test for missing songs.mb 2014-06-09 09:55:48 +02:00
Tim Bentley 8d67406728 Fix a validation bug with presentations being loaded from services
Fix range bug stopping service items being triggered unless it was the first!

bzr-revno: 2389
2014-06-08 18:55:06 +01:00
Samuel Mehrbrodt 08e41672cb Better name for test 2014-06-08 16:27:03 +02:00
Samuel Mehrbrodt 5c90d7847e Merge trunk 2014-06-08 16:25:48 +02:00
Samuel Mehrbrodt 007e18945e Various string fixes and other tidying up
- Fix some string errors
- remove unused variable
- Fix method name
- Add setup.cfg with config for pep8 (pep8 reads this file)
- Fixed errors in translation utils

bzr-revno: 2388
2014-06-08 16:12:23 +02:00
Tim Bentley 567b3f4b57 Fix up description 2014-06-05 17:32:29 +01:00
Tim Bentley f23e603314 Fix up interface better 2014-06-05 17:25:37 +01:00
Tim Bentley 2e82d92ebc Head 2014-06-04 05:55:28 +01:00
Stewart Becker ed295d38dd Fixed a typo: load_Last_file -> load_last_file
Added tests for OpenSongImport and fixed some PEP8 issues.

bzr-revno: 2387
2014-06-04 05:54:44 +01:00
Samuel Mehrbrodt a6a43264da Merge trunk 2014-06-03 21:23:21 +02:00
Samuel Mehrbrodt 9f5895dd82 Song duplicates added when using different author types for the same author
bzr-revno: 2386
2014-06-03 17:20:46 +01:00
Tim Bentley 82f97ee736 Fix suffix error in presentation 2014-05-31 21:00:10 +01:00
Tomas Groth 13cc26f26a Support for importing Zefania bible XML format
bzr-revno: 2385
2014-05-31 07:26:25 +01:00
Samuel Mehrbrodt 50c2c9bc0e Fix bug 1316979 by changing the 'authors' relation to readonly.
bzr-revno: 2384
2014-05-31 07:17:52 +01:00
Samuel Mehrbrodt 0441f0e71b Better description 2014-05-30 19:59:11 +02:00
Samuel Mehrbrodt 873f18ad65 Add test 2014-05-22 15:48:57 +02:00
Samuel Mehrbrodt dd9d535f81 Split test in two methods 2014-05-21 21:55:16 +02:00
Tomas Groth d9c6e2a228 trunk 2014-05-21 17:56:57 +02:00
Samuel Mehrbrodt 854149408f Add test 2014-05-21 17:31:25 +02:00
Samuel Mehrbrodt 5cd2f7ebff Remove tests 2014-05-21 17:31:02 +02:00
Samuel Mehrbrodt 4fadbef196 PEP8 2014-05-21 17:22:13 +02:00
Samuel Mehrbrodt 2462fcf06e Remove test 2014-05-21 17:18:04 +02:00
Samuel Mehrbrodt d1814f05de Add test 2014-05-21 17:17:08 +02:00
Tomas Groth 7ed56225f2 trunk 2014-05-21 11:31:47 +02:00
Tomas Groth c0b167ca78 Added tests for import of OpenSong bible format 2014-05-21 11:30:36 +02:00
Tomas Groth 4039cf1103 More tests 2014-05-20 23:54:18 +02:00
Tomas Groth 58179f8d83 Tests 2014-05-20 20:41:07 +02:00
Tomas Groth 37f04c5199 Added simple tests. 2014-05-14 22:53:43 +02:00
Samuel Mehrbrodt d6afa49055 Test fixes 2014-05-13 19:52:08 +02:00
Samuel Mehrbrodt a75790d699 Indentation 2014-05-13 11:54:12 +02:00
Samuel Mehrbrodt 1804b690bd Merge trunk 2014-05-13 11:53:02 +02:00
Samuel Mehrbrodt 35e23456fe merge trunk 2014-05-13 11:50:36 +02:00
Samuel Mehrbrodt 97b603a2d6 Add test for author matching 2014-05-13 11:44:19 +02:00
Samuel Mehrbrodt b7b0176dec Cleanups 2014-05-13 11:12:07 +02:00
Samuel Mehrbrodt a1e2e92132 PEP8 2014-05-13 11:09:42 +02:00
Samuel Mehrbrodt 6eb2d4f49d Write test for adding and removing authors 2014-05-13 11:08:46 +02:00
Jonathan Springer 1cd9fff9bd Change how we define which menu items are included in the main menu on Mac OS
Change variable type to conform to expected type
Make vlcplayer stop() call asynchronous to avoid a deadlock with the UI thread
Add test for the main window function set_service_modified

bzr-revno: 2382
2014-05-11 05:45:30 +01:00
Samuel Mehrbrodt 9dd9f21135 Add an option to display the songbook in the footer
bzr-revno: 2381
2014-05-10 07:43:18 +01:00
Samuel Mehrbrodt 8592551d81 Fix SongShowPlus Import when CCLI number contains text
bzr-revno: 2380
2014-05-09 17:10:07 +01:00
Tomas Groth 45344f900d Fix for crash when importing from a EasyWorship DB that contains unexpected dataformatting
bzr-revno: 2379
2014-05-09 16:51:55 +01:00
Jonathan Springer 13b9a7de72 Add test for the main window function set_service_modified 2014-05-08 10:57:26 -04:00
Jonathan Springer 6d277ef78d Merge trunk 2014-05-07 19:52:51 -04:00
Tim Bentley c6d6be30c6 fix 2014-05-07 21:38:34 +01:00
Tim Bentley dbf2330896 head 2014-05-07 21:37:42 +01:00
Samuel Mehrbrodt 9467b06e14 Merge trunk 2014-05-07 22:31:28 +02:00
Samuel Mehrbrodt f3a86d87d4 Merge trunk 2014-05-07 22:30:52 +02:00
Stefan Strasser fb2381f11a fixed bug #1312629 Error on entering invalid character in verse-order
bzr-revno: 2377
Fixes: https://launchpad.net/bugs/1312629
2014-05-07 22:29:53 +02:00
Tim Bentley 1e6f00c2eb Add test 2014-05-07 17:05:27 +01:00
Samuel Mehrbrodt cca1ce57f3 Add test 2014-05-07 14:07:13 +02:00
Samuel Mehrbrodt 3d1cb3f383 Add test 2014-05-07 13:00:34 +02:00
Samuel Mehrbrodt ee7a8b9804 Fixes 2014-05-07 12:25:36 +02:00
Tomas Groth c7ce62bd43 Changed to ignore wrongly formatted songs. 2014-05-05 19:29:57 +02:00
Tim Bentley f21d3cfa83 fix tests 2014-05-03 20:32:19 +01:00
Samuel Mehrbrodt f60379b542 Add new test 2014-05-03 17:22:20 +02:00
Samuel Mehrbrodt b02fc541a3 Reorganize tests 2014-05-03 17:22:10 +02:00
Samuel Mehrbrodt 922bbc3b57 Typo, remove annotations 2014-05-03 12:53:51 +02:00
Samuel Mehrbrodt a98ea19306 Add test for songbook display 2014-05-03 12:42:18 +02:00
Tomas Groth 689700dd01 fixes for tests 2014-05-02 23:48:59 +02:00
Tomas Groth 5d63820b17 Added support for importing EW songs even if RTF is not escaped as espected, also fixed importing og songs with unicode in metadata.
Fixes: https://launchpad.net/bugs/1299837
2014-05-02 23:07:56 +02:00
Andreas Preikschat deff310f53 removed u' 2014-05-02 08:42:17 +02:00
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
Andreas Preikschat ff1bc31bfc - Fixed bug #1240037
- Fixed a few bugs in the CategoryActionList class (recursion, ...)
- Removed depreciated has_key() method.
- Changed behaviour of the remove() method to match the behaviour of the list.remove() method
- refactored defaultShortcuts to default_shortcuts

bzr-revno: 2373
2014-04-29 17:55:30 +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
Andreas Preikschat 911864a442 removed useless code 2014-04-26 19:31:59 +02:00
Andreas Preikschat 53c584ede4 removed print 2014-04-26 11:26:20 +02:00
Andreas Preikschat 533710fc5b blank line 2014-04-26 11:02:04 +02:00
Andreas Preikschat 6bdadff334 raise exception when item not in list 2014-04-26 11:01:12 +02:00
Andreas Preikschat aa899bfde0 fixes 2014-04-26 10:53:36 +02:00
Samuel Mehrbrodt 20f748d608 Allow authors to be tagged by their type (words music etc)
bzr-revno: 2371
2014-04-26 09:42:26 +01:00
Tim Bentley 9e8f0d82de Add icons to see the state of the remote (on / SSL / authentication)
Stop restarting the server as this crashes it and should not be common.

bzr-revno: 2370
2014-04-26 09:38:44 +01: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
Tomas Groth 074ab4b1bb Head 2014-04-22 22:18:58 +02:00
Andreas Preikschat 5a3aecf997 fixed bugs in class 2014-04-22 17:06:21 +02:00
Andreas Preikschat 1ae7c32adb fixed import 2014-04-22 12:32:02 +02:00
Andreas Preikschat 70bce87434 head 2014-04-22 12:30:43 +02:00
Andreas Preikschat 6c08a80bfd added test; refactor 2014-04-22 12:29:15 +02:00
Stewart Becker 57abcf9b40 Remebered to add the tests this time 2014-04-21 18:23:00 +01:00
Jonathan Springer 05171453ea merge trunk 2014-04-21 10:46:54 -04: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
Raoul Snyman dee8ed2850 Fix an exception raised when loading media players if the configuration is blank 2014-04-21 00:23:26 +02:00
Andreas Preikschat 328b25dbe8 fix: Bug #1146964 Attach button on exception form does not work
bzr-revno: 2368
2014-04-20 22:51:11 +02:00
Jonathan Springer c8d0efe2ea merge trunk 2014-04-20 16:19:41 -04:00
Tim Bentley f7ba5ee0e3 head 2014-04-20 21:19:21 +01: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
Tomas Groth f6231e024a Head 2014-04-20 15:57:12 +02:00
Andreas Preikschat c691fc55d0 added a test 2014-04-20 15:00:14 +02:00
Tim Bentley a2c99317c6 fixes 2014-04-19 06:42:45 +01:00
Tim Bentley f48a3346db fixes 2014-04-19 06:29:00 +01:00
Tim Bentley af792941af pep8 again 2014-04-19 06:13:46 +01:00
Tim Bentley 5dc35112c3 pep8 again 2014-04-19 06:09:54 +01:00
Samuel Mehrbrodt d3443d12c2 Remove one test for now 2014-04-17 16:32:56 +02:00
Jonathan Springer ef5b1cf4ac Revert PEP8 clean ups as they were already done in a different branch 2014-04-16 17:19:22 -04:00
Samuel Mehrbrodt 5f86811f82 Fix tests 2014-04-16 23:01:57 +02:00
Jonathan Springer b6e0aa6c2e PEP8 clean up in tests 2014-04-16 16:44:22 -04: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
Jonathan Springer f7a23737f2 merge trunk 2014-04-16 16:26:24 -04: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
Jonathan Springer cebec89556 merge trunk 2014-04-16 04:00:19 -04:00
Jonathan Springer ebc4476fdd Fixes first time wizard to use url and paths in web config file
Fixes PEP8 error in servicemanager

Add tests for first time form

bzr-revno: 2364
2014-04-16 05:49:45 +01:00
Samuel Mehrbrodt c20939215a PDF Fixes
- Changed some types to float instead of int because the string conversion failed: int('1.1') doesnt work
- Check if files exist before deleting them
- Replace 'pass' with 'continue'. 'pass' is like return, it stops the whole method.

bzr-revno: 2363
2014-04-16 05:47:04 +01:00
Samuel Mehrbrodt 49773de4f6 Fix transparent theme on OS X
Got the branch from https://code.launchpad.net/~marmyshev/openlp/bug_1117098 and fixed the tests

bzr-revno: 2362
2014-04-16 05:44:21 +01:00
Andreas Preikschat cb29c78bb0 Print repository name and revision number when using script (especially the revno is interesting for devs)
+Tell jenkins who triggered the build
+Added a blacklist for outdated tokens
+Use colours to indicate success/failure
+fixed job names

bzr-revno: 2361
2014-04-16 05:42:16 +01:00
Samuel Mehrbrodt be4a654298 More tests 2014-04-16 00:23:29 +02:00
Samuel Mehrbrodt 30ceaea2b2 Trunk 2014-04-15 23:11:06 +02:00
Samuel Mehrbrodt 5c20fbba22 Trunk 2014-04-15 22:53:58 +02:00
Samuel Mehrbrodt e1a9a36ea3 Trunk 2014-04-15 22:53:47 +02:00
Stefan Strasser db955cbf96 Some enhancements for songbeamer-import
bzr-revno: 2358
2014-04-15 22:52:14 +02:00
Jonathan Springer 721bcc20e2 Reorder imports 2014-04-15 16:51:55 -04:00
Samuel Mehrbrodt 8c18659adb Update verse order when verse names change (OpenLyrics Import)
bzr-revno: 2357
2014-04-15 22:46:54 +02:00
Andreas Preikschat dbd6d74c8d removed not wanted code 2014-04-15 22:30:20 +02:00
Andreas Preikschat 5090a014ae use self.assert and friends 2014-04-15 22:27:32 +02:00
Jonathan Springer 87e1c5d986 Add tests for First Time Wizards web config file 2014-04-15 14:44:33 -04:00
Samuel Mehrbrodt 71a972b711 Trunk 2014-04-15 10:41:13 +02:00
Samuel Mehrbrodt 4b76bfc615 Trunk 2014-04-15 10:40:40 +02:00
Samuel Mehrbrodt 4640b1b2d9 Trunk 2014-04-15 10:33:21 +02:00
Samuel Mehrbrodt 82dbb7d219 Trunk 2014-04-15 10:30:04 +02:00
Samuel Mehrbrodt ccc138413e Trunk 2014-04-15 10:15:07 +02:00
Stefan Strasser 5e1a7ce767 replaced all occurrences of the deprecated alias assertEquals() with assertEqual() 2014-04-15 07:28:51 +02:00
Samuel Mehrbrodt e7af43af4a Trunk 2014-04-14 21:46:02 +02:00
Samuel Mehrbrodt e7edaf170f Merge trunk 2014-04-14 21:44:35 +02:00
Andreas Preikschat 0c2112091d fixed spelling 2014-04-14 21:36:07 +02:00
Andreas Preikschat 8cc3f3b968 head 2014-04-14 21:02:19 +02:00
Andreas Preikschat 2c8d163b09 fixed assertion message 2014-04-14 20:59:28 +02:00
Andreas Preikschat 877fd135d3 head 2014-04-14 20:53:33 +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
Samuel Mehrbrodt 758a80a4aa Trunk 2014-04-13 13:37:11 +02:00
Samuel Mehrbrodt e0a85a668b Leading whitespace 2014-04-13 12:45:53 +02:00
Samuel Mehrbrodt f3a8c45bd2 Merge trunk 2014-04-13 12:42:57 +02:00
Raoul Snyman b9ba2c68a6 Fix up PEP8 issues. 2014-04-12 22:19:22 +02:00
Raoul Snyman 672eed037c HEAD 2014-04-12 21:48:15 +02:00
Andreas Preikschat 487f4279dd fixed blank line 2014-04-12 19:11:32 +02:00
Andreas Preikschat 321fed97e9 more output for the jenkins script 2014-04-12 18:52:29 +02:00
Andreas Preikschat 2c93a5840b head 2014-04-12 18:05:27 +02:00
Jonathan Springer 991eb6d004 Fix debug messages (bug #1170231)
bzr-revno: 2351
2014-04-12 16:43:08 +02:00
Jonathan Springer 307f46921c Merge trunk 2014-04-10 20:29:22 -04: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 ed250c400d Test 2014-04-09 13:10:18 +02:00
Samuel Mehrbrodt 31649b0a8e Better test 2014-04-08 23:20:51 +02:00
Samuel Mehrbrodt 11884adbed Disable two tests for the moment 2014-04-08 23:07:43 +02:00
Samuel Mehrbrodt bfc086749b Test 2014-04-08 23:03:04 +02:00
Jonathan Springer 25c3503397 Add test to check for proper handling of service files passed in through the command line. 2014-04-08 16:45:40 -04:00
Samuel Mehrbrodt e0c6381762 Fix test 2014-04-08 21:02:13 +02:00
Samuel Mehrbrodt 5b3a58d1d6 Add newline 2014-04-08 18:40:06 +02:00
Samuel Mehrbrodt 129f726d4c Rename method 2014-04-08 17:23:40 +02:00
Samuel Mehrbrodt 791fdba019 Fix test 2014-04-08 17:15:46 +02:00
Samuel Mehrbrodt 1bf1e79e27 Merge trunk 2014-04-08 16:58:55 +02:00
Samuel Mehrbrodt 1759c72f36 Test 2014-04-08 16:08:07 +02:00
Samuel Mehrbrodt 2b8586bf99 Test 2014-04-08 13:19:12 +02:00
Samuel Mehrbrodt b0d3b54f53 Trunk 2014-04-08 11:17:55 +02:00
Tomas Groth bc2d45fc30 Head 2014-04-05 15:27:53 +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
Raoul Snyman 8b2c2f9eef fixed a test 2014-04-04 23:12:44 +02:00
Raoul Snyman 5b69472bc2 HEAD 2014-04-04 22:31:55 +02:00
Tomas Groth 232ff2b73f Some cleanup and comments 2014-04-04 22:28:55 +02:00
Raoul Snyman d1b867988d missed the test somehow 2014-04-04 22:25:49 +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
Samuel Mehrbrodt eece90b2ec Merge trunk 2014-04-02 09:04:27 +02:00
Raoul Snyman 73941ca56f Renamed a test case and added a test for the trace_error_handler() method. 2014-04-02 01:49:58 +02:00
Andreas Preikschat 5bc5678078 - added a script to trigger jenkins
bzr-revno: 2345
2014-03-31 22:05:42 +02:00
Andreas Preikschat c451a8eafa added test 2014-03-31 19:01:09 +02:00
Andreas Preikschat 729edf1d21 pep8 failure test 2014-03-31 17:44:18 +02:00
Andreas Preikschat 4da90f0c6a comments: updated comments 2014-03-31 17:36:11 +02:00
Andreas Preikschat 3260de7b7c added another test 2014-03-31 17:31:05 +02:00
Andreas Preikschat 9dd5f30254 be a bit more talky 2014-03-31 17:24:31 +02:00
Andreas Preikschat 3f038ad5c5 break 2014-03-31 17:21:41 +02:00
Andreas Preikschat b391072e9f removed test code 2014-03-31 17:20:17 +02:00
Andreas Preikschat d77c6fe7c0 added renderer test case 2014-03-31 17:17:40 +02:00
Samuel Mehrbrodt c98970d0e4 Fix mediaitem tests 2014-03-30 20:01:03 +02:00
Tomas Groth bfbfcd5b15 Head 2014-03-30 13:26:13 +02:00
Raoul Snyman 6ad3fca88e Try to fix bug #1136278 by detecting if the upgrades have already run
bzr-revno: 2343
Fixes: https://launchpad.net/bugs/1136278
2014-03-30 13:02:25 +02:00
Raoul Snyman 3e047b3487 Fixes for inheritance in the song importers. This should make the tests pass in Python 3.4.
bzr-revno: 2342
2014-03-30 07:54:35 +01:00
Samuel Mehrbrodt 0adf961b3c Fix missing arguments in event handlers
bzr-revno: 2341
2014-03-30 07:51:35 +01:00
Raoul Snyman 98a762e86c HEAD 2014-03-29 15:58:09 +02:00
Raoul Snyman e4c3f08a2a Fix some of the tests which were failing in Python 3.4 2014-03-29 15:31:28 +02:00
Tomas Groth 19558e7a03 head 2014-03-26 19:39:54 +01:00
Samuel Mehrbrodt bf32fe164a Test 2014-03-26 13:06:48 +01:00
Tomas Groth 8ad47cb888 Fixes for windows tests and for starting OpenLP on windows. 2014-03-24 17:49:50 +01:00
Samuel Mehrbrodt 78e7cb5873 Test for add_welcome_page 2014-03-24 14:32:28 +01:00
Andreas Preikschat 11fe2045e5 fixed tests 2014-03-22 10:24:52 +01:00
Tomas Groth 852ec00fd7 Head 2014-03-20 21:11:18 +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
Raoul Snyman 35e3564655 Tests! 2014-03-18 23:03:53 +02: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
Tomas Groth 51ea57f35e Added a test for loading serviceitem with optical media item. 2014-03-17 21:59:58 +01:00
Tim Bentley 22e9d6d1a9 Head 2014-03-17 07:14:51 +00:00
Tim Bentley 9cf3428542 Head 2014-03-15 06:25:35 +00:00
Tim Bentley 85111766d5 Migrate tests and add copyright 2014-03-14 22:08:44 +00:00
Tim Bentley 1fa0d58f85 Tests 2014-03-14 20:06:24 +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 92e9ef9394 Missed one 2014-03-12 15:05:06 -04: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
Raoul Snyman 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
Raoul Snyman c607661aee HEAD 2014-03-04 23:51:54 +02:00
Raoul Snyman 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
Raoul Snyman 831f2f3b69 HEAD 2014-02-27 23:39:44 +02:00
Raoul Snyman 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
Tomas Groth e90f277bd6 merged with trunk 2014-02-21 22:48:25 +01: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
Tim Bentley 9fc4f0c339 Add Main display tests 2014-01-11 19:46:31 +00:00
Tim Bentley 75b27422ad Add renderer tests 2014-01-11 19:31:06 +00:00
Felipe Polo-Wood b58abe45b2 Added WebSocket engine 2014-01-09 14:53:56 -05:00
Felipe Polo-Wood d2782e099f Merged with Tim's refactoring changes 2014-01-09 14:52:20 -05:00
Tim Bentley 5b6663b578 basic tests 2014-01-04 17:19:30 +00:00
Tim Bentley 0da7475748 Fix up comments 2014-01-04 12:06:48 +00:00
Tim Bentley 5eba575618 Add tests for new function 2014-01-04 11:50:27 +00:00
Tim Bentley 06e68627d7 Head 2014-01-04 07:54:50 +00:00
Tim Bentley d6aa4e2299 Fix message text 2014-01-03 21:33:40 +00:00
Tim Bentley 8518207417 Fix up test failures 2014-01-01 14:59:57 +00: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
Tim Bentley e49beeb2c4 More tests 2013-12-31 07:27:07 +00:00
Tim Bentley c8a3b33044 Start to fix ServiceManager and extent tests 2013-12-30 19:50:34 +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 35c5577cb7 More fixes 2013-12-26 08:56:53 +00: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
Raoul Snyman 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
Raoul Snyman 553c93e790 Tidy up some tests 2013-12-18 23:54:56 +02:00
Raoul Snyman 06d08f61a6 Fix bug #1211049: Add a list of valid user agents and a method to return an appropriate user agent for the current platform
Fixes: https://launchpad.net/bugs/1211049
2013-12-18 23:44:00 +02:00
Tim Bentley d684359e59 Clean up exceptions used in error 2013-12-13 19:44:17 +00:00
Tim Bentley 84e90e01d1 new files 2013-12-13 18:42:26 +00: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
Tim Bentley 440cefa5f6 formatting 2013-12-06 19:09:29 +00:00
Tim Bentley d0a9423982 Head 2013-12-06 19:00:55 +00: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
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 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 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
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 946f5673ac Fixed two wrong line indentations 2013-11-01 12:07:44 -04:00
Felipe Polo-Wood 1759468ea5 - Undid superfluous line formatting 2013-11-01 11:03:43 -04: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
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
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
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
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
Andreas Preikschat ea8497d559 no need for MagicMock 2013-10-21 09:38:18 +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 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
Raoul Snyman 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
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 3503c54ce4 Some bugs and minor tweaks. 2013-09-29 23:28:53 +02:00
Raoul Snyman 16c5ded747 HEAD 2013-09-29 23:25:42 +02:00
Raoul Snyman 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
Raoul Snyman 1215494303 Updated more tests 2013-09-22 23:11:03 +02:00
Raoul Snyman 188f312669 Ooops. 2013-09-20 11:35:50 +02: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
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
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 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
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 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
Raoul Snyman 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
Raoul Snyman 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
Raoul Snyman 88e1932097 HEAD 2013-07-02 22:28:06 +02:00
Raoul Snyman 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