1
=== modified file 'plugins/wifi/PageComponent.qml'
2
--- plugins/wifi/PageComponent.qml	2014-09-26 12:52:31 +0000
3
+++ plugins/wifi/PageComponent.qml	2014-10-22 12:52:36 +0000
4
@@ -138,6 +138,8 @@
5
138
                objectName: "connectToHiddenNetwork"
138
                objectName: "connectToHiddenNetwork"
6
139
                text: i18n.tr("Connect to hidden network…")
139
                text: i18n.tr("Connect to hidden network…")
7
140
                progression: true
140
                progression: true
8
141
                visible : (actionGroup.actionObject.valid ?
9
142
                           actionGroup.actionObject.state : false)
10
141
                onClicked: {
143
                onClicked: {
11
142
                    otherNetworLoader.source = "OtherNetwork.qml";
144
                    otherNetworLoader.source = "OtherNetwork.qml";
12
143
                    PopupUtils.open(otherNetworLoader.item);
145
                    PopupUtils.open(otherNetworLoader.item);
13
@@ -155,5 +157,4 @@
14
155
                            Flickable.DragAndOvershootBounds :
157
                            Flickable.DragAndOvershootBounds :
15
156
                            Flickable.StopAtBounds
158
                            Flickable.StopAtBounds
16
157
    }
159
    }
17
158
18
159
}
160
}
19
160
161
20
=== modified file 'tests/autopilot/ubuntu_system_settings/__init__.py'
21
--- tests/autopilot/ubuntu_system_settings/__init__.py	2014-09-26 12:52:31 +0000
22
+++ tests/autopilot/ubuntu_system_settings/__init__.py	2014-10-22 12:52:36 +0000
23
@@ -678,6 +678,40 @@
24
678
                return True
678
                return True
25
679
        return False
679
        return False
26
680
680
27
681
    @autopilot.logging.log_action(logger.debug)
28
682
    def enable_wireless(self):
29
683
        self._set_wireless(True)
30
684
31
685
    @autopilot.logging.log_action(logger.debug)
32
686
    def disable_wireless(self):
33
687
        self._set_wireless(False)
34
688
35
689
    """
36
690
    :returns: Whether or not WiFi can be used
37
691
    """
38
692
    @autopilot.logging.log_action(logger.debug)
39
693
    def have_wireless(self):
40
694
        try:
41
695
            self.wait_select_single('SwitchMenuItem', text=_('Wi-Fi'))
42
696
        except:
43
697
            return False
44
698
        return True
45
699
46
700
    """Returns the current WiFi state
47
701
48
702
    :returns: Whether or not WiFi is enabled
49
703
    """
50
704
    @autopilot.logging.log_action(logger.debug)
51
705
    def get_wireless(self):
52
706
        return self.wait_select_single(
53
707
            'SwitchMenuItem', text=_('Wi-Fi')).checked
54
708
55
709
    @autopilot.logging.log_action(logger.debug)
56
710
    def _set_wireless(self, state):
57
711
        obj = self.wait_select_single('SwitchMenuItem', text=_('Wi-Fi'))
58
712
        if obj.checked != state:
59
713
            self.pointing_device.click_object(obj)
60
714
61
681
    """Connects to hidden network
715
    """Connects to hidden network
62
682
716
63
683
    :param name: Network name string (SSID)
717
    :param name: Network name string (SSID)
64
684
718
65
=== modified file 'tests/autopilot/ubuntu_system_settings/tests/test_wifi.py'
66
--- tests/autopilot/ubuntu_system_settings/tests/test_wifi.py	2014-09-26 12:52:31 +0000
67
+++ tests/autopilot/ubuntu_system_settings/tests/test_wifi.py	2014-10-22 12:52:36 +0000
68
@@ -25,6 +25,11 @@
69
25
            Equals(_('Wi-Fi')))
25
            Equals(_('Wi-Fi')))
70
26
26
71
27
    def test_connect_to_hidden_network(self):
27
    def test_connect_to_hidden_network(self):
72
28
        if not self.wifi_page.have_wireless():
73
29
            self.skipTest('Cannot test wireless since it cannot be enabled')
74
30
        self.addCleanup(
75
31
            self.wifi_page._set_wireless, self.wifi_page.get_wireless())
76
32
        self.wifi_page.enable_wireless()
