diff options
| -rw-r--r-- | test_harnesses/automated.html | 21 | ||||
| -rw-r--r-- | tests/utils_test.coffee | 20 |
2 files changed, 20 insertions, 21 deletions
diff --git a/test_harnesses/automated.html b/test_harnesses/automated.html index 5e55c368..5ef9cb5c 100644 --- a/test_harnesses/automated.html +++ b/test_harnesses/automated.html @@ -275,27 +275,6 @@ ); - context("Web query parsing", - - should("Convert query string to valid URL", function() { - assert.equal("http://www.google.com/", utils.convertToUrl("http://www.google.com/")); - assert.equal("http://www.google.com/", utils.convertToUrl(" http://www.google.com/ ")); - assert.equal("http://www.google.com", utils.convertToUrl("www.google.com")); - assert.equal("http://google.com", utils.convertToUrl("google.com")); - assert.equal("http://www.google.com/search?q=google", utils.convertToUrl("google")); - assert.equal("http://www.google.com/search?q=go ogle.com", utils.convertToUrl("go ogle.com")); - assert.equal("http://localhost", utils.convertToUrl("localhost")); - assert.equal("http://xyz.museum", utils.convertToUrl("xyz.museum")); - assert.equal("chrome://extensions", utils.convertToUrl("chrome://extensions")); - assert.equal("http://user:pass@ftp.xyz.com/test", - utils.convertToUrl("user:pass@ftp.xyz.com/test")); - assert.equal("http://127.0.0.1", utils.convertToUrl("127.0.0.1")); - assert.equal("http://127.0.0.1:8080", utils.convertToUrl("127.0.0.1:8080")); - assert.equal("http://[::]:8080", utils.convertToUrl("[::]:8080")); - }) - - ); - Tests.outputMethod = function(output) { var newOutput = Array.prototype.join.call(arguments, "\n"); newOutput = newOutput.replace(/&/g,"&").replace(/</g,"<").replace(/>/g,">"); // escape html diff --git a/tests/utils_test.coffee b/tests/utils_test.coffee new file mode 100644 index 00000000..051266c1 --- /dev/null +++ b/tests/utils_test.coffee @@ -0,0 +1,20 @@ +require "./test_helper.js" +extend(global, require "../lib/utils.js") + +context "convertToUrl", + should "detect and clean up valid URLs", -> + assert.equal "http://www.google.com/", utils.convertToUrl("http://www.google.com/") + assert.equal "http://www.google.com/", utils.convertToUrl(" http://www.google.com/ ") + assert.equal "http://www.google.com", utils.convertToUrl("www.google.com") + assert.equal "http://google.com", utils.convertToUrl("google.com") + assert.equal "http://localhost", utils.convertToUrl("localhost") + assert.equal "http://xyz.museum", utils.convertToUrl("xyz.museum") + assert.equal "chrome://extensions", utils.convertToUrl("chrome://extensions") + assert.equal "http://user:pass@ftp.xyz.com/test", utils.convertToUrl("user:pass@ftp.xyz.com/test") + assert.equal "http://127.0.0.1", utils.convertToUrl("127.0.0.1") + assert.equal "http://127.0.0.1:8080", utils.convertToUrl("127.0.0.1:8080") + assert.equal "http://[::]:8080", utils.convertToUrl("[::]:8080") + + should "convert non-URL terms into search queries", -> + assert.equal "http://www.google.com/search?q=google", utils.convertToUrl("google") + assert.equal "http://www.google.com/search?q=go%20ogle.com", utils.convertToUrl("go ogle.com") |