Merge lp:~osomon/webbrowser-app/expanded-historyview-header into lp:webbrowser-app

[Olivier Tilloy]

Prevent click events from propagating through the expanded history view to the view below.

[Ugo Riboni (uriboni)]

Code LGTM, does what it says, tests pass.

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1281
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/2486/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/5316
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-amd64-ci/1240
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/1240
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/1240/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-i386-ci/1240
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-touch/4220
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/5336
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/5336/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/25402

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

review: Approve (continuous-integration)

=== modified file 'src/app/webbrowser/ExpandedHistoryView.qml'
--- src/app/webbrowser/ExpandedHistoryView.qml	2015-08-13 20:41:56 +0000
+++ src/app/webbrowser/ExpandedHistoryView.qml	2015-11-23 10:36:10 +0000
@@ -30,6 +30,12 @@
     signal historyEntryRemoved(url url)
     signal done()
 
+    MouseArea {
+        // Prevent click events from propagating through to the view below
+        anchors.fill: parent
+        acceptedButtons: Qt.AllButtons
+    }
+
     Rectangle {
         anchors.fill: parent
         color: "#f6f6f6"
@@ -73,6 +79,7 @@
 
     Item {
         id: header
+        objectName: "header"
 
         anchors {
             top: parent.top
 
=== modified file 'tests/autopilot/webbrowser_app/emulators/browser.py'
--- tests/autopilot/webbrowser_app/emulators/browser.py	2015-10-22 15:07:18 +0000
+++ tests/autopilot/webbrowser_app/emulators/browser.py	2015-11-23 10:36:10 +0000
@@ -527,6 +527,9 @@
 
 class ExpandedHistoryView(uitk.UbuntuUIToolkitCustomProxyObjectBase):
 
+    def get_header(self):
+        return self.select_single(objectName="header")
+
     def get_entries(self):
         return sorted(self.select_many("UrlDelegate",
                                        objectName="entriesDelegate"),
 
=== modified file 'tests/autopilot/webbrowser_app/tests/test_history.py'
--- tests/autopilot/webbrowser_app/tests/test_history.py	2015-08-31 09:20:40 +0000
+++ tests/autopilot/webbrowser_app/tests/test_history.py	2015-11-23 10:36:10 +0000
@@ -14,6 +14,8 @@
 # You should have received a copy of the GNU General Public License
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 
+import time
+
 from testtools.matchers import Equals
 from autopilot.matchers import Eventually
 
@@ -61,3 +63,18 @@
             delegates = expanded_history.get_entries()
             self.assertThat(sorted([delegate.url for delegate in delegates]),
                             Equals(sorted([self.url, url])))
+
+    def test_expanded_history_view_header_swallows_clicks(self):
+        # Regression test for https://launchpad.net/bugs/1518904
+        if self.main_window.wide:
+            self.skipTest("Only on narrow form factors")
+        history = self.open_history()
+        self.pointing_device.click_object(history.get_domain_entries()[0])
+        expanded_history = self.main_window.get_expanded_history_view()
+        hr = expanded_history.get_header().globalRect
+        self.pointing_device.move(hr.x + hr.width // 2, hr.y + hr.height - 5)
+        self.pointing_device.click()
+        time.sleep(1)
+        # There should be only one instance on the expanded history view.
+        # If there’s more, the following call will raise an exception.
+        self.main_window.get_expanded_history_view()