raoul/openlp
1
0
Fork 0
forked from openlp/openlp
Code Issues Pull Requests Projects Releases Wiki Activity

no need for MagicMock (inside another MagicMock)

Browse Source 
bzr-revno: 2308
This commit is contained in:
Andreas Preikschat 2013-10-26 21:03:57 +02:00 committed by Raoul Snyman
commit 6a839dc32a
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tests/functional/openlp_core_lib/test_htmlbuilder.py
View File

@ -216,9 +216,9 @@ class Htmbuilder(TestCase):
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.

10
tests/interfaces/openlp_plugins/songs/forms/test_editsongform.py
View File

@ -55,9 +55,9 @@ class TestEditSongForm(TestCase):
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 @@ class TestEditSongForm(TestCase):
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 @@ class TestEditSongForm(TestCase):
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)