fix: url validator to support http://g.co (#2013)

sweetalert2 · Jul 9, 2020 · 8ab6562 · 8ab6562
1 parent 4a0ff59
commit 8ab6562
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 3 deletions.
diff --git a/cypress/integration/methods/input.spec.js b/cypress/integration/methods/input.spec.js
@@ -439,6 +439,12 @@ describe('Validation', () => {
     })
   })
 
+  it('default URL validator: http://g.co', (done) => {
+    defaultInputValidators.url('http://g.co').then(() => {
+      done()
+    })
+  })
+
   it('default URL validator: http://foo.localhost/', (done) => {
     defaultInputValidators.url('http://foo.localhost/').then(() => {
       done()

diff --git a/src/utils/defaultInputValidators.js b/src/utils/defaultInputValidators.js
@@ -5,8 +5,8 @@ export default {
       : Promise.resolve(validationMessage || 'Invalid email address')
   },
   url: (string, validationMessage) => {
-    // taken from https://stackoverflow.com/a/3809435 with a small change from #1306
-    return /^https?:\/\/(www\.)?[-a-zA-Z0-9@:%._+~#=]{2,256}\.[a-z]{2,63}\b([-a-zA-Z0-9@:%_+.~#?&/=]*)$/.test(string)
+    // taken from https://stackoverflow.com/a/3809435 with a small change from #1306 and #2013
+    return /^https?:\/\/(www\.)?[-a-zA-Z0-9@:%._+~#=]{1,256}\.[a-z]{2,63}\b([-a-zA-Z0-9@:%_+.~#?&/=]*)$/.test(string)
       ? Promise.resolve()
       : Promise.resolve(validationMessage || 'Invalid URL')
   }

diff --git a/test/qunit/validation.js b/test/qunit/validation.js
@@ -27,12 +27,16 @@ QUnit.test('input.checkValidity()', (assert) => {
 })
 
 QUnit.test('default URL validator', (assert) => {
-  const done = assert.async(3)
+  const done = assert.async(4)
 
   defaultInputValidators.url('https://google.com').then(() => {
     done()
   })
 
+  defaultInputValidators.url('http://g.co').then(() => {
+    done()
+  })
+
   defaultInputValidators.url('http://foo.localhost/').then(() => {
     done()
   })