openlp-core team mailing list archive

[Andreas Preikschat <andreaspreikschat@xxxxxxxxxx>]

Andreas Preikschat has proposed merging lp:~googol/openlp/html-clean-up into lp:openlp.

Requested reviews:
  OpenLP Core (openlp-core)

For more details, see:
https://code.launchpad.net/~googol/openlp/html-clean-up/+merge/191943

- no need for MagicMock (inside another MagicMock)
-- 
https://code.launchpad.net/~googol/openlp/html-clean-up/+merge/191943
Your team OpenLP Core is requested to review the proposed merge of lp:~googol/openlp/html-clean-up into lp:openlp.

=== modified file 'tests/functional/openlp_core_lib/test_htmlbuilder.py'
--- tests/functional/openlp_core_lib/test_htmlbuilder.py	2013-09-11 15:08:08 +0000
+++ tests/functional/openlp_core_lib/test_htmlbuilder.py	2013-10-21 07:39:30 +0000
@@ -216,9 +216,9 @@
             is_live = False
             background = None
             plugin = MagicMock()
-            plugin.get_display_css = MagicMock(return_value='plugin CSS')
-            plugin.get_display_javascript = MagicMock(return_value='plugin JS')
-            plugin.get_display_html = MagicMock(return_value='plugin HTML')
+            plugin.get_display_css.return_value = 'plugin CSS'
+            plugin.get_display_javascript.return_value = 'plugin JS'
+            plugin.get_display_html.return_value = 'plugin HTML'
             plugins = [plugin]
 
             # WHEN: Create the html.

=== modified file 'tests/interfaces/openlp_plugins/songs/forms/test_editsongform.py'
--- tests/interfaces/openlp_plugins/songs/forms/test_editsongform.py	2013-10-04 21:45:38 +0000
+++ tests/interfaces/openlp_plugins/songs/forms/test_editsongform.py	2013-10-21 07:39:30 +0000
@@ -55,9 +55,9 @@
         self.form.verse_list_widget.rowCount = MagicMock(return_value=2)
         # Mock out the verse.
         first_verse = MagicMock()
-        first_verse.data = MagicMock(return_value='V1')
+        first_verse.data.return_value = 'V1'
         second_verse = MagicMock()
-        second_verse.data = MagicMock(return_value= 'V2')
+        second_verse.data.return_value = 'V2'
         self.form.verse_list_widget.item = MagicMock(side_effect=[first_verse, second_verse])
         self.form._extract_verse_order = MagicMock(return_value=given_verse_order.split())
 
@@ -76,9 +76,9 @@
         self.form.verse_list_widget.rowCount = MagicMock(return_value=2)
         # Mock out the verse.
         first_verse = MagicMock()
-        first_verse.data = MagicMock(return_value='V1')
+        first_verse.data.return_value = 'V1'
         second_verse = MagicMock()
-        second_verse.data = MagicMock(return_value= 'V2')
+        second_verse.data.return_value = 'V2'
         self.form.verse_list_widget.item = MagicMock(side_effect=[first_verse, second_verse])
         self.form._extract_verse_order = MagicMock(return_value=[given_verse_order])
 
@@ -98,7 +98,7 @@
         self.form.verse_list_widget.rowCount = MagicMock(return_value=1)
         # Mock out the verse. (We want a verse type to be returned).
         mocked_verse = MagicMock()
-        mocked_verse.data = MagicMock(return_value='V1')
+        mocked_verse.data.return_value = 'V1'
         self.form.verse_list_widget.item = MagicMock(return_value=mocked_verse)
         self.form._extract_verse_order = MagicMock(return_value=[])
         self.form.verse_order_edit.text = MagicMock(return_value=given_verse_order)