openlp-core team mailing list archive

[Phill <phill.ridout@xxxxxxxxx>]

Phill has proposed merging lp:~phill-ridout/openlp/1197659 into lp:openlp.

Requested reviews:
  OpenLP Core (openlp-core)
Related bugs:
  Bug #1197659 in OpenLP: "Delete button in Configure Formatting Tags gets focus"
  https://bugs.launchpad.net/openlp/+bug/1197659

For more details, see:
https://code.launchpad.net/~phill-ridout/openlp/1197659/+merge/180743

Fixes #1197659 by setting the default attribute on the save button when the tag is edited. + Test
-- 
https://code.launchpad.net/~phill-ridout/openlp/1197659/+merge/180743
Your team OpenLP Core is requested to review the proposed merge of lp:~phill-ridout/openlp/1197659 into lp:openlp.

=== modified file 'openlp/core/ui/formattingtagform.py'
--- openlp/core/ui/formattingtagform.py	2013-07-19 15:51:47 +0000
+++ openlp/core/ui/formattingtagform.py	2013-08-18 19:56:31 +0000
@@ -99,6 +99,7 @@
         has been changed.
         """
         self.save_push_button.setEnabled(True)
+        self.save_push_button.setDefault(True)
 
     def on_new_clicked(self):
         """

=== added file 'tests/functional/openlp_core_ui/test_formattingtagform.py'
--- tests/functional/openlp_core_ui/test_formattingtagform.py	1970-01-01 00:00:00 +0000
+++ tests/functional/openlp_core_ui/test_formattingtagform.py	2013-08-18 19:56:31 +0000
@@ -0,0 +1,62 @@
+"""
+Package to test the openlp.core.ui.formattingtagsform package.
+"""
+from unittest import TestCase
+
+from mock import MagicMock, patch
+
+from openlp.core.ui.formattingtagform import FormattingTagForm
+
+# TODO: Tests Still TODO
+# __init__
+# exec_
+# on_new_clicked
+# on_delete_clicked
+# on_saved_clicked
+# _reloadTable
+
+class TestFormattingTagForm(TestCase):
+    def setUp(self):
+        self.init_patcher = patch(u'openlp.core.ui.formattingtagform.FormattingTagForm.__init__')
+        self.qdialog_patcher = patch(u'openlp.core.ui.formattingtagform.QtGui.QDialog')
+        self.ui_formatting_tag_dialog_patcher = patch(u'openlp.core.ui.formattingtagform.Ui_FormattingTagDialog')
+        self.mocked_init = self.init_patcher.start()
+        self.mocked_qdialog = self.qdialog_patcher.start()
+        self.mocked_ui_formatting_tag_dialog = self.ui_formatting_tag_dialog_patcher.start()
+        self.mocked_init.return_value = None
+
+    def tearDown(self):
+        self.init_patcher.stop()
+        self.qdialog_patcher.stop()
+        self.ui_formatting_tag_dialog_patcher.stop()
+
+    def on_text_edited_test(self):
+        """
+        Test that the appropriate actions are preformed when on_text_edited is called
+        """
+
+        # GIVEN: An instance of the Formatting Tag Form and a mocked save_push_button
+        form = FormattingTagForm()
+        form.save_push_button = MagicMock()
+
+        # WHEN: on_text_edited is called with an arbitrary value
+        form.on_text_edited(u'text')
+
+        # THEN: setEnabled and setDefault should have been called on save_push_button
+        form.save_push_button.setEnabled.assert_called_with(True)
+        form.save_push_button.setDefault.assert_called_with(True)
+
+    def strip_test(self):
+        """
+        Test that the _strip strips the correct chars
+        """
+
+        # GIVEN: An instance of the Formatting Tag Form and a string containing a tag
+        form = FormattingTagForm()
+        tag = u'{tag}'
+
+        # WHEN: Calling _strip
+        result = form._strip(tag)
+
+        # THEN: The tag should be returned with the wrappers removed.
+        self.assertEqual(result, u'tag', u'FormattingTagForm._strip should return u\'tag\' when called with u\'{tag}\'')