Merge lp:~osomon/webbrowser-app/fix-ap-failures-desktop-narrow into lp:webbrowser-app

[Olivier Tilloy]

Fix 3 autopilot test failures on desktop in narrow mode.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1296
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/2503/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/5572
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-amd64-ci/1257
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/1257
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/1257/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-i386-ci/1257
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-touch/4365
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/5586
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/5586/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/25775

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

review: Approve (continuous-integration)

=== modified file 'src/app/webbrowser/Browser.qml'
--- src/app/webbrowser/Browser.qml	2015-11-26 11:59:33 +0000
+++ src/app/webbrowser/Browser.qml	2015-12-03 12:08:41 +0000
@@ -1365,7 +1365,7 @@
             if (!incognito && closedTabHistory.length > 0) {
                 var tabInfo = closedTabHistory.pop()
                 var tab = session.createTabFromState(tabInfo.state)
-                internal.addTab(tab, true, tabInfo.index)
+                addTab(tab, true, tabInfo.index)
             }
         }
 
@@ -1375,7 +1375,6 @@
             } else {
                 internal.switchToTab(tabsModel.count - 1, true)
             }
-            if (recentView.visible) recentView.focus = true
         }
 
         function switchToNextTab() {
@@ -1384,7 +1383,6 @@
             } else {
                 internal.switchToTab(tabsModel.count - 1, true)
             }
-            if (recentView.visible) recentView.focus = true
         }
 
         function switchToTab(index, delayed) {
@@ -1395,7 +1393,9 @@
                 tabsModel.currentIndex = index
                 nextTabIndex = -1
                 var tab = tabsModel.currentTab
-                if (tab) {
+                if (recentView.visible) {
+                    recentView.focus = true
+                } else if (tab) {
                     if (!tab.url.toString() && !tab.initialUrl.toString() &&
                         (formFactor == "desktop")) {
                         focusAddressBar()

=== modified file 'src/app/webbrowser/tabs-model.cpp'
--- src/app/webbrowser/tabs-model.cpp	2015-09-23 16:50:21 +0000
+++ src/app/webbrowser/tabs-model.cpp	2015-12-03 12:08:41 +0000
@@ -148,7 +148,9 @@
         m_currentIndex = 0;
         Q_EMIT currentIndexChanged();
         Q_EMIT currentTabChanged();
-    } else if (index <= m_currentIndex) {
+    } else if (index == m_currentIndex) {
+        Q_EMIT currentTabChanged();
+    } else if (index < m_currentIndex) {
         // Increment the index if we are inserting items before the current index.
         m_currentIndex++;
         Q_EMIT currentIndexChanged();

=== modified file 'tests/autopilot/webbrowser_app/tests/test_tabs.py'
--- tests/autopilot/webbrowser_app/tests/test_tabs.py	2015-11-11 16:03:56 +0000
+++ tests/autopilot/webbrowser_app/tests/test_tabs.py	2015-12-03 12:08:41 +0000
@@ -282,10 +282,9 @@
 
     @testtools.skipIf(model() != "Desktop", "on desktop only")
     def test_undo_close_tab(self):
-        tabs = self.main_window.chrome.get_tabs_bar()
         url0 = self.main_window.get_current_webview().url
 
-        self.open_new_tab()
+        self.open_new_tab(open_tabs_view=not self.main_window.wide)
         url1 = self.base_url + "/tab/1"
         self.main_window.go_to_url(url1)
         self.main_window.wait_until_page_loaded(url1)
@@ -293,19 +292,19 @@
 
         # Insert a "new tab view" page in the middle, without any page loaded
         # so that we can verify that it will not be restored
-        self.open_new_tab()
+        self.open_new_tab(open_tabs_view=not self.main_window.wide)
 
-        self.open_new_tab()
+        self.open_new_tab(open_tabs_view=not self.main_window.wide)
         url2 = self.base_url + "/tab/2"
         self.main_window.go_to_url(url2)
         self.main_window.wait_until_page_loaded(url2)
         self.assert_number_webviews_eventually(4)
 
-        tabs.close_tab(3)
+        self.main_window.press_key('Ctrl+w')
         self.assert_number_webviews_eventually(3)
-        tabs.close_tab(2)
+        self.main_window.press_key('Ctrl+w')
         self.assert_number_webviews_eventually(2)
-        tabs.close_tab(1)
+        self.main_window.press_key('Ctrl+w')
         self.assert_number_webviews_eventually(1)
         self.check_current_tab(url0)
 
@@ -325,7 +324,7 @@
     @testtools.skipIf(model() != "Desktop", "on desktop only")
     def test_undo_close_tab_incognito(self):
         start_url = self.main_window.get_current_webview().url
-        self.open_new_tab()
+        self.open_new_tab(open_tabs_view=not self.main_window.wide)
         url = self.base_url + "/tab/1"
         self.main_window.go_to_url(url)
         self.main_window.wait_until_page_loaded(url)
@@ -341,7 +340,7 @@
         self.main_window.go_to_url(incognito_url)
         self.main_window.wait_until_page_loaded(incognito_url)
 
-        self.open_new_tab()
+        self.open_new_tab(open_tabs_view=not self.main_window.wide)
         self.main_window.go_to_url(incognito_url)
         self.main_window.wait_until_page_loaded(incognito_url)
         self.main_window.press_key('Ctrl+w')

=== modified file 'tests/unittests/tabs-model/tst_TabsModelTests.cpp'
--- tests/unittests/tabs-model/tst_TabsModelTests.cpp	2015-09-23 17:14:30 +0000
+++ tests/unittests/tabs-model/tst_TabsModelTests.cpp	2015-12-03 12:08:41 +0000
@@ -336,6 +336,42 @@
         QCOMPARE(model->currentTab(), tab1);
     }
 
+    void shouldUpdateCurrentTabWhenInsertingAtCurrentIndex()
+    {
+        QQuickItem* tab1 = createTab();
+        model->insert(tab1, 0);
+        QCOMPARE(model->currentIndex(), 0);
+        QCOMPARE(model->currentTab(), tab1);
+
+        QSignalSpy spytab(model, SIGNAL(currentTabChanged()));
+        QSignalSpy spyindex(model, SIGNAL(currentIndexChanged()));
+
+        QQuickItem* tab2 = createTab();
+        model->insert(tab2, 0);
+
+        QVERIFY(spyindex.isEmpty());
+        QCOMPARE(spytab.count(), 1);
+        QCOMPARE(model->currentTab(), tab2);
+    }
+
+    void shouldUpdateCurrentIndexWhenInsertingBeforeCurrentIndex()
+    {
+        model->insert(createTab(), 0);
+        model->insert(createTab(), 0);
+        model->setCurrentIndex(1);
+        QObject* current = model->currentTab();
+
+        QSignalSpy spytab(model, SIGNAL(currentTabChanged()));
+        QSignalSpy spyindex(model, SIGNAL(currentIndexChanged()));
+
+        model->insert(createTab(), 0);
+
+        QVERIFY(spytab.isEmpty());
+        QCOMPARE(spyindex.count(), 1);
+        QCOMPARE(model->currentTab(), current);
+        QCOMPARE(model->currentIndex(), 2);
+    }
+
     void shouldSetInvalidIndexWhenRemovingLastTab()
     {
         // Removing the last item should also set the current index to -1