Merge lp:~jonas-drange/ubuntu-system-settings/handle-ssid-bssid into lp:ubuntu-system-settings

[Jonas G. Drange]

Lets the Wi-Fi panel respond to an SSID provided by dispatcher by launching a "Connect to" dialogue.

https://code.launchpad.net/~pete-woods/indicator-network/enterprise-wifi-invokes-system-settings/+merge/263899

[lp:~jonas-drange/ubuntu-system-settings/handle-ssid-bssid]

1459. By Jonas G. Drange on 2015-07-06

rename new test classes

1460. By Jonas G. Drange on 2015-07-06

fix broken test

1461. By Jonas G. Drange on 2015-07-06

assume that pluginOptions can be absent

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1458
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/2178/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-wily-touch/267
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-wily-amd64-ci/39
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-wily-i386-ci/39
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-wily-mako/183
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/267
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/267/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/21671

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

review: Needs Fixing (continuous-integration)

[Ken VanDine (ken-vandine)]

This looks good, I tested this with:

url-dispatcher "settings:///wifi?ssid=FooBar"

Worked properly, lets make sure we don't forget to change the string after OTA-5 ships.

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1461
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/2180/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-wily-touch/272
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-wily-amd64-ci/41
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-wily-i386-ci/41
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-wily-mako/188
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/272
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/272/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/21678

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

review: Needs Fixing (continuous-integration)

[lp:~jonas-drange/ubuntu-system-settings/handle-ssid-bssid]

1462. By Jonas G. Drange on 2015-07-07

invoke dialog on pluginOptions change as well

[Pete Woods (pete-woods)]

This last change doesn't help with triggering the network quite enough. If you're triggering the same network again, I'm guessing the plugin parameters don't change. Is there not a more precise signal to fire the dialogue on, that indicates an actual incoming URI?

[Jonas G. Drange (jonas-drange)]

Maybe we unset it?

On Tuesday, 7 July 2015, Pete Woods <email address hidden> wrote:
> This last change doesn't help with triggering the network quite enough.
If you're triggering the same network again, I'm guessing the plugin
parameters don't change. Is there not a more precise signal to fire the
dialogue on, that indicates an actual incoming URI?
> --
>
https://code.launchpad.net/~jonas-drange/ubuntu-system-settings/handle-ssid-bssid/+merge/263664
> You are the owner of
lp:~jonas-drange/ubuntu-system-settings/handle-ssid-bssid.
>

=== modified file 'plugins/wifi/OtherNetwork.qml'
--- plugins/wifi/OtherNetwork.qml	2015-07-01 18:55:51 +0000
+++ plugins/wifi/OtherNetwork.qml	2015-07-08 11:49:37 +0000
@@ -31,6 +31,9 @@
         objectName: "otherNetworkDialog"
         anchorToKeyboard: true
 
+        property string ssid
+        property string bssid
+
         function settingsValid () {
             if (networkname.length === 0) {
                 return false;
@@ -80,7 +83,11 @@
             });
         }
 
-        title: i18n.tr("Connect to Hidden Network")
+        title: ssid ?
+               /* TODO(jgdx): Hack to avoid breaking string freeze. This will be
+               changed to i18n.tr("Connect to %1").arg(ssid) per spec. */
+               i18n.tr("Connect to Wi‑Fi") + " " + ssid :
+               i18n.tr("Connect to Hidden Network")
         text: feedback.enabled ? feedback.text : "";
 
         Common {
@@ -278,6 +285,7 @@
             font.bold: false
             color: Theme.palette.selected.backgroundText
             elide: Text.ElideRight
+            visible: !ssid
         }
 
         TextField {
@@ -286,6 +294,8 @@
             width: parent.width
             placeholderText: i18n.tr("SSID")
             inputMethodHints: Qt.ImhNoPredictiveText
+            visible: !ssid
+            text: ssid ? ssid : ""
             Component.onCompleted: forceActiveFocus()
         }
 
@@ -491,7 +501,7 @@
                       authList.selectedIndex === 1 ||
                       authList.selectedIndex === 3 ||
                       authList.selectedIndex === 4) &&
-                     cacertSelector.selectedIndex === 0
+                      cacertSelector.selectedIndex === 0
         }
 
         Label {

=== modified file 'plugins/wifi/PageComponent.qml'
--- plugins/wifi/PageComponent.qml	2015-05-26 15:03:02 +0000
+++ plugins/wifi/PageComponent.qml	2015-07-08 11:49:37 +0000
@@ -26,6 +26,9 @@
     id: wifibase
     objectName: "wifiPage"
     title: i18n.tr("Wi-Fi")
+    property bool wifiEnabled: actionGroup.actionObject.valid ?
+                               actionGroup.actionObject.state : false
+    property var pluginOptions
 
     UnityMenuModel {
         id: menuModel
@@ -55,13 +58,6 @@
         }
     }
 
