Fix missing format key, updated test

.coveragerc

@@ -1,5 +0,0 @@
-[run]
-source = openlp
-
-[html]
-directory = coverage

openlp/core/ui/exceptionform.py

@@ -150,7 +150,7 @@ class ExceptionForm(QtWidgets.QDialog, Ui_ExceptionDialog, RegistryProperties):
             Settings().setValue(self.settings_section + '/last directory', os.path.dirname(filename))
             opts = self._create_report()
             report_text = self.report_text.format(version=opts['version'], description=opts['description'],
-                                                  traceback=opts['traceback'], libs=ops['libs'])
+                                                  traceback=opts['traceback'], libs=opts['libs'], system=opts['system'])
             try:
                 report_file = open(filename, 'w')
                 try:

tests/functional/openlp_core_ui/test_exceptionform.py

@@ -51,16 +51,49 @@ exceptionform.VLC_VERSION = 'VLC Test'
 MAIL_ITEM_TEXT = ('**OpenLP Bug Report**\nVersion: Trunk Test\n\n--- Details of the Exception. ---\n\n'
                   'Description Test\n\n --- Exception Traceback ---\nopenlp: Traceback Test\n'
                   '--- System information ---\nPlatform: Nose Test\n\n--- Library Versions ---\n'
-                  'Python: Python Test\nQt5: Qt5 test\nPyQt5: PyQT5 Test\nQtWebkit: Webkit Test\n'
+                  'Python: Python Test\nQt5: Qt5 test\nPyQt5: PyQt5 Test\nQtWebkit: Webkit Test\n'
                   'SQLAlchemy: SqlAlchemy Test\nSQLAlchemy Migrate: Migrate Test\nBeautifulSoup: BeautifulSoup Test\n'
                   'lxml: ETree Test\nChardet: CHARDET Test\nPyEnchant: Enchant Test\nMako: Mako Test\n'
                   'pyICU: ICU Test\npyUNO bridge: UNO Bridge Test\nVLC: VLC Test\n\n')
 
 
+@patch("openlp.core.ui.exceptionform.Qt.qVersion")
+@patch("openlp.core.ui.exceptionform.QtGui.QDesktopServices.openUrl")
+@patch("openlp.core.ui.exceptionform.get_application_version")
+@patch("openlp.core.ui.exceptionform.sqlalchemy")
+@patch("openlp.core.ui.exceptionform.bs4")
+@patch("openlp.core.ui.exceptionform.etree")
+@patch("openlp.core.ui.exceptionform.is_linux")
+@patch("openlp.core.ui.exceptionform.platform.platform")
+@patch("openlp.core.ui.exceptionform.platform.python_version")
 class TestExceptionForm(TestMixin, TestCase):
     """
     Test functionality of exception form functions
     """
+    def __method_template_for_class_patches(self,
+                                            __PLACEHOLDER_FOR_LOCAL_METHOD_PATCH_DECORATORS_GO_HERE__,
+                                            mocked_python_version,
+                                            mocked_platform,
+                                            mocked_is_linux,
+                                            mocked_etree,
+                                            mocked_bs4,
+                                            mocked_sqlalchemy,
+                                            mocked_application_version,
+                                            mocked_openlurl,
+                                            mocked_qversion,
+                                            ):
+        """
+        Template so you don't have to remember the layout of class mock options for methods
+        """
+        mocked_etree.__version__ = 'ETree Test'
+        mocked_bs4.__version__ = 'BeautifulSoup Test'
+        mocked_sqlalchemy.__version__ = 'SqlAlchemy Test'
+        mocked_python_version.return_value = 'Python Test'
+        mocked_platform.return_value = 'Nose Test'
+        mocked_qversion.return_value = 'Qt5 test'
+        mocked_is_linux.return_value = False
+        mocked_application_version.return_value = 'Trunk Test'
+
     def setUp(self):
         self.setup_application()
         self.app.setApplicationVersion('0.0')
@@ -75,50 +108,46 @@ class TestExceptionForm(TestMixin, TestCase):
         if os.path.isfile(self.tempfile):
             os.remove(self.tempfile)
 
-    @patch("openlp.core.ui.exceptionform.get_application_version")
     @patch("openlp.core.ui.exceptionform.Ui_ExceptionDialog")
     @patch("openlp.core.ui.exceptionform.QtWidgets.QFileDialog")
     @patch("openlp.core.ui.exceptionform.QtCore.QUrl")
     @patch("openlp.core.ui.exceptionform.QtCore.QUrlQuery.addQueryItem")
-    @patch("openlp.core.ui.exceptionform.QtGui.QDesktopServices.openUrl")
-    @patch("openlp.core.ui.exceptionform.is_linux")
-    @patch("openlp.core.ui.exceptionform.platform.python_version")
-    @patch("openlp.core.ui.exceptionform.platform.platform")
-    @patch("openlp.core.ui.exceptionform.Qt.qVersion")
     @patch("openlp.core.ui.exceptionform.Qt")
