BREAKING CHANGE: inputValidator and preConfirm should always resolve (#…

…1383) BREAKING CHANGE: inputValidator and preConfirm should always resolve (#1383)
sweetalert2 · Jan 18, 2019 · fc70cf9 · fc70cf9
1 parent b8c4c33
commit fc70cf9
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 47 deletions.
diff --git a/src/SweetAlert.js b/src/SweetAlert.js
@@ -37,13 +37,9 @@ function SweetAlert (...args) {
 }
 
 // `catch` cannot be the name of a module export, so we define our thenable methods here instead
-SweetAlert.prototype.then = function (onFulfilled, onRejected) {
+SweetAlert.prototype.then = function (onFulfilled) {
   const promise = privateProps.promise.get(this)
-  return promise.then(onFulfilled, onRejected)
-}
-SweetAlert.prototype.catch = function (onRejected) {
-  const promise = privateProps.promise.get(this)
-  return promise.catch(onRejected)
+  return promise.then(onFulfilled)
 }
 SweetAlert.prototype.finally = function (onFinally) {
   const promise = privateProps.promise.get(this)

diff --git a/src/instanceMethods/_main.js b/src/instanceMethods/_main.js
@@ -40,8 +40,8 @@ export function _main (userParams) {
 
   const constructor = this.constructor
 
-  return new Promise((resolve, reject) => {
-    // functions to handle all resolving/rejecting/settling
+  return new Promise((resolve) => {
+    // functions to handle all closings/dismissals
     const succeedWith = (value) => {
       constructor.closePopup(innerParams.onClose, innerParams.onAfterClose) // TODO: make closePopup an *instance* method
       resolve({ value })
@@ -50,10 +50,6 @@ export function _main (userParams) {
       constructor.closePopup(innerParams.onClose, innerParams.onAfterClose)
       resolve({ dismiss })
     }
-    const errorWith = (error) => {
-      constructor.closePopup(innerParams.onClose, innerParams.onAfterClose)
-      reject(error)
-    }
 
     // Close on timer
     if (innerParams.timer) {
@@ -106,8 +102,7 @@ export function _main (userParams) {
             } else {
               succeedWith(preConfirmValue || value)
             }
-          },
-          (error) => errorWith(error)
+          }
         )
       } else {
         succeedWith(value)
@@ -141,8 +136,7 @@ export function _main (userParams) {
                     } else {
                       confirm(inputValue)
                     }
-                  },
-                  error => errorWith(error)
+                  }
                 )
               } else if (!this.getInput().checkValidity()) {
                 this.enableButtons()

diff --git a/test/qunit/tests.js b/test/qunit/tests.js
@@ -666,37 +666,6 @@ QUnit.test('confirm button', (assert) => {
   Swal.clickConfirm()
 })
 
-QUnit.test('on errors in *async* user-defined functions, cleans up and propagates the error', (assert) => {
-  const done = assert.async()
-
-  const expectedError = new Error('my bad')
-  const erroringFunction = () => {
-    return Promise.reject(expectedError)
-  }
-
-  // inputValidator
-  const rejectedPromise = SwalWithoutAnimation.fire({ input: 'text', inputValidator: erroringFunction })
-  Swal.clickConfirm()
-  rejectedPromise.catch((error) => {
-    assert.equal(error, expectedError) // error is bubbled up back to user code
-    setTimeout(() => {
-      assert.notOk(Swal.isVisible()) // display is cleaned up
-
-      // preConfirm
-      const rejectedPromise = SwalWithoutAnimation.fire({ preConfirm: erroringFunction })
-      Swal.clickConfirm()
-      rejectedPromise.catch((error) => {
-        assert.equal(error, expectedError) // error is bubbled up back to user code
-        setTimeout(() => {
-          assert.notOk(Swal.isVisible()) // display is cleaned up
-
-          done()
-        })
-      })
-    })
-  })
-})
-
 QUnit.test('params validation', (assert) => {
   assert.ok(Swal.isValidParameter('title'))
   assert.notOk(Swal.isValidParameter('foobar'))