From 904398308debad22fedec227ec8e71adb2bc5720 Mon Sep 17 00:00:00 2001
From: Stephen Blott
Date: Sun, 17 May 2015 13:24:46 +0100
Subject: TabToOpen: respect trailing options when extracting query terms.

A custom search engine like this...

i: https://www.google.ie/search?q=%s&num=30&newwindow=1&biw=1918&bih=1015&tbm=isch Google image search

Should not match a URL like this...

https://www.google.ie/search?q=bbc+sport
---
 tests/unit_tests/utils_test.coffee | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'tests')

diff --git a/tests/unit_tests/utils_test.coffee b/tests/unit_tests/utils_test.coffee
index 829c7042..9d71cc49 100644
--- a/tests/unit_tests/utils_test.coffee
+++ b/tests/unit_tests/utils_test.coffee
@@ -49,6 +49,16 @@ context "convertToUrl",
     assert.equal "https://www.google.com/search?q=go+ogle.com", Utils.convertToUrl("go ogle.com")
     assert.equal "https://www.google.com/search?q=%40twitter", Utils.convertToUrl("@twitter")
 
+context "extractQuery",
+  should "extract queries from search URLs", ->
+    assert.equal "bbc sport 1", Utils.extractQuery "https://www.google.ie/search?q=%s", "https://www.google.ie/search?q=bbc+sport+1"
+    assert.equal "bbc sport 2", Utils.extractQuery "http://www.google.ie/search?q=%s", "https://www.google.ie/search?q=bbc+sport+2"
+    assert.equal "bbc sport 3", Utils.extractQuery "https://www.google.ie/search?q=%s", "http://www.google.ie/search?q=bbc+sport+3"
+    assert.equal "bbc sport 4", Utils.extractQuery "https://www.google.ie/search?q=%s", "http://www.google.ie/search?q=bbc+sport+4&blah"
+
+  should "extract not queries from incorrect search URLs", ->
+    assert.isFalse Utils.extractQuery "https://www.google.ie/search?q=%s&foo=bar", "https://www.google.ie/search?q=bbc+sport"
+
 context "hasChromePrefix",
   should "detect chrome prefixes of URLs", ->
     assert.isTrue Utils.hasChromePrefix "about:foobar"
-- 
cgit v1.2.3