From 58b9767d179cd7e877f6cc8e637f1859d8dd5138 Mon Sep 17 00:00:00 2001
From: John Chilton <jmchilton@gmail.com>
Date: Fri, 24 Nov 2017 20:38:43 -0500
Subject: [PATCH] Fixup modal_tests.js

Disable jQuery FX instead of mocking time - mocking time with sinon seems to not be working :(. Tests are conceptually cleaner this way IMO anyway.
---
 client/galaxy/scripts/qunit/tests/modal_tests.js | 16 +++++-----------
 client/karma.config.js                           |  1 +
 2 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/client/galaxy/scripts/qunit/tests/modal_tests.js b/client/galaxy/scripts/qunit/tests/modal_tests.js
index 792c67e7357..07aa2e11114 100644
--- a/client/galaxy/scripts/qunit/tests/modal_tests.js
+++ b/client/galaxy/scripts/qunit/tests/modal_tests.js
@@ -1,12 +1,12 @@
 /* global define */
 
-define(["qunit/test-app", "mvc/ui/ui-modal", "sinon"], function(testApp, GalaxyModal, sinon) {
+define(["qunit/test-app", "mvc/ui/ui-modal", "jquery"], function(testApp, GalaxyModal, $) {
     "use strict";
     GalaxyModal = GalaxyModal.default;
     QUnit.module("Modal dialog test", {
         beforeEach: function() {
+            $.fx.off = true;
             testApp.create();
-            this.clock = sinon.useFakeTimers();
             var self = this;
             this.app = new GalaxyModal.View({
                 title: "Test title",
@@ -20,8 +20,8 @@ define(["qunit/test-app", "mvc/ui/ui-modal", "sinon"], function(testApp, GalaxyM
             });
         },
         afterEach: function() {
+            $.fx.off = false;
             testApp.destroy();
-            this.clock.restore();
         }
     });
 
@@ -31,21 +31,15 @@ define(["qunit/test-app", "mvc/ui/ui-modal", "sinon"], function(testApp, GalaxyM
     });
 
     QUnit.test("test dialog visibility", function(assert) {
-        assert.ok(this.app.$el.css("display") == "block", "Modal is initially visible");
         this.app.hide();
-        this.clock.tick(WAIT_FADE);
         assert.ok(this.app.$el.css("display") == "none", "Modal hidden manually");
         this.app.show();
-        this.clock.tick(WAIT_FADE);
         assert.ok(this.app.$el.css("display") == "block", "Modal shown manually");
         this.app.getButton("Ok").trigger("click");
-        this.clock.tick(WAIT_FADE);
         assert.ok(this.app.$el.css("display") == "block", "Modal still visible after clicking Ok");
         this.app.getButton("Cancel").trigger("click");
-        this.clock.tick(WAIT_FADE);
         assert.ok(this.app.$el.css("display") == "none", "Modal hidden after clicking Cancel");
         this.app.show();
-        this.clock.tick(WAIT_FADE);
         assert.ok(this.app.$el.css("display") == "block", "Modal manually shown again");
         assert.ok(!this.app.$header.hasClass("no-separator"), "Title separator tagged as visible.");
         this.app.show({ title_separator: false });
@@ -56,13 +50,13 @@ define(["qunit/test-app", "mvc/ui/ui-modal", "sinon"], function(testApp, GalaxyM
     });
 
     QUnit.test("test dialog closing events", function(assert) {
+        this.app.show();
         this.app.$backdrop.trigger("click");
-        this.clock.tick(WAIT_FADE);
         assert.ok(this.app.$el.css("display") == "block", "Modal shown after backdrop click");
+        this.app.hide();
         this.app.show({ closing_events: true });
         assert.ok(this.app.$el.css("display") == "block", "Modal shown with closing events");
         this.app.$backdrop.trigger("click");
-        this.clock.tick(WAIT_FADE);
         assert.ok(this.app.$el.css("display") == "none", "Modal hidden after backdrop click");
     });
 
diff --git a/client/karma.config.js b/client/karma.config.js
index 02d45662958..1c58edc4d53 100644
--- a/client/karma.config.js
+++ b/client/karma.config.js
@@ -26,6 +26,7 @@ var TESTS_SEPARATE_PACKS = [
     {pattern: 'galaxy/scripts/qunit/tests/utils_test.js', watched: false},
     {pattern: 'galaxy/scripts/qunit/tests/page_tests.js', watched: false},
     {pattern: 'galaxy/scripts/qunit/tests/workflow_editor_tests.js', watched: false},
+    {pattern: 'galaxy/scripts/qunit/tests/modal_tests.js', watched: false},
     // The following tests don't work for state reasons:
 
     // Error: Following test works on its own or with rest but not with