Merge lp:~ahayzen/webbrowser-app/add-autopilot-multi-window-tests-001 into lp:webbrowser-app/staging

[Andrew Hayzen]

* Add test_private_download which ensures that private downloads are not available in public windows
* Add test to ensure that private tab view is shown when opening a private window
* Add test_private_window_no_history to check that navigate to pages in a private window does not add history entries
* Add switch_to_unfocused_window helper method

* Add test_private_download which ensures that private downloads are not available in public windows
* Add test to ensure that private tab view is shown when opening a private window
* Add test_private_window_no_history to check that navigate to pages in a private window does not add history entries
* Add switch_to_unfocused_window helper method

Note the switch_to_unfocused_window helper method should be the same as in the drag and drop branch (lp:~ahayzen/webbrowser-app/dnd-tabs-001)

[lp:~ahayzen/webbrowser-app/add-autopilot-multi-window-tests-001]

1556. By Andrew Hayzen on 2016-10-31

* Merge of lp:webbrowser-app/staging

1557. By Andrew Hayzen on 2016-10-31

* Add fix for history test so that it switches to the correct window

[Olivier Tilloy (osomon)]

review: Needs Fixing

[lp:~ahayzen/webbrowser-app/add-autopilot-multi-window-tests-001]

1558. By Andrew Hayzen on 2016-11-03

* Move test_private_window_uses_private_tab_view from test_site_previews.py to test_new_tab_view.py
* Fix for unused variable for pyflakes
* Remove unneeded code comment

[Andrew Hayzen (ahayzen)]

Fixed inline comments, please retest :-)

[Olivier Tilloy (osomon)]

switch_to_unfocused_window fails to focus a different window on a phone, and as a consequence the following tests reliably fail:

webbrowser_app.tests.test_history.TestHistory.test_private_window_no_history
webbrowser_app.tests.test_downloads.TestDownloads.test_private_download

They should probably be skipped on touch devices.

review: Needs Fixing

[lp:~ahayzen/webbrowser-app/add-autopilot-multi-window-tests-001]

1559. By Andrew Hayzen on 2016-11-03

* Skip test_private_window_no_history and test_private_download on non-desktop devices due to switch_to_unfocused_window not working on mobile

[Andrew Hayzen (ahayzen)]

test_private_window_no_history and test_private_download are now skipped on non-desktop devices, please retest :-)

[Olivier Tilloy (osomon)]

LGTM, thanks!

review: Approve

=== modified file 'tests/autopilot/webbrowser_app/emulators/browser.py'
--- tests/autopilot/webbrowser_app/emulators/browser.py	2016-10-13 14:36:24 +0000
+++ tests/autopilot/webbrowser_app/emulators/browser.py	2016-11-03 13:09:49 +0000
@@ -522,7 +522,9 @@
 
 class DownloadsPage(BrowserPage):
 
-    pass
+    def get_download_entries(self):
+        return sorted(self.select_many("DownloadDelegate"),
+                      key=lambda item: item.globalRect.y)
 
 
 class HistoryView(uitk.UbuntuUIToolkitCustomProxyObjectBase):

=== modified file 'tests/autopilot/webbrowser_app/tests/__init__.py'
--- tests/autopilot/webbrowser_app/tests/__init__.py	2016-09-20 21:56:25 +0000
+++ tests/autopilot/webbrowser_app/tests/__init__.py	2016-11-03 13:09:49 +0000
@@ -216,23 +216,29 @@
         self.pointing_device.click_object(bookmarks_action)
         return self.main_window.get_bookmarks_view()
 
-    def open_history(self):
-        chrome = self.main_window.chrome
+    def open_history(self, window=None):
+        if window is None:
+            window = self.main_window
+
+        chrome = window.chrome
         drawer_button = chrome.get_drawer_button()
         self.pointing_device.click_object(drawer_button)
         chrome.get_drawer()
         history_action = chrome.get_drawer_action("history")
         self.pointing_device.click_object(history_action)
-        return self.main_window.get_history_view()
-
-    def open_downloads(self):
-        chrome = self.main_window.chrome
+        return window.get_history_view()
+
+    def open_downloads(self, window=None):
+        if window is None:
+            window = self.main_window
+
+        chrome = window.chrome
         drawer_button = chrome.get_drawer_button()
         self.pointing_device.click_object(drawer_button)
         chrome.get_drawer()
         downloads_action = chrome.get_drawer_action("downloads")
         self.pointing_device.click_object(downloads_action)
