openlp-core team mailing list archive

[Jonathan Springer <springermac@xxxxxxxxx>]

Jonathan Springer has proposed merging lp:~springermac/openlp/mac_dock_fix into lp:openlp.

Requested reviews:
  OpenLP Core (openlp-core)
Related bugs:
  Bug #1247661 in OpenLP: "Cannot restore OpenLP after minimising on OSX"
  https://bugs.launchpad.net/openlp/+bug/1247661

For more details, see:
https://code.launchpad.net/~springermac/openlp/mac_dock_fix/+merge/257470

Fix test from previous merge
-- 
Your team OpenLP Core is requested to review the proposed merge of lp:~springermac/openlp/mac_dock_fix into lp:openlp.

=== modified file 'tests/functional/test_init.py'
--- tests/functional/test_init.py	2015-04-25 14:06:32 +0000
+++ tests/functional/test_init.py	2015-04-25 22:14:44 +0000
@@ -66,21 +66,24 @@
         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)
-
-            # WHEN:
-            result = self.openlp.event(event)
-
-            # THEN:
-            self.assertTrue(result, "The method should have returned True.")
-            self.assertFalse(self.openlp.main_window.isMinimized())
+        # 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: 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())
 
     def backup_on_upgrade_first_install_test(self):
         """