Merge lp:~uriboni/webbrowser-app/no-find-in-page-in-new-tab into lp:webbrowser-app

[Ugo Riboni]

Disable find in page when the new tab view is active.

Disable find in page when the new tab view is active

[Olivier Tilloy (osomon)]

This looks good to me. I have one minor comment, see inline.

[lp:~uriboni/webbrowser-app/no-find-in-page-in-new-tab]

1131. By Ugo Riboni on 2015-08-12

Disable the ctr+f shortcut in a better way

[Olivier Tilloy (osomon)]

Looks good to me now, thanks!

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1130
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/2076/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/3673
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-amd64-ci/830
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/830
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/830/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-i386-ci/830
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/3037
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3670
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3670/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/22515

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

review: Needs Fixing (continuous-integration)

=== modified file 'src/app/webbrowser/Browser.qml'
--- src/app/webbrowser/Browser.qml	2015-08-11 10:37:56 +0000
+++ src/app/webbrowser/Browser.qml	2015-08-12 16:43:32 +0000
@@ -104,7 +104,7 @@
             onTriggered: browser.historyModel.clearAll()
         },
         Actions.FindInPage {
-            enabled: !chrome.findInPageMode
+            enabled: !chrome.findInPageMode && !newTabViewLoader.active
             onTriggered: {
                 chrome.findInPageMode = true
                 chrome.focus = true
@@ -353,7 +353,7 @@
                     objectName: "findinpage"
                     text: i18n.tr("Find in page")
                     iconName: "search"
-                    enabled: !chrome.findInPageMode
+                    enabled: !chrome.findInPageMode && !newTabViewLoader.active
                     onTriggered: {
                         chrome.findInPageMode = true
                         chrome.focus = true
@@ -1134,7 +1134,7 @@
             PopupUtils.open(bookmarkOptionsComponent,
                             chrome.bookmarkTogglePlaceHolder,
                             {"bookmarkUrl": url,
-                             "bookmarkTitle": title}) 
+                             "bookmarkTitle": title})
         }
     }
 
@@ -1501,6 +1501,7 @@
         KeyboardShortcut {
             modifiers: Qt.ControlModifier
             key: Qt.Key_F
+            enabled: !newTabViewLoader.active
             onTriggered: {
                 chrome.findInPageMode = true
                 chrome.focus = true
 
=== modified file 'tests/autopilot/webbrowser_app/tests/test_findinpage.py'
--- tests/autopilot/webbrowser_app/tests/test_findinpage.py	2015-08-11 11:16:52 +0000
+++ tests/autopilot/webbrowser_app/tests/test_findinpage.py	2015-08-12 16:43:32 +0000
@@ -14,6 +14,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 
+from autopilot.exceptions import StateNotFoundError
 from autopilot.matchers import Eventually
 from testtools.matchers import Equals
 
@@ -154,3 +155,19 @@
         webview = self.main_window.get_current_webview()
         self.pointing_device.click_object(webview)
         self.assertThat(bar.findInPageMode, Eventually(Equals(False)))
+
+    def test_find_in_page_not_in_menu_in_new_tab(self):
+        if not self.main_window.wide:
+            self.open_tabs_view()
+        self.open_new_tab()
+
+        drawer_button = self.chrome.get_drawer_button()
+        self.pointing_device.click_object(drawer_button)
+        self.chrome.get_drawer()
+        action_missing = False
+        try:
+            self.chrome.get_drawer_action("findinpage")
+        except StateNotFoundError:
+            action_missing = True
+
+        self.assertThat(action_missing, Equals(True))
 
=== modified file 'tests/autopilot/webbrowser_app/tests/test_keyboard.py'
--- tests/autopilot/webbrowser_app/tests/test_keyboard.py	2015-08-03 09:50:38 +0000
+++ tests/autopilot/webbrowser_app/tests/test_keyboard.py	2015-08-12 16:43:32 +0000
@@ -302,3 +302,7 @@
         self.assertThat(address_bar.findInPageMode, Eventually(Equals(True)))
         self.main_window.press_key('Escape')
         self.assertThat(address_bar.findInPageMode, Eventually(Equals(False)))
+
+        self.open_new_tab()
+        self.main_window.press_key('Ctrl+F')
+        self.assertThat(address_bar.findInPageMode, Equals(False))