1
=== modified file 'openlp/core/ui/mainwindow.py'
2
--- openlp/core/ui/mainwindow.py	2017-01-21 20:50:30 +0000
3
+++ openlp/core/ui/mainwindow.py	2017-01-31 19:13:52 +0000
4
@@ -189,7 +189,7 @@
5
189
                                            triggers=self.service_manager_contents.on_load_service_clicked)
189
                                            triggers=self.service_manager_contents.on_load_service_clicked)
6
190
        self.file_save_item = create_action(main_window, 'fileSaveItem', icon=':/general/general_save.png',
190
        self.file_save_item = create_action(main_window, 'fileSaveItem', icon=':/general/general_save.png',
7
191
                                            can_shortcuts=True, category=UiStrings().File,
191
                                            can_shortcuts=True, category=UiStrings().File,
9
192
                                            triggers=self.service_manager_contents.save_file)
192
                                            triggers=self.service_manager_contents.decide_save_method)
10
193
        self.file_save_as_item = create_action(main_window, 'fileSaveAsItem', can_shortcuts=True,
193
        self.file_save_as_item = create_action(main_window, 'fileSaveAsItem', can_shortcuts=True,
11
194
                                               category=UiStrings().File,
194
                                               category=UiStrings().File,
12
195
                                               triggers=self.service_manager_contents.save_file_as)
195
                                               triggers=self.service_manager_contents.save_file_as)
13
196
196
14
=== modified file 'tests/functional/openlp_core_ui/test_aboutform.py'
15
--- tests/functional/openlp_core_ui/test_aboutform.py	2016-12-31 11:05:48 +0000
16
+++ tests/functional/openlp_core_ui/test_aboutform.py	2017-01-31 19:13:52 +0000
17
@@ -22,36 +22,53 @@
18
22
"""
22
"""
19
23
Package to test the openlp.core.ui.firsttimeform package.
23
Package to test the openlp.core.ui.firsttimeform package.
20
24
"""
24
"""
22
25
from unittest.mock import patch
25
from unittest import TestCase
23
26
26
24
27
from openlp.core.ui.aboutform import AboutForm
27
from openlp.core.ui.aboutform import AboutForm
25
28
28
55
29
29
from tests.functional import patch
56
30
@patch('openlp.core.ui.aboutform.get_application_version')
30
from tests.helpers.testmixin import TestMixin
57
31
def test_create_about_form(mocked_get_application_version):
31
58
32
    """
32
59
33
    Test creating an about form
33
class TestAboutForm(TestCase, TestMixin):
60
34
    """
34
61
35
    # GIVEN: An application version with a build number
35
    @patch('openlp.core.ui.aboutform.get_application_version')
62
36
    mocked_get_application_version.return_value = {'version': '3.1.1', 'build': '3000'}
36
    def test_create_about_form(self, mocked_get_application_version):
63
37
37
        """
64
38
    # WHEN: The about form is created
38
        Test creating an about form
65
39
    about_form = AboutForm(None)
39
        """
66
40
40
        # GIVEN: An application version with a build number
67
41
    # THEN: The correct version information should be in the dialog
41
        mocked_get_application_version.return_value = {'version': '3.1.1', 'build': '3000'}
68
42
    assert 'OpenLP 3.1.1 build 3000' in about_form.about_text_edit.toPlainText()
42
69
43
43
        # WHEN: The about form is created
70
44
44
        about_form = AboutForm(None)
71
45
@patch('openlp.core.ui.aboutform.webbrowser')
45
72
46
def test_on_volunteer_button_clicked(mocked_webbrowser):
46
        # THEN: The correct version information should be in the dialog
73
47
    """
47
        assert 'OpenLP 3.1.1 build 3000' in about_form.about_text_edit.toPlainText()
74
48
    Test that clicking on the "Volunteer" button opens a web page.
48
75
49
    """
49
    @patch('openlp.core.ui.aboutform.webbrowser')
76
50
    # GIVEN: A new About dialog and a mocked out webbrowser module
50
    def test_on_volunteer_button_clicked(self, mocked_webbrowser):
77
51
    about_form = AboutForm(None)
51
        """
78
52
52
        Test that clicking on the "Volunteer" button opens a web page.
79
53
    # WHEN: The "Volunteer" button is "clicked"
53
        """
80
54
    about_form.on_volunteer_button_clicked()
54
        # GIVEN: A new About dialog and a mocked out webbrowser module
81
55
55
        about_form = AboutForm(None)
82
56
    # THEN: A web browser is opened
56
83
57
    mocked_webbrowser.open_new.assert_called_with('http://openlp.org/en/contribute')
57
        # WHEN: The "Volunteer" button is "clicked"
84
58
        about_form.on_volunteer_button_clicked()
85
59
86
60
        # THEN: A web browser is opened
87
61
        mocked_webbrowser.open_new.assert_called_with('http://openlp.org/en/contribute')
88
62
89
63
    def test_about_form_date_test(self):
90
64
        """
91
65
        Test that the copyright date is included correctly
92
66
        """
93
67
        # GIVEN: A correct application date
94
68
        # WHEN: The about form is created
95
69
        about_form = AboutForm(None)
96
70
        license_text = about_form.license_text_edit.toPlainText()
97
71
98
72
        # THEN: The date should be in the text twice.
99
73
        self.assertTrue(license_text.count('2017', 0) == 2,
100
74
                        "The text string should be added twice to the license string")
Reviewer	Date Requested	Status
Tomas Groth		Approve on 2017-02-03
Raoul Snyman	2017-01-31	Approve on 2017-02-03
Review via email: mp+316049@code.launchpad.net