OpenLP

Merge lp:~raoul-snyman/openlp/bug-1668669 into lp:openlp

  1. bug-1668669
  2. Merge into trunk
Proposed by Raoul Snyman
Status: Merged
Merged at revision: 2724
Proposed branch: lp:~raoul-snyman/openlp/bug-1668669
Merge into: lp:openlp
Diff against target: 34 lines (+15/-1)
2 files modified
openlp/core/ui/settingsdialog.py (+1/-1)
tests/functional/openlp_core_ui/test_settingsform.py (+14/-0)
To merge this branch: bzr merge lp:~raoul-snyman/openlp/bug-1668669
Reviewer Review Type Date Requested Status
Tim Bentley Approve
Review via email: mp+318698@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Tim Bentley (trb143) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'openlp/core/ui/settingsdialog.py'
--- openlp/core/ui/settingsdialog.py 2016-12-31 11:01:36 +0000
+++ openlp/core/ui/settingsdialog.py 2017-03-02 00:27:23 +0000
@@ -39,7 +39,7 @@
39 """39 """
40 settings_dialog.setObjectName('settings_dialog')40 settings_dialog.setObjectName('settings_dialog')
41 settings_dialog.setWindowIcon(build_icon(':/icon/openlp-logo.svg'))41 settings_dialog.setWindowIcon(build_icon(':/icon/openlp-logo.svg'))
42 settings_dialog.resize(800, 700)42 settings_dialog.resize(920, 625)
43 self.dialog_layout = QtWidgets.QGridLayout(settings_dialog)43 self.dialog_layout = QtWidgets.QGridLayout(settings_dialog)
44 self.dialog_layout.setObjectName('dialog_layout')44 self.dialog_layout.setObjectName('dialog_layout')
45 self.dialog_layout.setContentsMargins(8, 8, 8, 8)45 self.dialog_layout.setContentsMargins(8, 8, 8, 8)
4646
=== modified file 'tests/functional/openlp_core_ui/test_settingsform.py'
--- tests/functional/openlp_core_ui/test_settingsform.py 2016-12-31 11:01:36 +0000
+++ tests/functional/openlp_core_ui/test_settingsform.py 2017-03-02 00:27:23 +0000
@@ -151,3 +151,17 @@
151 # THEN: The general tab's cancel() method should have been called, but not the themes tab151 # THEN: The general tab's cancel() method should have been called, but not the themes tab
152 mocked_general_cancel.assert_called_with()152 mocked_general_cancel.assert_called_with()
153 self.assertEqual(0, mocked_theme_cancel.call_count, 'The Themes tab\'s cancel() should not have been called')153 self.assertEqual(0, mocked_theme_cancel.call_count, 'The Themes tab\'s cancel() should not have been called')
154
155 def test_register_post_process(self):
156 """
157 Test that the register_post_process() method works correctly
158 """
159 # GIVEN: A settings form instance
160 settings_form = SettingsForm(None)
161 fake_function = MagicMock()
162
163 # WHEN: register_post_process() is called
164 settings_form.register_post_process(fake_function)
165
166 # THEN: The fake function should be in the settings form's list
167 assert fake_function in settings_form.processes