Merge lp:~fboucault/webbrowser-app/address_bar_populate_selected_suggestion into lp:webbrowser-app/staging

[Florian Boucault]

Address bar suggestions:
* When highlighting a suggestion, copy it to the address bar.
* Preserve search suggestions when going up/down
* Add static search suggestion as first element

Address bar suggestions:
* When highlighting a suggestion, copy it to the address bar.
* Preserve search suggestions when going up/down
* Add static search suggestion as first element

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

1652. By Florian Boucault on 2017-04-04

Merged qmltests

1653. By Florian Boucault on 2017-04-04

More reliable test Suggestions::test_list_of_suggestions_limits

1654. By Florian Boucault on 2017-04-04

Merged qmltests

1655. By Florian Boucault on 2017-04-05

Removed rev 1653

1656. By Florian Boucault on 2017-04-05

Merged lp:~osomon/webbrowser-app/qmltests

1657. By Florian Boucault on 2017-04-05

Fix failing tests

Unmerged revisions

1657. By Florian Boucault on 2017-04-05

Fix failing tests

1656. By Florian Boucault on 2017-04-05

Merged lp:~osomon/webbrowser-app/qmltests

1655. By Florian Boucault on 2017-04-05

Removed rev 1653

1654. By Florian Boucault on 2017-04-04

Merged qmltests

1653. By Florian Boucault on 2017-04-04

More reliable test Suggestions::test_list_of_suggestions_limits

1652. By Florian Boucault on 2017-04-04

Merged qmltests

1651. By Florian Boucault on 2017-04-03

Add static search suggestion as first element

1650. By Florian Boucault on 2017-04-03

Cleaner

1649. By Florian Boucault on 2017-04-03

Preserve search suggestions when going up/down

1648. By Florian Boucault on 2017-04-03

First step: when highlighting a suggestion, copy it to the address bar.

=== modified file 'src/app/webbrowser/Browser.qml'
--- src/app/webbrowser/Browser.qml	2017-04-05 08:33:43 +0000
+++ src/app/webbrowser/Browser.qml	2017-04-05 08:33:45 +0000
@@ -671,13 +671,57 @@
         width: chrome.width - units.gu(5)
         height: enabled ? Math.min(contentHeight, tabContainer.height - chrome.height - units.gu(2)) : 0
 
-        searchTerms: chrome.text.split(/\s+/g).filter(function(term) { return term.length > 0 })
+        property string searchText
+        searchTerms: searchText.split(/\s+/g).filter(function(term) { return term.length > 0 })
+
+        // Use text input in the address bar as search terms
+        Connections {
+            target: chrome
+            onTextChanged: {
+                if (!suggestionsList.activeFocus) {
+                    suggestionsList.searchText = chrome.text;
+                }
+            }
+        }
+
+        // When navigating the suggestion list, fill in the address bar
+        // with the selected suggestion
+        Connections {
+            target: suggestionsList
+            onActiveFocusChanged: {
+                if (suggestionsList.activeFocus) {
+                    chrome.text = suggestionsList.selectedSuggestionText;
+                }
+            }
+            onSelectedSuggestionTextChanged: {
+                if (suggestionsList.activeFocus) {
+                    chrome.text = suggestionsList.selectedSuggestionText;
+                }
+            }
+        }
 
         Keys.onUpPressed: chrome.focus = true
         Keys.onEscapePressed: internal.resetFocus()
 
+        function escapeHtmlEntities(query) {
+            return query.replace(/\W/g, encodeURIComponent)
+        }
+
+        function buildSearchUrl(query) {
+            var terms = query.split(/\s/).map(escapeHtmlEntities);
+            return chrome.searchUrl.replace("{searchTerms}", terms.join("+"));
+        }
+
+        property var searchTextModel: {
+            var model = [{"title": suggestionsList.searchText,
+                          "url": suggestionsList.buildSearchUrl(suggestionsList.searchText)}];
+            model.icon = 'search';
+            return model;
+        }
+
         models: searchTerms && searchTerms.length > 0 ?