77
28
        dialog = self.wifi_page.connect_to_hidden_network(
33
        dialog = self.wifi_page.connect_to_hidden_network(
78
29
            'yeah',
34
            'yeah',
79
30
            scroll_to_and_click=self.system_settings.main_view
35
            scroll_to_and_click=self.system_settings.main_view
80
@@ -47,7 +52,11 @@
81
47
            dialog.wait_until_destroyed()
52
            dialog.wait_until_destroyed()
82
48
53
83
49
    def test_connect_to_nonexistant_hidden_network(self):
54
    def test_connect_to_nonexistant_hidden_network(self):
85
50
55
        if not self.wifi_page.have_wireless():
86
56
            self.skipTest('Cannot test wireless since it cannot be enabled')
87
57
        self.addCleanup(
88
58
            self.wifi_page._set_wireless, self.wifi_page.get_wireless())
89
59
        self.wifi_page.enable_wireless()
90
51
        dialog = self.wifi_page.connect_to_hidden_network(
60
        dialog = self.wifi_page.connect_to_hidden_network(
91
52
            'yeah',
61
            'yeah',
92
53
            scroll_to_and_click=self.system_settings.main_view
62
            scroll_to_and_click=self.system_settings.main_view
93
@@ -72,6 +81,11 @@
94
72
81
95
73
    @skip('skipped due to bug 1337556')
82
    @skip('skipped due to bug 1337556')
96
74
    def test_connect_to_hidden_network_using_secrets(self):
83
    def test_connect_to_hidden_network_using_secrets(self):
97
84
        if not self.wifi_page.have_wireless():
98
85
            self.skipTest('Cannot test wireless since it cannot be enabled')
99
86
        self.addCleanup(
100
87
            self.wifi_page._set_wireless, self.wifi_page.get_wireless())
101
88
        self.wifi_page.enable_wireless()
102
75
        dialog = self.wifi_page.connect_to_hidden_network(
89
        dialog = self.wifi_page.connect_to_hidden_network(
103
76
            'yeah', security='wpa', password='abcdefgh',
90
            'yeah', security='wpa', password='abcdefgh',
104
77
            scroll_to_and_click=self.system_settings.main_view
91
            scroll_to_and_click=self.system_settings.main_view
105
@@ -95,6 +109,11 @@
106
95
109
107
96
    @skip('skipped due to bug 1337556')
110
    @skip('skipped due to bug 1337556')
108
97
    def test_connect_to_hidden_network_using_incorrect_secrets(self):
111
    def test_connect_to_hidden_network_using_incorrect_secrets(self):
109
112
        if not self.wifi_page.have_wireless():
110
113
            self.skipTest('Cannot test wireless since it cannot be enabled')
111
114
        self.addCleanup(
112
115
            self.wifi_page._set_wireless, self.wifi_page.get_wireless())
113
116
        self.wifi_page.enable_wireless()
114
98
        dialog = self.wifi_page.connect_to_hidden_network(
117
        dialog = self.wifi_page.connect_to_hidden_network(
115
99
            'yeah', security='wpa', password='abcdefgh',
118
            'yeah', security='wpa', password='abcdefgh',
116
100
            scroll_to_and_click=self.system_settings.main_view
119
            scroll_to_and_click=self.system_settings.main_view
117
@@ -117,7 +136,11 @@
118
117
                _('Your authentication details were incorrect'))))
136
                _('Your authentication details were incorrect'))))
119
118
137
120
119
    def test_connect_to_hidden_network_then_cancel(self):
138
    def test_connect_to_hidden_network_then_cancel(self):
122
120
139
        if not self.wifi_page.have_wireless():
123
140
            self.skipTest('Cannot test wireless since it cannot be enabled')
124
141
        self.addCleanup(
125
142
            self.wifi_page._set_wireless, self.wifi_page.get_wireless())
126
143
        self.wifi_page.enable_wireless()
127
121
        dialog = self.wifi_page.connect_to_hidden_network(
144
        dialog = self.wifi_page.connect_to_hidden_network(
128
122
            'foo',
145
            'foo',
129
123
            scroll_to_and_click=self.system_settings.main_view
146
            scroll_to_and_click=self.system_settings.main_view
130
@@ -134,6 +157,18 @@
131
134
                len(self.device_mock.GetMethodCalls('Disconnect')),
157
                len(self.device_mock.GetMethodCalls('Disconnect')),
132
135
            Eventually(Equals(1)))
158
            Eventually(Equals(1)))
133
136
159
134
160
    def test_connect_to_hidden_network_dialog_visibility(self):
135
161
        if not self.wifi_page.have_wireless():
136
162
            self.skipTest('Cannot test wireless since it cannot be enabled')
137
163
        self.addCleanup(
138
164
            self.wifi_page._set_wireless, self.wifi_page.get_wireless())
139
165
        self.wifi_page.disable_wireless()
140
166
        self.assertThat(
141
167
            lambda: bool(self.wifi_page.select_single(
142
168
                '*',
143
169
                objectName='connectToHiddenNetwork').visible),
144
170
            Eventually(Equals(False)), 'other net dialog not hidden')
145
171
146
137
    """Note: this test does not actually remove previous networks from the UI.
172
    """Note: this test does not actually remove previous networks from the UI.
147
138
    The NetworkManager dbusmock template does not currently support deletion
173
    The NetworkManager dbusmock template does not currently support deletion
148
139
    of connections."""
174
    of connections."""
149
@@ -157,5 +192,7 @@
150
157
192
151
158
        self.system_settings.main_view.go_back()
193
        self.system_settings.main_view.go_back()
152
159
194
153
195
        # wait for ui to update
154
196
        sleep(2)
155
160
        self.wifi_page.remove_previous_network(
197
        self.wifi_page.remove_previous_network(
156
161
            previous_networks[2]['ssid'], scroll_to_and_click=click_method)
198
            previous_networks[2]['ssid'], scroll_to_and_click=click_method)
Reviewer	Review Type	Date Requested	Status
Ken VanDine		2014-10-20	Approve on 2014-10-30
PS Jenkins bot	continuous-integration		Needs Fixing on 2014-10-23
Review via email: mp+238922@code.launchpad.net