fix: url format should not allow ftp (#6)

add `http-url` format
kintone-labs · Apr 22, 2017 · f2b7122 · f2b7122
1 parent 22f9864
commit f2b7122
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/index.js b/index.js
@@ -26,6 +26,7 @@ module.exports = function(json, options) {
     unknownFormats: true,
     errorDataPath: 'property',
     formats: {
+      'http-url': str => validateUrl(str, true),
       'https-url': str => validateUrl(str),
       'relative-path': relativePath,
     },

diff --git a/manifest-schema.json b/manifest-schema.json
@@ -74,17 +74,17 @@
         "ja": {
           "type": "string",
           "minLength": 1,
-          "format": "url"
+          "format": "http-url"
         },
         "en": {
           "type": "string",
           "minLength": 1,
-          "format": "url"
+          "format": "http-url"
         },
         "zh": {
           "type": "string",
           "minLength": 1,
-          "format": "url"
+          "format": "http-url"
         }
       }
     },

diff --git a/test/index.js b/test/index.js
@@ -102,11 +102,11 @@ describe('validator', () => {
     assert(actual.errors.length === 2);
   });
 
-  it('relative path is invalid for `url`', () => {
+  it('relative path is invalid for `http-url`', () => {
     const actual = validator(json({homepage_url: {en: 'foo/bar.html'}}));
     assert(actual.valid === false);
     assert(actual.errors.length === 1);
-    assert(actual.errors[0].params.format === 'url');
+    assert(actual.errors[0].params.format === 'http-url');
   });
 
   it('"http:" is invalid for `https-url`', () => {