-                [historySuggestions,
+                [searchTextModel,
+                 historySuggestions,
                  bookmarksSuggestions,
                  searchSuggestions.limit(4)] : []
 
@@ -711,7 +755,7 @@
             searchEngine: currentSearchEngine
             active: (chrome.activeFocus || suggestionsList.activeFocus) &&
                      !browser.incognito && !chrome.findInPageMode &&
-                     !UrlUtils.looksLikeAUrl(chrome.text.replace(/ /g, "+"))
+                     !UrlUtils.looksLikeAUrl(suggestionsList.searchText.replace(/ /g, "+"))
 
             function limit(number) {
                 var slice = results.slice(0, number)

=== modified file 'src/app/webbrowser/NavigationBar.qml'
--- src/app/webbrowser/NavigationBar.qml	2017-02-03 15:11:00 +0000
+++ src/app/webbrowser/NavigationBar.qml	2017-04-05 08:33:45 +0000
@@ -26,7 +26,7 @@
     property var tab
     property alias loading: addressbar.loading
     property alias searchUrl: addressbar.searchUrl
-    readonly property string text: addressbar.text
+    property alias text: addressbar.text
     property alias bookmarked: addressbar.bookmarked
     signal toggleBookmark()
     property list<Action> drawerActions

=== modified file 'src/app/webbrowser/Suggestions.qml'
--- src/app/webbrowser/Suggestions.qml	2016-11-18 15:10:47 +0000
+++ src/app/webbrowser/Suggestions.qml	2017-04-05 08:33:45 +0000
@@ -23,8 +23,9 @@
 FocusScope {
     id: suggestions
 
-    property var searchTerms
+    property var searchTerms: []
     property var models
+    property string selectedSuggestionText
 
     readonly property int count: models.reduce(internal.countItems, 0)
     readonly property alias contentHeight: suggestionsList.contentHeight
@@ -77,6 +78,13 @@
                                                          Highlight.highlightTerms(modelData.url, searchTerms)) : ""
             icon: modelData.icon || ""
             selected: suggestionsList.activeFocus && ListView.isCurrentItem
+            onSelectedChanged: {
+                if (modelData.displayUrl) {
+                    suggestions.selectedSuggestionText = modelData.url;
+                } else {
+                    suggestions.selectedSuggestionText = modelData.title;
+                }
+            }
 
             onActivated: suggestions.activated(modelData.url)
         }

=== modified file 'tests/qmltests/webbrowser-app/tst_Suggestions.qml'
--- tests/qmltests/webbrowser-app/tst_Suggestions.qml	2017-04-05 08:33:43 +0000
+++ tests/qmltests/webbrowser-app/tst_Suggestions.qml	2017-04-05 08:33:45 +0000
@@ -42,7 +42,6 @@
     function get_suggestion(index) {
         var suggestion =
             expectChild(get_suggestions(), "suggestionDelegate_%1".arg(index));
-        waitForRendering(suggestion);
         return suggestion;
     }
 
@@ -56,7 +55,7 @@
         assert_suggestions_eventually_hidden();
         focus_address_bar(false);
         assert_suggestions_eventually_shown();
-        tryCompare(suggestions, "count", 1);
+        tryCompare(suggestions, "count", 2);
         clear_address_bar();
         assert_suggestions_eventually_hidden();
     }
@@ -66,7 +65,7 @@
         var addressbar = focus_address_bar(true);
         typeString("SpEciAl");
         tryCompare(addressbar, "text", "SpEciAl");
