Merge lp:~osomon/webbrowser-app/revert-revision-1215 into lp:webbrowser-app

[Olivier Tilloy]

Revert revision 1215 as the corresponding UITK update has been reverted.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1220
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/2312/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/4486
    FAILURE: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-amd64-ci/1066/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/1066
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/1066/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-i386-ci/1066/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/3647
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4483
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4483/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/23918

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/webbrowser-app-ci/2312/rebuild

review: Needs Fixing (continuous-integration)

[Olivier Tilloy (osomon)]

Not needed any longer now that UITK has landed again.

review: Disapprove

Unmerged revisions

1220. By Olivier Tilloy on 2015-10-02

Revert revision 1215 as the corresponding UITK update has been reverted.

=== modified file 'tests/autopilot/webbrowser_app/emulators/browser.py'
--- tests/autopilot/webbrowser_app/emulators/browser.py	2015-09-29 10:59:50 +0000
+++ tests/autopilot/webbrowser_app/emulators/browser.py	2015-10-02 22:16:21 +0000
@@ -317,7 +317,7 @@
                                   objectName="bookmarkToggle")
 
     def get_find_in_page_counter(self):
-        return self.select_single(objectName="findInPageCounter")
+        return self.select_single("Label", objectName="findInPageCounter")
 
 
 class TabsBar(uitk.UbuntuUIToolkitCustomProxyObjectBase):
@@ -522,7 +522,7 @@
         return self.select_single(UrlsList, objectName="topSitesList")
 
     def get_notopsites_label(self):
-        return self.select_single(objectName="notopsites")
+        return self.select_single("Label", objectName="notopsites")
 
     def get_top_site_items(self):
         return self.get_top_sites_list().get_delegates()
@@ -658,7 +658,7 @@
 class ContextMenuBase(uitk.UbuntuUIToolkitCustomProxyObjectBase):
 
     def get_title_label(self):
-        return self.select_single(objectName="titleLabel")
+        return self.select_single("Label", objectName="titleLabel")
 
     def get_visible_actions(self):
         return self.select_many("Empty", visible=True)
 
=== added file 'tests/unittests/qml/qml_tree_helpers.js'
--- tests/unittests/qml/qml_tree_helpers.js	1970-01-01 00:00:00 +0000
+++ tests/unittests/qml/qml_tree_helpers.js	2015-10-02 22:16:21 +0000
@@ -0,0 +1,42 @@
+/*
+ * Copyright 2015 Canonical Ltd.
+ *
+ * This file is part of webbrowser-app.
+ *
+ * webbrowser-app is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * webbrowser-app is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+// Given the naming convention in QML for class names, we should
+// never have a class name with underscores in it, so the following
+// should be a safe way to remove the rest of the extra metatype
+// information produced by converting QML objects to strings.
+function qmlType(item) {
+    return String(item).split("_")[0]
+}
+
+function findDescendantsByType(item, type, list) {
+    list = list || []
+    if (qmlType(item) === type) list.push(item)
+    for (var i in item.children) {
+        findDescendantsByType(item.children[i], type, list)
+    }
+    return list
+}
+
+function findAncestorByType(item, type) {
+    while (item.parent) {
+        if (qmlType(item.parent) === type) return item.parent
+        item = item.parent
+    }
+    return null
+}
 
=== modified file 'tests/unittests/qml/tst_TabsBar.qml'
--- tests/unittests/qml/tst_TabsBar.qml	2015-10-01 19:53:14 +0000
+++ tests/unittests/qml/tst_TabsBar.qml	2015-10-02 22:16:21 +0000
@@ -21,6 +21,7 @@
 import Ubuntu.Test 1.0
 import "../../../src/app/webbrowser"
 import webbrowserapp.private 0.1
+import "qml_tree_helpers.js" as Tree
 
 Item {
     id: root
@@ -80,14 +81,36 @@
         signalName: "reload"
     }
 
+    // Ideally we would get menu items by their objectName, however they are
+    // created dynamically by the ActionSelectionPopover and the objectName
+    // of the source action is not copied to the generated item.
+    // So we first select the source Action by objectName then look for an item
+    // with the same text as the action. This is not ideal but it will work
+    // since we don't have items with the same text.
+    // https://launchpad.net/bugs/1205144 tracks the issue, and as of 2015-09-23
+    // is fixed in the vivid overlay PPA but not in wily yet.
+    function getMenuItemForAction(menu, actionName) {
+        actionName = "tab_action_" + actionName
+        var text = ""
+        var actions = menu.actions.actions
+        for (var i = 0; i < actions.length; i++) {
+            if (actions[i].objectName === actionName) {
+                text = actions[i].text
+                break
+            }
+        }
+        if (text === "") return null
+
+        var menuItems = Tree.findDescendantsByType(menu, "Label")
+        var matching = menuItems.filter(function(item) { return item.text === text })
+        if (matching.length === 0) return null
+        else return Tree.findAncestorByType(matching[0], "Empty")
+    }
+
     UbuntuTestCase {
         name: "TabsBar"
         when: windowShown
 
-        function getMenuItemForAction(menu, actionName) {
-            return findChild(menu, "tab_action_" + actionName + "_button")
-        }
-
         function clickItem(item, button) {
             if (button === undefined) button = Qt.LeftButton
             var center = centerOf(item)