Merge lp:~fboucault/webbrowser-app/background_open_tabs_adjacent into lp:webbrowser-app

[Florian Boucault]

Make new tabs opened in the background to be placed next to the tab opening requesting them instead of at the end of the list of tabs.

Make new tabs opened in the background to be placed next to the tab opening requesting them instead of at the end of the list of tabs.

[Olivier Tilloy (osomon)]

Can you please re-target the merge request to lp:webbrowser-app/staging?

The "Open link in new tab" and "Open link in new background tab" context menu entries should also open the new tab next to the caller (and there should be autopilot tests for those use cases).

Also, see one minor comment inline.

review: Needs Fixing

[lp:~fboucault/webbrowser-app/background_open_tabs_adjacent]

1602. By Florian Boucault on 2017-02-02

Also apply opening new tab adjacent to current tab when using the following contextual actions:
- opening a link in a new tab
- opening a link in a new background tab
- opening an image in a new tab
- opening a video in a new tab

1603. By Florian Boucault on 2017-02-02

TabsModel unit test: deallocate memory properly

1604. By Florian Boucault on 2017-02-02

Fix AP tests in narrow mode

1605. By Florian Boucault on 2017-02-15

Merged staging

1606. By Florian Boucault on 2017-02-15

Fixed AP test test_ctrl_click_open_link_in_next_tab in narrow mode

Unmerged revisions

=== modified file '.bzrignore'
--- .bzrignore	2016-11-02 21:14:28 +0000
+++ .bzrignore	2017-02-01 16:41:48 +0000
@@ -31,7 +31,6 @@
 doc/html
 click-hooks/webapp-container-hook
 click-hooks/webapp-container.hook
-setup/gui/webbrowser-app.desktop
 
 obj-*
 debian/usr.bin.webbrowser-app

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2016-10-10 16:50:59 +0000
+++ CMakeLists.txt	2017-02-01 16:41:48 +0000
@@ -62,14 +62,13 @@
 add_subdirectory(tests)
 
 # make non compiled files (QML, JS, images, etc.) visible in QtCreator