-    // workaround of getting the following error on startup:
-    // WARNING - file:///usr/..../wifi/PageComponent.qml:24:1: QML Page: Binding loop detected for property "flickable"
-    flickable: null
-    Component.onCompleted: {
-        flickable = pageFlickable
-    }
-
     Flickable {
         id: pageFlickable
         anchors.fill: parent
@@ -140,8 +136,7 @@
             ListItem.SingleValue {
                 objectName: "connectToHiddenNetwork"
                 text: i18n.tr("Connect to hidden network…")
-                visible : (actionGroup.actionObject.valid ?
-                           actionGroup.actionObject.state : false)
+                visible : wifibase.wifiEnabled
                 onClicked: {
                     otherNetworLoader.source = "OtherNetwork.qml";
                     PopupUtils.open(otherNetworLoader.item);
@@ -159,4 +154,21 @@
                             Flickable.DragAndOvershootBounds :
                             Flickable.StopAtBounds
     }
+
+    Connections {
+        target: wifibase
+
+        function invokeWiFiConfigurationDialog () {
+            if (wifiEnabled && pluginOptions && pluginOptions['ssid']) {
+                otherNetworLoader.source = "OtherNetwork.qml";
+                PopupUtils.open(otherNetworLoader.item, wifibase, {
+                    'ssid': pluginOptions['ssid'],
+                    'bssid': pluginOptions['bssid']
+                });
+            }
+        }
+
+        onWifiEnabledChanged: invokeWiFiConfigurationDialog()
+        onPluginOptionsChanged: invokeWiFiConfigurationDialog()
+    }
 }

=== modified file 'src/qml/MainWindow.qml'
--- src/qml/MainWindow.qml	2015-02-19 07:11:47 +0000
+++ src/qml/MainWindow.qml	2015-07-08 11:49:37 +0000
@@ -62,7 +62,7 @@
         i18n.bindtextdomain("ubuntu-system-settings", i18nDirectory)
         pageStack.push(mainPage)
         if (defaultPlugin) {
-            if (!loadPluginByName(defaultPlugin))
+            if (!loadPluginByName(defaultPlugin, pluginOptions))
                 Qt.quit()
         }
     }

=== modified file 'tests/autopilot/ubuntu_system_settings/__init__.py'
--- tests/autopilot/ubuntu_system_settings/__init__.py	2015-07-03 16:08:57 +0000
+++ tests/autopilot/ubuntu_system_settings/__init__.py	2015-07-08 11:49:37 +0000
@@ -1174,12 +1174,12 @@
 
 class WifiPage(ubuntuuitoolkit.UbuntuUIToolkitCustomProxyObjectBase):
 
-    """Autopilot helper for the Sound page."""
+    """Autopilot helper for the WiFi page."""
 
     @classmethod
     def validate_dbus_object(cls, path, state):
         name = introspection.get_classname_from_path(path)
-        if name == b'ItemPage':
+        if name == b'PageComponent':
             if state['objectName'][1] == 'wifiPage':
                 return True
         return False

=== modified file 'tests/autopilot/ubuntu_system_settings/tests/__init__.py'
--- tests/autopilot/ubuntu_system_settings/tests/__init__.py	2015-07-03 16:08:57 +0000
+++ tests/autopilot/ubuntu_system_settings/tests/__init__.py	2015-07-08 11:49:37 +0000
@@ -884,8 +884,13 @@
             security=NM80211ApSecurityFlags.NM_802_11_AP_SEC_KEY_MGMT_PSK
         )
 
-        super(WifiBaseTestCase, self).setUp()
-        self.wifi_page = self.main_view.go_to_wifi_page()
+        super(WifiBaseTestCase, self).setUp(panel)
+        if panel:
+            self.wifi_page = self.main_view.wait_select_single(
+                objectName='wifiPage'
+            )
+        else:
+            self.wifi_page = self.main_view.go_to_wifi_page()
 
     def create_access_point(self, name, ssid, security=None):
         """Creates access point.
@@ -909,3 +914,14 @@
         mac = [0x00, 0x16, 0x3e, random.randint(0x00, 0x7f),
                random.randint(0x00, 0xff), random.randint(0x00, 0xff)]
         return ':'.join(map(lambda x: "%02x" % x, mac))
+
+
+class WifiWithSSIDBaseTestCase(WifiBaseTestCase):
+    """ Class for Wi-Fi settings tests launches with an SSID."""
+
+    ssid = None
+
+    def setUp(self, panel=None):
+        super(WifiWithSSIDBaseTestCase, self).setUp(
+            panel='settings:///wifi/?ssid=%s' % self.ssid
+        )

=== modified file 'tests/autopilot/ubuntu_system_settings/tests/test_wifi.py'
--- tests/autopilot/ubuntu_system_settings/tests/test_wifi.py	2015-06-26 10:49:57 +0000
+++ tests/autopilot/ubuntu_system_settings/tests/test_wifi.py	2015-07-08 11:49:37 +0000
@@ -15,7 +15,8 @@
 )
 from testtools.matchers import Equals
 from time import sleep
-from ubuntu_system_settings.tests import WifiBaseTestCase
+from ubuntu_system_settings.tests import (WifiBaseTestCase,
+                                          WifiWithSSIDBaseTestCase)
 from ubuntu_system_settings.utils.i18n import ugettext as _
 from unittest import skip
 
@@ -208,8 +209,10 @@
 
         for idx, ssid in enumerate(access_points):
             self.create_access_point('Mock_AP%d' % idx, ssid)
-            self.dbusmock.AddWiFiConnection(
-                self.device_path, 'Mock_Con%d' % idx, ssid, '')
+            self.obj_nm.AddWiFiConnection(
+                self.device_path, 'Mock_Con%d' % idx, ssid, '',
+                dbus.Dictionary(signature='sa{sv}')
+            )
 
         self.wifi_page.remove_previous_network(access_points[0],)
 
@@ -222,3 +225,28 @@
 
         # We cannot make any assertions, because connection deletion
         # is currently not supported.
+
+
+class WifiWithTestSSIDTestCase(WifiWithSSIDBaseTestCase):
+
+    ssid = 'test_ap'
+
+    def test_handle_wifi_url_with_ssid(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.main_view.wait_select_single(
+            objectName='otherNetworkDialog'
+        )
+        dialog._scroll_to_and_click = self.main_view.scroll_to_and_click
+        dialog.enter_password('abcdefgh')
+        dialog.connect()
+
+        # allow backend to set up listeners
+        sleep(0.3)
+
+        if dialog:
+            dialog.wait_until_destroyed()