-        return self.main_window.get_downloads_page()
+        return window.get_downloads_page()
 
     def assert_number_webviews_eventually(self, count):
         self.assertThat(lambda: len(self.main_window.get_webviews()),
@@ -256,6 +262,33 @@
                         os.kill(child.pid, signal)
                         break
 
+    def switch_to_unfocused_window(self, target_window,
+                                   expected_number_unfocused_windows=1):
+        try:
+            windows = [
+                window for window in self.process_manager.get_open_windows()
+                if window.application.desktop_file ==
+                "webbrowser-app.desktop" and
+                not window.is_focused
+            ]
+
+            self.assertThat(len(windows),
+                            Equals(expected_number_unfocused_windows))
+
+            # Cycle through possible windows until target gets focus
+            for window in windows:
+                window.set_focus()
+                self.assertThat(lambda: window.is_focused,
+                                Eventually(Equals(True)))
+
+                if target_window.activeFocus:
+                    break
+        except (RuntimeError, ImportError):
+            # Fallback to clicking on the window
+            self.pointing_device.click_object(target_window)
+
+        self.assertThat(target_window.activeFocus, Eventually(Equals(True)))
+
 
 class StartOpenRemotePageTestCaseBase(BrowserTestCaseBase):
 

=== modified file 'tests/autopilot/webbrowser_app/tests/test_downloads.py'
--- tests/autopilot/webbrowser_app/tests/test_downloads.py	2015-12-15 16:02:16 +0000
+++ tests/autopilot/webbrowser_app/tests/test_downloads.py	2016-11-03 13:09:49 +0000
@@ -75,3 +75,39 @@
         self.main_window.click_download_file_button()
         downloads_page = self.main_window.get_downloads_page()
         self.assertThat(downloads_page.visible, Eventually(Equals(True)))
+
+    @testtools.skipIf(model() != "Desktop",
+                      "Desktop only due to switch_to_unfocused_window")
+    def test_private_download(self):
+        self.open_new_private_window()
+
+        public_window = self.app.get_windows(incognito=False)[0]
+        private_window = self.app.get_windows(incognito=True)[0]
+        pdf_download_url = self.base_url + "/downloadpdf"
+
+        # Download pdf in private window
+        private_window.go_to_url(pdf_download_url)
+        options_dialog = private_window.get_download_options_dialog()
+        self.assertThat(options_dialog.visible, Eventually(Equals(True)))
+        private_window.click_download_file_button()
+
+        # Open downloads page in private window
+        private_downloads_page = private_window.get_downloads_page()
+        private_downloads_page.visible.wait_for(True)
+
+        # Check that there is one url in the private downloads window
+        entries = private_downloads_page.get_download_entries()
+        self.assertThat(len(entries), Equals(1))
+        self.assertThat(entries[0].url, Equals(pdf_download_url))
+        self.assertThat(entries[0].incognito, Equals(True))
+
+        # Focus public window
+        self.switch_to_unfocused_window(public_window)
+
+        # Open downloads page in public window
+        public_downloads_page = self.open_downloads(public_window)
+        public_downloads_page.visible.wait_for(True)
+
+        # Check that there are no entries in the public downloads window
+        entries = public_downloads_page.get_download_entries()
+        self.assertThat(len(entries), Equals(0))

=== modified file 'tests/autopilot/webbrowser_app/tests/test_history.py'
--- tests/autopilot/webbrowser_app/tests/test_history.py	2016-10-06 21:07:50 +0000
+++ tests/autopilot/webbrowser_app/tests/test_history.py	2016-11-03 13:09:49 +0000
@@ -18,15 +18,21 @@
 
 from testtools.matchers import EndsWith, Equals, StartsWith
 from autopilot.matchers import Eventually
+from autopilot.platform import model
 
 from webbrowser_app.tests import StartOpenRemotePageTestCaseBase
 
+import testtools
+
 
 class TestHistory(StartOpenRemotePageTestCaseBase):
 
-    def expect_history_entries(self, ordered_urls):
-        history = self.main_window.get_history_view()
-        if self.main_window.wide:
+    def expect_history_entries(self, ordered_urls, window=None):
+        if window is None:
+            window = self.main_window
+
+        history = window.get_history_view()
+        if window.wide:
             self.assertThat(lambda: len(history.get_entries()),
                             Eventually(Equals(len(ordered_urls))))
             entries = history.get_entries()
@@ -34,7 +40,7 @@
             self.assertThat(lambda: len(history.get_domain_entries()),
                             Eventually(Equals(1)))
             self.pointing_device.click_object(history.get_domain_entries()[0])
-            expanded_history = self.main_window.get_expanded_history_view()
+            expanded_history = window.get_expanded_history_view()
             self.assertThat(lambda: len(expanded_history.get_entries()),
                             Eventually(Equals(len(ordered_urls))))
             entries = expanded_history.get_entries()
@@ -125,6 +131,26 @@
         self.open_history()
         self.expect_history_entries([pushed, url, self.url])
 
+    @testtools.skipIf(model() != "Desktop",
+                      "Desktop only due to switch_to_unfocused_window")
+    def test_private_window_no_history(self):
+        self.open_new_private_window()
+
+        public_window = self.app.get_windows(incognito=False)[0]
+        private_window = self.app.get_windows(incognito=True)[0]
+
+        # Open link in private window
+        url = self.base_url + "/test2"
+        private_window.go_to_url(url)
+        private_window.wait_until_page_loaded(url)
+
+        # Focus public window
+        self.switch_to_unfocused_window(public_window)
+
+        # Check link is not in history of public window
+        self.open_history(window=public_window)
+        self.expect_history_entries([self.url], window=public_window)
+
     def test_title_correct_redirect_header(self):
         # Regression test for https://launchpad.net/bugs/1603835
         url_redirect = self.base_url + "/redirect-no-title-header"

=== modified file 'tests/autopilot/webbrowser_app/tests/test_new_tab_view.py'
--- tests/autopilot/webbrowser_app/tests/test_new_tab_view.py	2016-10-11 11:25:23 +0000
+++ tests/autopilot/webbrowser_app/tests/test_new_tab_view.py	2016-11-03 13:09:49 +0000
@@ -466,3 +466,13 @@
         self.assertThat(lambda: len(view.get_bookmarks_list()),
                         Eventually(Equals(2)))
         self.assertThat(view.get_bookmarks_list()[0].title, Equals(title))
+
+
+class TestNewTabViewPrivate(StartOpenRemotePageTestCaseBase):
+    def test_private_window_uses_private_tab_view(self):
+        self.open_new_private_window()
+
+        private_window = self.app.get_windows(incognito=True)[0]
+
+        self.assertThat(private_window.get_new_private_tab_view().visible,
+                        Eventually(Equals(True)))