Merge bc2865a into afc4326

sweetalert2 · Aug 5, 2019 · 286007e · 286007e
2 parents afc4326 + bc2865a
commit 286007e
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/src/utils/dom/renderers/renderActions.js b/src/utils/dom/renderers/renderActions.js
@@ -8,7 +8,7 @@ export const renderActions = (instance, params) => {
 
   // Actions (buttons) wrapper
   if (!params.showConfirmButton && !params.showCancelButton) {
-    return dom.hide(actions)
+    dom.hide(actions)
   }
 
   // Custom class

diff --git a/test/qunit/methods/showLoading.js b/test/qunit/methods/showLoading.js
@@ -1,8 +1,22 @@
-import { Swal, ensureClosed } from '../helpers.js'
+import { Swal, ensureClosed, isHidden, isVisible } from '../helpers.js'
 
 QUnit.test('should open an empty popup with loader', (assert) => {
   ensureClosed()
   Swal.showLoading()
   assert.ok(Swal.isVisible())
   assert.ok(Swal.getActions().classList.contains('swal2-loading'))
 })
+
+QUnit.test('showConfirmButton: false + showLoading()', (assert) => {
+  const done = assert.async()
+  Swal.fire({
+    showConfirmButton: false,
+    onOpen: () => {
+      Swal.showLoading()
+      assert.ok(Swal.getActions().classList.contains('swal2-loading'))
+      assert.ok(isVisible(Swal.getConfirmButton()))
+      assert.ok(isHidden(Swal.getCancelButton()))
+      done()
+    },
+  })
+})