Changeset 14ec91c5 in sasview for src/sas/qtgui/MainWindow

Timestamp:

Feb 2, 2018 9:21:48 AM (7 years ago)

Author:

Piotr Rozyczko <rozyczko@…>

Branches:

ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc

Children:

a90c9c5

Parents:

5e66738

Message:

More code review related fixes

Location:

src/sas/qtgui/MainWindow

Files:

• GuiManager.py (modified) (1 diff)
• UnitTesting/GuiManagerTest.py (modified) (1 diff)

src/sas/qtgui/MainWindow/GuiManager.py

@@ -9 +9 @@
 from PyQt5.QtGui import *
 from PyQt5.QtCore import Qt, QLocale, QUrl
-from PyQt5.QtWebKitWidgets import QWebView
 
 from twisted.internet import reactor

src/sas/qtgui/MainWindow/UnitTesting/GuiManagerTest.py

@@ -272 +272 @@
     #### HELP ####
     # test when PyQt5 works with html
-    def notestActionDocumentation(self):
+    def testActionDocumentation(self):
         """
         Menu Help/Documentation
         """
-        #Mock the QWebView method
-        QWebView.show = MagicMock()
-
-        # Assure the filename is correct
-        self.assertIn("index.html", self.manager._helpLocation)
+        webbrowser.open = MagicMock()
 
         # Invoke the action
         self.manager.actionDocumentation()
 
-        # Check if show() got called
-        self.assertTrue(QWebView.show.called)
+        # see that webbrowser open was attempted
+        webbrowser.open.assert_called_once()
+
 
     def skip_testActionTutorial(self):