-        tryCompare(suggestions, "count", 1);
+        tryCompare(suggestions, "count", 2);
     }
 
     function test_list_of_suggestions_limits_data() {
@@ -82,14 +81,14 @@
         typeString(data.strings[0]);
         tryCompare(addressbar, "text", data.strings[0]);
         assert_suggestions_eventually_shown();
-        tryCompare(suggestions, "count", 2);
+        tryCompare(suggestions, "count", 3);
         typeString(data.strings[1]);
         tryCompare(addressbar, "text", data.strings[0] + data.strings[1]);
-        tryCompare(suggestions, "count", 0);
+        tryCompare(suggestions, "count", 1);
         clear_address_bar();
         typeString(data.strings[2]);
         tryCompare(addressbar, "text", data.strings[2]);
-        tryCompare(suggestions, "count", 1);
+        tryCompare(suggestions, "count", 2);
     }
 
     function test_list_of_suggestions_search_limits() {
@@ -98,10 +97,10 @@
         typeString("foo");
         tryCompare(addressbar, "text", "foo");
         assert_suggestions_eventually_shown();
-        tryCompare(suggestions, "count", 4);
+        tryCompare(suggestions, "count", 5);
         typeString("bleh");
         tryCompare(addressbar, "text", "foobleh");
-        tryCompare(suggestions, "count", 0);
+        tryCompare(suggestions, "count", 1);
     }
 
     function test_list_of_suggestions_order() {
@@ -110,10 +109,11 @@
         typeString("QML");
         tryCompare(addressbar, "text", "QML");
         assert_suggestions_eventually_shown();
-        tryCompare(suggestions, "count", 5);
-        compare(get_suggestion(0).icon, "history");
-        compare(get_suggestion(1).icon, "non-starred");
-        compare(get_suggestion(2).icon, "search");
+        tryCompare(suggestions, "count", 6);
+        compare(get_suggestion(0).icon, "search");
+        compare(get_suggestion(1).icon, "history");
+        compare(get_suggestion(2).icon, "non-starred");
+        compare(get_suggestion(3).icon, "search");
     }
 
     function test_clear_address_bar_dismisses_suggestions() {
@@ -145,14 +145,25 @@
         assert_suggestions_eventually_shown();
     }
 
+    function test_select_raw_search() {
+        var suggestions = get_suggestions();
+        focus_address_bar(true);
+        typeString("high");
+        assert_suggestions_eventually_shown();
+        tryCompare(suggestions, "count", 2);
+        clickItem(get_suggestion(0));
+        assert_suggestions_eventually_hidden();
+        tryCompare(window.currentWebview, "url", "http://aserver.somewhere/search?q=high");
+    }
+
     function test_select_suggestion() {
         var suggestions = get_suggestions();
         var addressbar = focus_address_bar(true);
         typeString("linux");
         tryCompare(addressbar, "text", "linux");
         assert_suggestions_eventually_shown();
-        tryCompare(suggestions, "count", 1);
-        clickItem(get_suggestion(0));
+        tryCompare(suggestions, "count", 2);
+        clickItem(get_suggestion(1));
         assert_suggestions_eventually_hidden();
         tryCompare(window.currentWebview, "url", "http://test/wiki/Linux");
     }
@@ -163,8 +174,8 @@
         typeString("high");
         tryCompare(addressbar, "text", "high");
         assert_suggestions_eventually_shown();
-        tryCompare(suggestions, "count", 1);
-        clickItem(get_suggestion(0));
+        tryCompare(suggestions, "count", 2);
+        clickItem(get_suggestion(1));
         assert_suggestions_eventually_hidden();
         tryCompare(window.currentWebview, "url", "http://aserver.somewhere/search?q=highlight");
     }
@@ -175,8 +186,8 @@
         typeString("(phil");
         tryCompare(addressbar, "text", "(phil");
         assert_suggestions_eventually_shown();
