opensource/galaxy
3
0
Fork 0
mirror of https://github.com/galaxyproject/galaxy.git synced 2026-10-30 18:13:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixup modal_tests.js

Browse Source 
Disable jQuery FX instead of mocking time - mocking time with sinon seems to not be working :(. Tests are conceptually cleaner this way IMO anyway.
This commit is contained in:
John Chilton
2017-11-27 12:54:10 -05:00
parent d82933d410
commit 58b9767d17
2 changed files with 6 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/galaxy/scripts/qunit/tests/modal_tests.js
+5 -11
View File
@@ -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");
});
client/karma.config.js
+1
View File
@@ -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