-    @patch("openlp.core.ui.exceptionform.sqlalchemy")
-    @patch("openlp.core.ui.exceptionform.bs4")
-    @patch("openlp.core.ui.exceptionform.etree")
     def test_on_send_report_button_clicked(self,
-                                           mocked_etree,
+                                           mocked_qt,
-                                           mocked_bs4,
+                                           mocked_add_query_item,
-                                           mocked_sqlalchemy,
-                                           mocked_pyqt,
-                                           mocked_qversion,
-                                           mocked_platform,
-                                           mocked_python_version,
-                                           mocked_is_linux,
-                                           mocked_openlurl,
-                                           mocked_qurlquery,
                                            mocked_qurl,
                                            mocked_file_dialog,
                                            mocked_ui_exception_dialog,
-                                           mocked_application_version):
+                                           mocked_python_version,
+                                           mocked_platform,
+                                           mocked_is_linux,
+                                           mocked_etree,
+                                           mocked_bs4,
+                                           mocked_sqlalchemy,
+                                           mocked_application_version,
+                                           mocked_openlurl,
+                                           mocked_qversion,
+                                           ):
         """
-        Test on_send_report_button_clicked creates the proper system information text
+        Test send report  creates the proper system information text
         """
         # GIVEN: Test environment
         mocked_etree.__version__ = 'ETree Test'
         mocked_bs4.__version__ = 'BeautifulSoup Test'
         mocked_sqlalchemy.__version__ = 'SqlAlchemy Test'
-        mocked_pyqt.PYQT_VERSION_STR = 'PyQT5 Test'
         mocked_python_version.return_value = 'Python Test'
         mocked_platform.return_value = 'Nose Test'
         mocked_qversion.return_value = 'Qt5 test'
         mocked_is_linux.return_value = False
         mocked_application_version.return_value = 'Trunk Test'
+        mocked_qt.PYQT_VERSION_STR = 'PyQt5 Test'
+        mocked_is_linux.return_value = False
+        mocked_application_version.return_value = 'Trunk Test'
+
         test_form = exceptionform.ExceptionForm()
         test_form.file_attachment = None
+
         with patch.object(test_form, '_pyuno_import') as mock_pyuno:
             with patch.object(test_form.exception_text_edit, 'toPlainText') as mock_traceback:
                 with patch.object(test_form.description_text_edit, 'toPlainText') as mock_description:
@@ -129,5 +158,55 @@ class TestExceptionForm(TestMixin, TestCase):
                     # WHEN: on_save_report_button_clicked called
                     test_form.on_send_report_button_clicked()
 
-        # THEN: Verify strings were fomratted properly
+        # THEN: Verify strings were formatted properly
-        mocked_qurlquery.assert_called_with('body', MAIL_ITEM_TEXT)
+        mocked_add_query_item.assert_called_with('body', MAIL_ITEM_TEXT)
+
+    @patch("openlp.core.ui.exceptionform.QtWidgets.QFileDialog.getSaveFileName")
+    @patch("openlp.core.ui.exceptionform.Qt")
+    def test_on_save_report_button_clicked(self,
+                                           mocked_qt,
+                                           mocked_save_filename,
+                                           mocked_python_version,
+                                           mocked_platform,
+                                           mocked_is_linux,
+                                           mocked_etree,
+                                           mocked_bs4,
+                                           mocked_sqlalchemy,
+                                           mocked_application_version,
+                                           mocked_openlurl,
+                                           mocked_qversion,
+                                           ):
+        """
+        Test save report saves the correct information to a file
+        """
+        mocked_etree.__version__ = 'ETree Test'
+        mocked_bs4.__version__ = 'BeautifulSoup Test'
+        mocked_sqlalchemy.__version__ = 'SqlAlchemy Test'
+        mocked_python_version.return_value = 'Python Test'
+        mocked_platform.return_value = 'Nose Test'
+        mocked_qversion.return_value = 'Qt5 test'
+        mocked_qt.PYQT_VERSION_STR = 'PyQt5 Test'
+        mocked_is_linux.return_value = False
+        mocked_application_version.return_value = 'Trunk Test'
+        mocked_save_filename.return_value = ['testfile.txt',]
+
+        test_form = exceptionform.ExceptionForm()
+        test_form.file_attachment = None
+
+        with patch.object(test_form, '_pyuno_import') as mock_pyuno:
+            with patch.object(test_form.exception_text_edit, 'toPlainText') as mock_traceback:
+                with patch.object(test_form.description_text_edit, 'toPlainText') as mock_description:
+                    with patch("openlp.core.ui.exceptionform.open", mock_open(), create=True) as mocked_open:
+                        mock_pyuno.return_value = 'UNO Bridge Test'
+                        mock_traceback.return_value = 'openlp: Traceback Test'
+                        mock_description.return_value = 'Description Test'
+
+                        # WHEN: on_save_report_button_clicked called
+                        test_form.on_save_report_button_clicked()
+
+        # THEN: Verify proper calls to save file
+        # self.maxDiff = None
+        check_text = "call().write({text})".format(text=MAIL_ITEM_TEXT.__repr__())
+        write_text = "{text}".format(text=mocked_open.mock_calls[1])
+        mocked_open.assert_called_with('testfile.txt', 'w')
+        self.assertEquals(check_text, write_text, "Saved information should match test text")