-        tryCompare(suggestions, "count", 1);
-        var suggestion = get_suggestion(0);
+        tryCompare(suggestions, "count", 2);
+        var suggestion = get_suggestion(1);
         compare(unhighlight(suggestion.title),
                 "Ubuntu (philosophy) - Wikipedia, the free encyclopedia");
         compare(unhighlight(suggestion.subtitle),
@@ -189,10 +200,13 @@
         typeString("high");
         tryCompare(addressbar, "text", "high");
         assert_suggestions_eventually_shown();
-        tryCompare(suggestions, "count", 1);
-        var suggestion = get_suggestion(0);
-        compare(unhighlight(suggestion.title), "highlight");
-        compare(suggestion.subtitle, "");
+        tryCompare(suggestions, "count", 2);
+        var suggestion1 = get_suggestion(0);
+        compare(unhighlight(suggestion1.title), "high");
+        compare(suggestion1.subtitle, "");
+        var suggestion2 = get_suggestion(1);
+        compare(unhighlight(suggestion2.title), "highlight");
+        compare(suggestion2.subtitle, "");
     }
 
     function test_keyboard_navigation() {
@@ -201,36 +215,45 @@
         typeString("element");
         tryCompare(addressbar, "text", "element");
         assert_suggestions_eventually_shown();
-        tryCompare(suggestions, "count", 2);
+        tryCompare(suggestions, "count", 3);
         var suggestion1 = get_suggestion(0);
         var suggestion2 = get_suggestion(1);
         verify(!suggestion1.selected);
         verify(!suggestion2.selected);
 
         keyClick(Qt.Key_Down);
+        tryCompare(get_suggestions(), "count", 3);
         tryCompare(addressbar, "activeFocus", false);
-        tryCompare(suggestions, "activeFocus", true);
-        tryCompare(suggestion1, "selected", true);
-        verify(!suggestion2.selected);
+        tryCompare(get_suggestions(), "activeFocus", true);
+        tryCompare(get_suggestion(0), "selected", true);
+        tryCompare(addressbar, "text", get_suggestion(0).title);
+        verify(!get_suggestion(1).selected);
 
         keyClick(Qt.Key_Down);
-        tryCompare(suggestion1, "selected", false);
-        tryCompare(suggestion2, "selected", true);
+        tryCompare(get_suggestions(), "count", 3);
+        tryCompare(get_suggestion(0), "selected", false);
+        tryCompare(get_suggestion(1), "selected", true);
+        tryCompare(addressbar, "text", get_suggestion(1).subtitle);
 
         // Verify that selection does not wrap around
         keyClick(Qt.Key_Down);
-        verify(!suggestion1.selected);
-        verify(suggestion2.selected);
-
-        keyClick(Qt.Key_Up);
-        tryCompare(suggestion1, "selected", true);
-        tryCompare(suggestion2, "selected", false);
-
-        keyClick(Qt.Key_Up);
+        keyClick(Qt.Key_Down);
+        verify(!get_suggestion(0).selected);
+        verify(!get_suggestion(1).selected);
+        verify(get_suggestion(2).selected);
+
+        keyClick(Qt.Key_Up);
+        keyClick(Qt.Key_Up);
+        tryCompare(get_suggestions(), "count", 3);
+        tryCompare(get_suggestion(0), "selected", false);
+        tryCompare(get_suggestion(1), "selected", false);
+
+        keyClick(Qt.Key_Up);
+        tryCompare(get_suggestions(), "count", 3);
         tryCompare(addressbar, "activeFocus", true);
-        tryCompare(suggestions, "activeFocus", false);
-        tryCompare(suggestion1, "selected", false);
-        tryCompare(suggestion2, "selected", false);
+        tryCompare(get_suggestions(), "activeFocus", false);
+        tryCompare(get_suggestion(0), "selected", false);
+        tryCompare(get_suggestion(1), "selected", false);
     }
 
     function test_suggestions_escape() {
@@ -242,10 +265,11 @@
         typeString("element");
         tryCompare(addressbar, "text", "element");
         assert_suggestions_eventually_shown();
-        tryCompare(suggestions, "count", 2);
+        tryCompare(suggestions, "count", 3);
         keyClick(Qt.Key_Down);
         tryCompare(suggestions, "activeFocus", true);
-        tryCompare(addressbar, "text", "element");
+        var suggestion1 = get_suggestion(0);
+        tryCompare(addressbar, "text", suggestion1.title);
         keyClick(Qt.Key_Escape);
         assert_suggestions_eventually_hidden();
         tryCompare(addressbar, "text", text);
@@ -260,9 +284,11 @@
         typeString("element");
         tryCompare(addressbar, "text", "element");
         assert_suggestions_eventually_shown();
-        tryCompare(suggestions, "count", 2);
+        tryCompare(suggestions, "count", 3);
         keyClick(Qt.Key_Down);
         tryCompare(suggestions, "activeFocus", true);
+        var suggestion1 = get_suggestion(0);
+        tryCompare(addressbar, "text", suggestion1.title);
         keyClick(Qt.Key_Up);
         tryCompare(addressbar, "activeFocus", true);
         keyClick(Qt.Key_Escape);