Merge lp:~ken-vandine/ubuntu-system-settings/rtm-1377076 into lp:ubuntu-system-settings/rtm-14.09

[Ken VanDine]

[wifi] use actiongroup to hide "connect to other networks"

[wifi] use actiongroup to hide "connect to other networks"

[Jonas G. Drange (jonas-drange)]

WFM on both desktop and krillin

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:940
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-rtm-14.09-ci/15/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-rtm-14.09-14.09-armhf-ci/16
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-rtm-14.09-14.09-armhf-ci/16/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-rtm-14.09-ci/15/rebuild

review: Approve (continuous-integration)

[Sebastien Bacher (seb128)]

Since it was comment approved and is in vivid, changing the status

[Sebastien Bacher (seb128)]

seems like we are not doing more rtm landing, so cleaning the list a bit, that one is rather going to be including with the vivid rebase

Unmerged revisions

940. By Ken VanDine on 2014-11-18

[wifi] use actiongroup to hide "connect to other networks"

=== modified file 'plugins/wifi/PageComponent.qml'
--- plugins/wifi/PageComponent.qml	2014-09-26 12:52:31 +0000
+++ plugins/wifi/PageComponent.qml	2014-11-18 19:33:46 +0000
@@ -138,6 +138,8 @@
                 objectName: "connectToHiddenNetwork"
                 text: i18n.tr("Connect to hidden network…")
                 progression: true
+                visible : (actionGroup.actionObject.valid ?
+                           actionGroup.actionObject.state : false)
                 onClicked: {
                     otherNetworLoader.source = "OtherNetwork.qml";
                     PopupUtils.open(otherNetworLoader.item);
@@ -155,5 +157,4 @@
                             Flickable.DragAndOvershootBounds :
                             Flickable.StopAtBounds
     }
-
 }

=== modified file 'tests/autopilot/ubuntu_system_settings/__init__.py'
--- tests/autopilot/ubuntu_system_settings/__init__.py	2014-09-26 12:52:31 +0000
+++ tests/autopilot/ubuntu_system_settings/__init__.py	2014-11-18 19:33:46 +0000
@@ -678,6 +678,40 @@
                 return True
         return False
 
+    @autopilot.logging.log_action(logger.debug)
+    def enable_wireless(self):
+        self._set_wireless(True)
+
+    @autopilot.logging.log_action(logger.debug)
+    def disable_wireless(self):
+        self._set_wireless(False)
+
+    """
+    :returns: Whether or not WiFi can be used
+    """
+    @autopilot.logging.log_action(logger.debug)
+    def have_wireless(self):
+        try:
+            self.wait_select_single('SwitchMenuItem', text=_('Wi-Fi'))
+        except:
+            return False
+        return True
+
+    """Returns the current WiFi state
+
+    :returns: Whether or not WiFi is enabled
+    """
+    @autopilot.logging.log_action(logger.debug)
+    def get_wireless(self):
+        return self.wait_select_single(
+            'SwitchMenuItem', text=_('Wi-Fi')).checked
+
+    @autopilot.logging.log_action(logger.debug)
+    def _set_wireless(self, state):
+        obj = self.wait_select_single('SwitchMenuItem', text=_('Wi-Fi'))
+        if obj.checked != state:
+            self.pointing_device.click_object(obj)
+
     """Connects to hidden network
 
     :param name: Network name string (SSID)

=== modified file 'tests/autopilot/ubuntu_system_settings/tests/test_wifi.py'
--- tests/autopilot/ubuntu_system_settings/tests/test_wifi.py	2014-09-26 12:52:31 +0000
+++ tests/autopilot/ubuntu_system_settings/tests/test_wifi.py	2014-11-18 19:33:46 +0000
@@ -25,6 +25,11 @@
             Equals(_('Wi-Fi')))
 
     def test_connect_to_hidden_network(self):
+        if not self.wifi_page.have_wireless():
+            self.skipTest('Cannot test wireless since it cannot be enabled')
+        self.addCleanup(
+            self.wifi_page._set_wireless, self.wifi_page.get_wireless())
+        self.wifi_page.enable_wireless()
         dialog = self.wifi_page.connect_to_hidden_network(
             'yeah',
             scroll_to_and_click=self.system_settings.main_view
@@ -47,7 +52,11 @@
             dialog.wait_until_destroyed()
 
     def test_connect_to_nonexistant_hidden_network(self):
-
+        if not self.wifi_page.have_wireless():
+            self.skipTest('Cannot test wireless since it cannot be enabled')
+        self.addCleanup(
+            self.wifi_page._set_wireless, self.wifi_page.get_wireless())
+        self.wifi_page.enable_wireless()
         dialog = self.wifi_page.connect_to_hidden_network(
             'yeah',
             scroll_to_and_click=self.system_settings.main_view
@@ -72,6 +81,11 @@
 
     @skip('skipped due to bug 1337556')
     def test_connect_to_hidden_network_using_secrets(self):
+        if not self.wifi_page.have_wireless():
+            self.skipTest('Cannot test wireless since it cannot be enabled')
+        self.addCleanup(
+            self.wifi_page._set_wireless, self.wifi_page.get_wireless())
+        self.wifi_page.enable_wireless()
         dialog = self.wifi_page.connect_to_hidden_network(
             'yeah', security='wpa', password='abcdefgh',
             scroll_to_and_click=self.system_settings.main_view
@@ -95,6 +109,11 @@
 
     @skip('skipped due to bug 1337556')
     def test_connect_to_hidden_network_using_incorrect_secrets(self):
+        if not self.wifi_page.have_wireless():
+            self.skipTest('Cannot test wireless since it cannot be enabled')
+        self.addCleanup(
+            self.wifi_page._set_wireless, self.wifi_page.get_wireless())
+        self.wifi_page.enable_wireless()
         dialog = self.wifi_page.connect_to_hidden_network(
             'yeah', security='wpa', password='abcdefgh',
             scroll_to_and_click=self.system_settings.main_view
@@ -117,7 +136,11 @@
                 _('Your authentication details were incorrect'))))
 
     def test_connect_to_hidden_network_then_cancel(self):
-
+        if not self.wifi_page.have_wireless():
+            self.skipTest('Cannot test wireless since it cannot be enabled')
+        self.addCleanup(
+            self.wifi_page._set_wireless, self.wifi_page.get_wireless())
+        self.wifi_page.enable_wireless()
         dialog = self.wifi_page.connect_to_hidden_network(
             'foo',
             scroll_to_and_click=self.system_settings.main_view
@@ -134,6 +157,18 @@
                 len(self.device_mock.GetMethodCalls('Disconnect')),
             Eventually(Equals(1)))
 
+    def test_connect_to_hidden_network_dialog_visibility(self):
+        if not self.wifi_page.have_wireless():
+            self.skipTest('Cannot test wireless since it cannot be enabled')
+        self.addCleanup(
+            self.wifi_page._set_wireless, self.wifi_page.get_wireless())
+        self.wifi_page.disable_wireless()
+        self.assertThat(
+            lambda: bool(self.wifi_page.select_single(
+                '*',
+                objectName='connectToHiddenNetwork').visible),
+            Eventually(Equals(False)), 'other net dialog not hidden')
+
     """Note: this test does not actually remove previous networks from the UI.
     The NetworkManager dbusmock template does not currently support deletion
     of connections."""
@@ -157,5 +192,7 @@
 
         self.system_settings.main_view.go_back()
 
+        # wait for ui to update
+        sleep(2)
         self.wifi_page.remove_previous_network(
             previous_networks[2]['ssid'], scroll_to_and_click=click_method)