Merge fixed test from lp:~raoul-synman/openlp/mac_dock_fix

This commit is contained in:
Jonathan Springer 2015-04-25 18:11:48 -04:00
commit 1bd0a3190b

View File

@ -66,21 +66,24 @@ class TestInit(TestCase, TestMixin):
mocked_file_method.assert_called_once_with()
self.assertEqual(self.openlp.args[0], file_path, "The path should be in args.")
def application_activate_event_test(self):
@patch('openlp.core.is_macosx')
def application_activate_event_test(self, mocked_is_macosx):
"""
Test that clicking on the dock icon on Mac OS X restores the main window if it is minimized
"""
# GIVEN:
with patch('openlp.core.is_macosx') as mocked_is_macosx:
mocked_is_macosx.return_value = True
event = QtCore.QEvent(QtCore.QEvent.ApplicationActivate)
# GIVEN: Mac OS X and an ApplicationActivate event
mocked_is_macosx.return_value = True
event = MagicMock()
event.type.return_value = QtCore.QEvent.ApplicationActivate
mocked_main_window = MagicMock()
self.openlp.main_window = mocked_main_window
# WHEN:
result = self.openlp.event(event)
# WHEN: The icon in the dock is clicked
result = self.openlp.event(event)
# THEN:
self.assertTrue(result, "The method should have returned True.")
self.assertFalse(self.openlp.main_window.isMinimized())
# THEN:
self.assertTrue(result, "The method should have returned True.")
# self.assertFalse(self.openlp.main_window.isMinimized())
def backup_on_upgrade_first_install_test(self):
"""