Merge 8ebead3 into a0d9567

package.json

@@ -1,6 +1,6 @@
 {
   "name": "async-validator",
-  "version": "1.3.4",
+  "version": "1.3.5",
   "description": "validate form asynchronous",
   "keywords": [
     "validator",
@@ -13,7 +13,9 @@
     "type": "git",
     "url": "git@github.com:yiminghe/async-validator.git"
   },
-  "files":["lib"],
+  "files": [
+    "lib"
+  ],
   "main": "./lib/index",
   "bugs": {
     "url": "http://github.com/yiminghe/async-validator/issues"
@@ -42,4 +44,4 @@
   "pre-commit": [
     "lint"
   ]
-}
+}

src/rule/type.js

@@ -2,7 +2,7 @@ import util from '../util';
 import required from './required';
 const pattern = {
   email: /^([a-z0-9_\.-]+)@([\da-z\.-]+)\.([a-z\.]{2,6})$/,
-  url: /^(https?:\/\/)?([\da-z\.-]+)\.([a-z\.]{2,6})([\/\w \.-]*)*\/?$/,
+  url: /^(https?:\/\/)?([\da-z\.-]+)\.([a-z\.]{2,6})(([\/\w\.-]*)?)(\?[-_+=~\.;&%\w]*)?(\#[-_\/\!\w]*)?( *)?$/i,
   hex: /^#?([a-f0-9]{6}|[a-f0-9]{3})$/i,
 };
 

tests/index.spec.js

@@ -288,5 +288,72 @@ describe('async-validator', function () {
         done();
       })
     });
+
+    it('works for type url has query', function (done) {
+      new Schema({
+        v: {
+          type: 'url'
+        }
+      }).validate({
+        v: 'http://www.taobao.com/abc?a=a'
+      }, function (errors) {
+        expect(errors).to.be(null);
+        done();
+      })
+    });
+
+    it('works for type url has hash', function (done) {
+      new Schema({
+        v: {
+          type: 'url'
+        }
+      }).validate({
+        v: 'http://www.taobao.com/abc#!abc'
+      }, function (errors) {
+        expect(errors).to.be(null);
+        done();
+      })
+    });
+
+    it('works for type url has query and has', function (done) {
+      new Schema({
+        v: {
+          type: 'url'
+        }
+      }).validate({
+        v: 'http://www.taobao.com/abc?abc=%23&b=a~c#abc'
+      }, function (errors) {
+        expect(errors).to.be(null);
+        done();
+      })
+    });
+
+    it('works for type url has query and has space', function (done) {
+      new Schema({
+        v: {
+          type: 'url'
+        }
+      }).validate({
+        v: 'http://www.taobao.com/abc?abc=%23&b=a~c#abc       '
+      }, function (errors) {
+        expect(errors).to.be(null);
+        done();
+      })
+    });
+
+
+    it('works for type not a valid url', function (done) {
+      new Schema({
+        v: {
+          type: 'url'
+        }
+      }).validate({
+        v: 'http://www.taobao.com/abc?abc=%23&b=  a~c#abc    '
+      }, function (errors) {
+        expect(errors.length).to.be(1);
+        expect(errors[0].message).to.be('v is not a valid url')
+        done();
+      })
+    });
   });
 });