Merge lp:~uriboni/webbrowser-app/reset-focus-tab-change into lp:webbrowser-app

[Ugo Riboni]

Properly reset focus when the current tab changes (including as a result of closing tabs).

Properly reset focus on when the current tab changes (including as a result of closing tabs)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1148
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/2137/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/3854
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-amd64-ci/891
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/891
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/891/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-i386-ci/891
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/3164
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3851
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3851/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/22817

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

review: Needs Fixing (continuous-integration)

[Riccardo Padovani (rpadovani)]

lgtm, thanks for working on this :-)

review: Approve

[Olivier Tilloy (osomon)]

33 + if not self.main_window.wide:
34 + self.skipTest("Only on wide form factors")

This is not the correct check. "desktop" and wide are not equivalent. A tablet in landscape mode is a wide form factor, but it doesn’t necessarily have a physical keyboard plugged in. I am aware that this "desktop" form factor thing will break easily when we get to corner cases (tablet with a keyboard, or desktop with a touch screen, …), and this will need fixing, but for now this is what we use to identify a device that has a reasonably wide screen and a physical keyboard.

review: Needs Fixing

[lp:~uriboni/webbrowser-app/reset-focus-tab-change]

1149. By Ugo Riboni on 2015-09-01

Run the AP tests only on systems with a keyboard

1150. By Ugo Riboni on 2015-09-01

Merge changes from trunk

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1150
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/2151/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/3930
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-amd64-ci/905
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/905
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/905/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-i386-ci/905
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/3217
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3927
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3927/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/22957

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

review: Needs Fixing (continuous-integration)

[lp:~uriboni/webbrowser-app/reset-focus-tab-change]

1151. By Ugo Riboni on 2015-09-02

Merge changes from trunk

[Olivier Tilloy (osomon)]

Looks good to me now, thanks!

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1151
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/2157/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/3953/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-amd64-ci/911
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/911
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/911/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-i386-ci/911
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/3233/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3950
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3950/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/22987

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

review: Needs Fixing (continuous-integration)

=== modified file 'src/app/webbrowser/Browser.qml'
--- src/app/webbrowser/Browser.qml	2015-08-27 14:02:05 +0000
+++ src/app/webbrowser/Browser.qml	2015-09-02 08:46:05 +0000
@@ -1463,6 +1463,7 @@
             if (tab) {
                 tab.load()
             }
+            internal.resetFocus()
         }
         onCountChanged: {
             if (tabsModel.count == 0) {

=== modified file 'tests/autopilot/webbrowser_app/tests/test_tabs.py'
--- tests/autopilot/webbrowser_app/tests/test_tabs.py	2015-08-12 12:31:56 +0000
+++ tests/autopilot/webbrowser_app/tests/test_tabs.py	2015-09-02 08:46:05 +0000
@@ -18,6 +18,7 @@
 from autopilot.matchers import Eventually
 from autopilot.platform import model
 
+import testtools
 import unittest
 
 from webbrowser_app.tests import StartOpenRemotePageTestCaseBase
@@ -131,6 +132,61 @@
         self.check_current_tab(url)
 
 
[e-mail](model() != "Desktop", "on desktop only")
+class TestTabsFocus(StartOpenRemotePageTestCaseBase, TestTabsMixin):
+
+    def test_focus_on_switch(self):
+        """Test that switching between tabs correctly resets focus to the
+           webview if a page is loaded, and to the address bar if we are in
+           the new page view"""
+        address_bar = self.main_window.address_bar
+
+        self.main_window.press_key('Ctrl+T')
+        self.assertThat(address_bar.activeFocus, Eventually(Equals(True)))
+
+        self.main_window.press_key('Ctrl+Tab')
+        self.assertThat(address_bar.activeFocus, Eventually(Equals(False)))
+        webview = self.main_window.get_current_webview()
+        self.assertThat(webview.activeFocus, Eventually(Equals(True)))
+
+        self.main_window.press_key('Ctrl+Tab')
+        self.assertThat(address_bar.activeFocus, Eventually(Equals(True)))
+        webview = self.main_window.get_current_webview()
+        self.assertThat(webview.activeFocus, Eventually(Equals(False)))
+
+    def test_focus_on_close(self):
+        """Test that closing tabs correctly resets focus,
+           allowing keyboard shortcuts to work without interruption"""
+        address_bar = self.main_window.address_bar
+
+        self.main_window.press_key('Ctrl+T')
+        self.main_window.press_key('Ctrl+T')
+        url = self.base_url + "/test1"
+        self.main_window.go_to_url(url)
+        self.main_window.wait_until_page_loaded(url)
+
+        self.main_window.press_key('Ctrl+T')
+        url = self.base_url + "/test2"
+        self.main_window.go_to_url(url)
+        self.main_window.wait_until_page_loaded(url)
+        self.main_window.press_key('Ctrl+T')
+        self.main_window.press_key('Ctrl+T')
+
+        self.main_window.press_key('Ctrl+W')
+        self.assertThat(address_bar.activeFocus, Eventually(Equals(True)))
+
+        self.main_window.press_key('Ctrl+W')
+        webview = self.main_window.get_current_webview()
+        self.assertThat(webview.activeFocus, Eventually(Equals(True)))
+
+        self.main_window.press_key('Ctrl+W')
+        webview = self.main_window.get_current_webview()
+        self.assertThat(webview.activeFocus, Eventually(Equals(True)))
+
+        self.main_window.press_key('Ctrl+W')
+        self.assertThat(address_bar.activeFocus, Eventually(Equals(True)))
+
+
 class TestTabsManagement(StartOpenRemotePageTestCaseBase, TestTabsMixin):
 
     def test_open_target_blank_in_new_tab(self):