-file(GLOB NON_COMPILED_ROOT *.png .bzrignore COPYING make-snap.sh README snapcraft.yaml)
+file(GLOB NON_COMPILED_ROOT *.png .bzrignore COPYING README snapcraft.yaml)
 file(GLOB_RECURSE NON_COMPILED_SUBDIRS
      debian/*.dirs debian/*.install debian/*.lintian-overrides debian/*.manifest
      debian/compat debian/control debian/copyright debian/rules debian/source/format
      debian/tests/*
      doc/*.css doc/*.qdoc doc/*.qdocconf
      po/*.po po/*.pot
-     setup/gui/*.png setup/gui/webbrowser-app.desktop.in
      snap/webbrowser-app.launcher
      src/*.js src/*.qml src/*.sci src/README
      tests/*.py tests/*.qml)

=== removed file 'make-snap.sh'
--- make-snap.sh	2016-10-06 10:16:41 +0000
+++ make-snap.sh	1970-01-01 00:00:00 +0000
@@ -1,4 +0,0 @@
-#!/bin/sh
-SNAP_DESKTOP_FILE=setup/gui/webbrowser-app.desktop
-intltool-merge -d -u po $SNAP_DESKTOP_FILE.in $SNAP_DESKTOP_FILE
-snapcraft

=== removed directory 'setup'
=== removed directory 'setup/gui'
=== removed symlink 'setup/gui/icon.png'
=== target was u'../../webbrowser-app.png'
=== removed symlink 'setup/gui/screenshot.png'
=== target was u'../../screenshot.png'
=== removed file 'setup/gui/webbrowser-app.desktop.in'
--- setup/gui/webbrowser-app.desktop.in	2016-10-06 13:08:19 +0000
+++ setup/gui/webbrowser-app.desktop.in	1970-01-01 00:00:00 +0000
@@ -1,27 +0,0 @@
-[Desktop Entry]
-Version=1.0
-_Name=Browser
-_GenericName=Web Browser
-_Comment=Browse the World Wide Web
-_Keywords=Internet;WWW;Browser;Web;Explorer
-Type=Application
-Icon=${SNAP}/meta/gui/icon.png
-Exec=webbrowser-app %u
-Terminal=false
-Categories=Network;WebBrowser;
-MimeType=text/html;text/xml;application/xhtml+xml;x-scheme-handler/http;x-scheme-handler/https;
-X-Ubuntu-Touch=true
-X-Ubuntu-Gettext-Domain=webbrowser-app
-X-Ubuntu-Single-Instance=true
-X-Ubuntu-Default-Department-ID=web-browsers
-X-Screenshot=${SNAP}/meta/gui/screenshot.png
-X-Ubuntu-Splash-Color=#FFFFFF
-Actions=NewWindow;Incognito;
-
-[Desktop Action NewWindow]
-_Name=Open a New Window
-Exec=webbrowser-app --new-window
-
-[Desktop Action Incognito]
-_Name=Open a New Private Window
-Exec=webbrowser-app --incognito

=== modified file 'snapcraft.yaml'
--- snapcraft.yaml	2017-01-10 09:17:30 +0000
+++ snapcraft.yaml	2017-02-01 16:41:48 +0000
@@ -7,6 +7,7 @@
 apps:
   webbrowser-app:
     command: webbrowser-app.launcher
+    desktop: share/applications/webbrowser-app.desktop
     plugs:
       - browser-sandbox
       - camera
@@ -49,8 +50,10 @@
     stage-packages:
       - fonts-liberation
     after: [desktop-ubuntu-app-platform]
-    snap:
+    build-attributes: [no-system-libraries]
+    prime:
       - bin/webbrowser-app
+      - share/applications/webbrowser-app.desktop
       - share/content-hub/peers/webbrowser-app
       - share/locale
       - share/url-dispatcher/urls/webbrowser-app.url-dispatcher

=== modified file 'src/Ubuntu/Web/ua-overrides-desktop.js.in'
--- src/Ubuntu/Web/ua-overrides-desktop.js.in	2016-11-22 09:24:25 +0000
+++ src/Ubuntu/Web/ua-overrides-desktop.js.in	2017-02-01 16:41:48 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2016 Canonical Ltd.
+ * Copyright 2014-2017 Canonical Ltd.
  *
  * This file is part of webbrowser-app.
  *
@@ -18,28 +18,47 @@
 
 .pragma library
 
+// Note: when changing the value of this variable, all domains which
+// use it must be carefully tested to ensure no regression.
+var chrome_desktop_override = "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Ubuntu Chromium/${CHROMIUM_VERSION} Chrome/${CHROMIUM_VERSION} Safari/537.36";
+
 var overrides = [
-      ["^https?:\/\/.+\.google\.com\/calendar", "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 Chromium/${CHROMIUM_VERSION} Chrome/${CHROMIUM_VERSION} Safari/537.36"],
-      ["^http:\/\/chrome\.angrybirds\.com\/", "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 Chrome/${CHROMIUM_VERSION} Safari/537.36"], // http://pad.lv/1284158
-      ["^https?:\/\/(www\.)?youtube\.com\/", "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 Chrome/${CHROMIUM_VERSION} Safari/537.36"], // http://pad.lv/1412880
-      ["^https?:\/\/(www\.)?google\..+\/maps", "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 Chrome/${CHROMIUM_VERSION} Safari/537.36"], // http://pad.lv/1503506, http://pad.lv/1551649
-      ["^https?:\/\/mail\.google\.com\/", "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 Chrome/${CHROMIUM_VERSION} Safari/537.36"], // http://pad.lv/1452616
-      ["^https?:\/\/mobile\.twitter\.com\/", "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 Chrome/${CHROMIUM_VERSION} Safari/537.36"], // http://pad.lv/1577834
-
-      // Google hangouts (https://launchpad.net/bugs/1565055)
-      ["^https?:\/\/hangouts\.google\.com\/", "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 Chrome/${CHROMIUM_VERSION} Safari/537.36"],
-      ["^https?:\/\/talkgadget\.google\.com\/hangouts\/", "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 Chrome/${CHROMIUM_VERSION} Safari/537.36"],
-      ["^https?:\/\/plus\.google\.com\/hangouts\/", "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 Chrome/${CHROMIUM_VERSION} Safari/537.36"],
-
-      // Google recaptcha (https://launchpad.net/bugs/1599146)
-      ["^https:\/\/www\.google\.com\/recaptcha\/", "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 Chrome/${CHROMIUM_VERSION} Safari/537.36"],
-
-      // ESPN websites (https://launchpad.net/bugs/1637285)
-      ["^https?:\/\/(.+\.)?espn(fc)?\.co(m|\.uk)\/", "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 Chrome/${CHROMIUM_VERSION} Safari/537.36"],
-
-      // meet.jit.si (https://launchpad.net/bugs/1635971)
-      ["^https:\/\/meet\.jit\.si\/", "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 Chrome/${CHROMIUM_VERSION} Safari/537.36"],
-
-      // Google docs (https://launchpad.net/bugs/1643386)
-      ["^https:\/\/(docs|drive)\.google\.com\/", "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 Chrome/${CHROMIUM_VERSION} Safari/537.36"],
+    // Google calendar
+    ["^https:\/\/calendar\.google\.com\/", chrome_desktop_override],
+    ["^https:\/\/.+\.google\.com\/calendar\/", chrome_desktop_override],
+
+    // Youtube (https://launchpad.net/bugs/1412880)
+    ["^https:\/\/(www\.)?youtube\.com\/", chrome_desktop_override],
+
+    // Google maps (https://launchpad.net/bugs/1503506, https://launchpad.net/bugs/1551649)
+    ["^https:\/\/(www\.)?google\..+\/maps", chrome_desktop_override],
+
+    // Gmail (https://launchpad.net/bugs/1452616)
+    ["^https:\/\/mail\.google\.com\/", chrome_desktop_override],
+
+    // Google docs (https://launchpad.net/bugs/1643386)
+    ["^https:\/\/(docs|drive)\.google\.com\/", chrome_desktop_override],
+
+    // Google plus (https://launchpad.net/bugs/1656310)
+    ["^https:\/\/plus\.google\.com\/", chrome_desktop_override],
+
+    // Google hangouts (https://launchpad.net/bugs/1565055)
+    ["^https:\/\/hangouts\.google\.com\/", chrome_desktop_override],
+    ["^https:\/\/talkgadget\.google\.com\/hangouts\/", chrome_desktop_override],
+    ["^https:\/\/plus\.google\.com\/hangouts\/", chrome_desktop_override],
+
+    // Google recaptcha (https://launchpad.net/bugs/1599146)
+    ["^https:\/\/www\.google\.com\/recaptcha\/", chrome_desktop_override],
+
+    // (mobile) twitter (https://launchpad.net/bugs/1577834)
+    ["^https:\/\/mobile\.twitter\.com\/", chrome_desktop_override],
+
+    // meet.jit.si (https://launchpad.net/bugs/1635971)
+    ["^https:\/\/meet\.jit\.si\/", chrome_desktop_override],
+
+    // ESPN websites (https://launchpad.net/bugs/1637285)
+    ["^https?:\/\/(.+\.)?espn(fc)?\.co(m|\.uk)\/", chrome_desktop_override],
+
+    // Ebay (https://launchpad.net/bugs/1575780)
+    ["^https?:\/\/(.+\.)?ebay\.(at|be|ca|ch|cn|co\.jp|co\.th|co\.uk|com|com\.au|com\.hk|com\.my|com\.sg|com\.tw|de|es|fr|ie|in|it|nl|ph|pl|se|vn)\/", chrome_desktop_override],
 ];

=== modified file 'src/Ubuntu/Web/ua-overrides-mobile.js.in'
--- src/Ubuntu/Web/ua-overrides-mobile.js.in	2016-10-27 17:18:23 +0000
+++ src/Ubuntu/Web/ua-overrides-mobile.js.in	2017-02-01 16:41:48 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2016 Canonical Ltd.
+ * Copyright 2014-2017 Canonical Ltd.
  *
  * This file is part of webbrowser-app.
  *
@@ -18,24 +18,46 @@
 
 .pragma library
 
+// Note: when changing the values of these variables, all domains which
+// use them must be carefully tested to ensure no regression.
+var android_no_device_override = "Mozilla/5.0 (Linux; Android 5.0;) AppleWebKit/537.36 Chrome/${CHROMIUM_VERSION} Mobile Safari/537.36";
+var nexus5_override = "Mozilla/5.0 (Linux; Ubuntu @UBUNTU_VERSION@; Android 5.0; Nexus 5) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/${CHROMIUM_VERSION} Mobile Safari/537.36";
+var ubuntu_like_android_override = "Mozilla/5.0 (Linux; Ubuntu @UBUNTU_VERSION@ like Android 5.0;) AppleWebKit/537.36 Chrome/${CHROMIUM_VERSION} Mobile Safari/537.36";
+var no_android_token = "Mozilla/5.0 (Linux; Ubuntu @UBUNTU_VERSION@;) AppleWebKit/537.36 Chrome/${CHROMIUM_VERSION} Mobile Safari/537.36";
+
 var overrides = [
-    ["^https?:\/\/mail\.google\.com\/", "Mozilla/5.0 (Linux; Android 5.0;) AppleWebKit/537.36 Chrome/${CHROMIUM_VERSION} Mobile Safari/537.36"], // http://pad.lv/1375889
-    ["^https?:\/\/(www|m)\.youtube\.com\/", "Mozilla/5.0 (Linux; Android 5.0;) AppleWebKit/537.36 Chrome/${CHROMIUM_VERSION} Mobile Safari/537.36"], // http://pad.lv/1228415, http://pad.lv/1415107, http://pad.lv/1417258, http://pad.lv/1499394, http://pad.lv/1408760, http://pad.lv/1437485
-    ["^http:\/\/chrome\.angrybirds\.com\/", "Mozilla/5.0 (Linux; Ubuntu @UBUNTU_VERSION@ like Android 4.4;) AppleWebKit/537.36 Chrome/${CHROMIUM_VERSION} Mobile Safari/537.36"], // http://pad.lv/1284158
-    ["^https?:\/\/(\w+\.)*hsbc\.com\.br\/", "Mozilla/5.0 (Linux; Ubuntu @UBUNTU_VERSION@ like Android 4.4;) AppleWebKit/537.36 Chrome/${CHROMIUM_VERSION} Mobile Safari/537.36"], // http://pad.lv/1380657
-    ["^http:\/\/(\w+\.)*espn\.(go\.)?com\/", "Mozilla/5.0 (Linux; Ubuntu @UBUNTU_VERSION@ like Android 4.4;) AppleWebKit/537.36 Chrome/${CHROMIUM_VERSION} Mobile Safari/537.36"], // http://pad.lv/1316259
-    ["^https?:\/\/(www|m)\.facebook\.com\/", "Mozilla/5.0 (Linux; Ubuntu @UBUNTU_VERSION@; Android 5.0; Nexus 5) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/${CHROMIUM_VERSION} Mobile Safari/537.36"], // http://pad.lv/1538056, http://pad.lv/1457661
-    ["^https?:\/\/(mobile\.)?nytimes\.com\/", "Mozilla/5.0 (Linux; Ubuntu @UBUNTU_VERSION@; Android 5.0; Nexus 5) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/${CHROMIUM_VERSION} Mobile Safari/537.36"], // http://pad.lv/1573620
-    ["^https?:\/\/mobile\.twitter\.com\/", "Mozilla/5.0 (Linux; Ubuntu @UBUNTU_VERSION@;) AppleWebKit/537.36 Chrome/${CHROMIUM_VERSION} Mobile Safari/537.36"], // http://pad.lv/1577834
+    // Youtube (https://launchpad.net/bugs/1228415, https://launchpad.net/bugs/1415107, https://launchpad.net/bugs/1417258, https://launchpad.net/bugs/1499394, https://launchpad.net/bugs/1408760, https://launchpad.net/bugs/1437485)
+    ["^https:\/\/(www|m)\.youtube\.com\/", android_no_device_override],
+
+    // Gmail (https://launchpad.net/bugs/1375889)
+    ["^https:\/\/mail\.google\.com\/", android_no_device_override],
+
+    // Google plus (https://launchpad.net/bugs/1656310)
+    ["^https:\/\/plus\.google\.com\/", ubuntu_like_android_override],
 
     // Google hangouts (https://launchpad.net/bugs/1565055)
-    ["^https?:\/\/hangouts\.google\.com\/", "Mozilla/5.0 (Linux; Ubuntu @UBUNTU_VERSION@ like Android 4.4;) AppleWebKit/537.36 Chrome/${CHROMIUM_VERSION} Mobile Safari/537.36"],
-    ["^https?:\/\/talkgadget\.google\.com\/hangouts\/", "Mozilla/5.0 (Linux; Ubuntu @UBUNTU_VERSION@ like Android 4.4;) AppleWebKit/537.36 Chrome/${CHROMIUM_VERSION} Mobile Safari/537.36"],
-    ["^https?:\/\/plus\.google\.com\/hangouts\/", "Mozilla/5.0 (Linux; Ubuntu @UBUNTU_VERSION@ like Android 4.4;) AppleWebKit/537.36 Chrome/${CHROMIUM_VERSION} Mobile Safari/537.36"],
+    ["^https:\/\/hangouts\.google\.com\/", ubuntu_like_android_override],
+    ["^https:\/\/talkgadget\.google\.com\/hangouts\/", ubuntu_like_android_override],
+    ["^https:\/\/plus\.google\.com\/hangouts\/", ubuntu_like_android_override],
 
     // Google recaptcha (https://launchpad.net/bugs/1599146)
-    ["^https:\/\/www\.google\.com\/recaptcha\/", "Mozilla/5.0 (Linux; Ubuntu @UBUNTU_VERSION@ like Android 4.4;) AppleWebKit/537.36 Chrome/${CHROMIUM_VERSION} Safari/537.36"],
+    ["^https:\/\/www\.google\.com\/recaptcha\/", ubuntu_like_android_override],
+
+    // Facebook (https://launchpad.net/bugs/1538056, https://launchpad.net/bugs/1457661)
+    ["^https:\/\/(www|m)\.facebook\.com\/", nexus5_override],
+
+    // Twitter (https://launchpad.net/bugs/1577834)
+    ["^https:\/\/mobile\.twitter\.com\/", no_android_token],
 
     // meet.jit.si (https://launchpad.net/bugs/1635971)
-    ["^https:\/\/meet\.jit\.si\/", "Mozilla/5.0 (Linux; Ubuntu @UBUNTU_VERSION@ like Android 5.0;) AppleWebKit/537.36 Chrome/${CHROMIUM_VERSION} Safari/537.36"],
+    ["^https:\/\/meet\.jit\.si\/", ubuntu_like_android_override],
+
+    // ESPN websites (https://launchpad.net/bugs/1316259)
+    ["^http:\/\/(\w+\.)*espn\.(go\.)?com\/", ubuntu_like_android_override],
+
+    // New York Times (https://launchpad.net/bugs/1573620)
+    ["^https?:\/\/(mobile\.)?nytimes\.com\/", nexus5_override],
+
+    // appear.in (https://launchpad.net/bugs/1659288)
+    ["^https:\/\/appear\.in\/", no_android_token],
 ];

=== modified file 'src/app/webbrowser/TabComponent.qml'
--- src/app/webbrowser/TabComponent.qml	2016-11-25 15:49:50 +0000
+++ src/app/webbrowser/TabComponent.qml	2017-02-01 16:41:48 +0000
@@ -33,6 +33,7 @@
     id: tabComponent
 
     BrowserTab {
+        id: browserTab
         anchors.fill: parent
         incognito: browser ? browser.incognito : false
         current: browser ? browser.tabsModel && browser.tabsModel.currentTab === this : false
@@ -253,9 +254,9 @@
             contextMenu: browser && browser.wide ? contextMenuWideComponent : contextMenuNarrowComponent
 
             onNewViewRequested: {
-                var tab = browser.createTab({"request": request})
+                var newTab = browser.createTab({"request": request})
                 var setCurrent = (request.disposition == Oxide.NewViewRequest.DispositionNewForegroundTab)
-                internal.addTab(tab, setCurrent)
+                internal.addTab(newTab, setCurrent, tabsModel.indexOf(browserTab) + 1)
                 if (setCurrent) tabContainer.forceActiveFocus()
             }
 
@@ -263,11 +264,9 @@
             onPrepareToCloseResponse: {
                 if (proceed) {
                     if (tab) {
-                        for (var i = 0; i < tabsModel.count; ++i) {
-                            if (tabsModel.get(i) === tab) {
-                                tabsModel.remove(i)
-                                break
-                            }
+                        var i = tabsModel.indexOf(tab);
+                        if (i != -1) {
+                            tabsModel.remove(i);
                         }
 
                         // tab.close() destroys the context so add new tab before destroy if required

=== modified file 'src/app/webbrowser/tabs-model.cpp'
--- src/app/webbrowser/tabs-model.cpp	2015-12-03 10:47:22 +0000
+++ src/app/webbrowser/tabs-model.cpp	2017-02-01 16:41:48 +0000
@@ -203,6 +203,15 @@
     return m_tabs.at(index);
 }
 
+/*!
+    Returns the index position of the first occurrence of tab in the model.
+    Returns -1 if no item matched.
+*/
+int TabsModel::indexOf(QObject* tab) const
+{
+    return m_tabs.indexOf(tab);
+}
+
 void TabsModel::move(int from, int to)
 {
     if ((from == to) || !checkValidTabIndex(from) || !checkValidTabIndex(to)) {

=== modified file 'src/app/webbrowser/tabs-model.h'
--- src/app/webbrowser/tabs-model.h	2015-09-02 16:37:20 +0000
+++ src/app/webbrowser/tabs-model.h	2017-02-01 16:41:48 +0000
@@ -60,6 +60,7 @@
     Q_INVOKABLE int insert(QObject* tab, int index);
     Q_INVOKABLE QObject* remove(int index);
     Q_INVOKABLE QObject* get(int index) const;
+    Q_INVOKABLE int indexOf(QObject* tab) const;
     Q_INVOKABLE void move(int from, int to);
 
 Q_SIGNALS:

=== modified file 'tests/autopilot/webbrowser_app/tests/test_tabs.py'
--- tests/autopilot/webbrowser_app/tests/test_tabs.py	2016-08-10 15:43:04 +0000
+++ tests/autopilot/webbrowser_app/tests/test_tabs.py	2017-02-01 16:41:48 +0000
@@ -222,6 +222,28 @@
         self.assertThat(len(views), Equals(1))
         self.check_current_tab(url)
 
+    # http://pad.lv/1499780
+    @testtools.skipIf(model() != "Desktop", "on desktop only")
+    def test_ctrl_click_open_link_in_next_tab(self):
+        self.open_new_tab()
+        first_tab = self.main_window.chrome.get_tabs_bar().get_tab(0)
+        self.pointing_device.click_object(first_tab)
+
+        url = self.base_url + "/link"
+        self.main_window.go_to_url(url)
+        self.main_window.wait_until_page_loaded(url)
+        webview = self.main_window.get_current_webview()
+
+        self.keyboard.press('Ctrl')
+        self.pointing_device.click_object(webview)
+        self.keyboard.release('Ctrl')
+
+        # Eventually we should have three webviews
+        self.assert_number_webviews_eventually(3)
+        next_tab = self.main_window.chrome.get_tabs_bar().get_tab(1)
+        self.pointing_device.click_object(next_tab)
+        self.check_current_tab(self.url)
+
     def test_open_iframe_target_blank_in_new_tab(self):
         url = self.base_url + "/fulliframewithblanktargetlink"
         self.main_window.go_to_url(url)

=== modified file 'tests/unittests/tabs-model/tst_TabsModelTests.cpp'
--- tests/unittests/tabs-model/tst_TabsModelTests.cpp	2016-04-04 10:17:33 +0000
+++ tests/unittests/tabs-model/tst_TabsModelTests.cpp	2017-02-01 16:41:48 +0000
@@ -486,6 +486,18 @@
         QCOMPARE(model->get(3), (QObject*) nullptr);
     }
 
+    void shouldReturnTabIndex()
+    {
+        QQuickItem* tab1 = createTab();
+        model->add(tab1);
+        QQuickItem* tab2 = createTab();
+        model->add(tab2);
+        QQuickItem* nonAddedTab = createTab();
+        QCOMPARE(model->indexOf(tab1), 0);
+        QCOMPARE(model->indexOf(tab2), 1);
+        QCOMPARE(model->indexOf(nonAddedTab), -1);
+    }
+
 private:
     void moveTabs(int from, int to, bool moved, bool indexChanged, int newIndex)
     {

=== modified file 'webbrowser-app.png'
Binary files webbrowser-app.png	2015-05-21 10:28:19 +0000 and webbrowser-app.png	2017-02-01 16:41:48 +0000 differ