Fix some with the url validator

This closes #153
ansman · Aug 31, 2016 · cffa61a · cffa61a
1 parent b0668a6
commit cffa61a
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 1 deletion.
diff --git a/index.html b/index.html
@@ -2377,6 +2377,11 @@ <h3>
               <li>
                 Errors are now deduplicated when using the flat or grouped format.
               </li>
+              <li>
+                Fixed an issue where some URLs would be detected as invalid when
+                they weren't. Thanks <a href="github.com/ansman/validate.js/issues/153" target="_blank">huan086</a>
+                for reporting this.
+              </li>
             </ul>
           </div>
           <div id="changelog-0-10-0">

diff --git a/specs/validators/url-spec.js b/specs/validators/url-spec.js
@@ -65,10 +65,14 @@ describe("validators.url", function() {
   });
 
   it("allows valid urls", function() {
+    expect(url("http://foo.com", {})).not.toBeDefined();
+    expect(url("http://foo.com/", {})).not.toBeDefined();
     expect(url("http://foo.com/blah_blah", {})).not.toBeDefined();
     expect(url("http://foo.com/blah_blah/", {})).not.toBeDefined();
     expect(url("http://foo.com/blah_blah_(wikipedia)", {})).not.toBeDefined();
     expect(url("http://foo.com/blah_blah_(wikipedia)_(again)", {})).not.toBeDefined();
+    expect(url("http://foo.com?query=bar", {})).not.toBeDefined();
+    expect(url("http://foo.com#fragment=bar", {})).not.toBeDefined();
     expect(url("http://www.example.com/wpstyle/?p=364", {})).not.toBeDefined();
     expect(url("https://www.example.com/foo/?bar=baz&inga=42&quux", {})).not.toBeDefined();
     expect(url("https://www.example.com/foo/#bar=baz&inga=42&quux", {})).not.toBeDefined();

diff --git a/validate.js b/validate.js
@@ -1135,7 +1135,7 @@
           // port number
           "(?::\\d{2,5})?" +
           // path
-          "(?:\\/[^\\s]*)?" +
+          "(?:[/?#]\\S*)?" +
         "$";
 
       var PATTERN = new RegExp(regex, 'i');