From 86ebbed6ca8aeb168f77d71f71e69f2b74dcb860 Mon Sep 17 00:00:00 2001 From: Rajesh Taneja Date: Wed, 5 Oct 2016 13:18:36 +0800 Subject: [PATCH] MDL-56210 behat: Test for disabled button later With phantomjs, dom is not updated by the time next step is executed, so suffle it to ensure this scenario pass --- lib/form/form.js | 12 ------------ mod/lti/tests/behat/addtool.feature | 3 +-- 2 files changed, 1 insertion(+), 14 deletions(-) diff --git a/lib/form/form.js b/lib/form/form.js index 0f83c4341a8..38e518bef44 100644 --- a/lib/form/form.js +++ b/lib/form/form.js @@ -23,9 +23,6 @@ if (typeof M.form.dependencyManager === 'undefined') { this._hides = {}; this._dirty = {}; - // Let behat know that JS is pending. - M.util.js_pending('mform-dependency-manager-' + this.get('form').get('id')); - // Setup event handlers. Y.Object.each(this.get('dependencies'), function(value, i) { var elements = this.elementsByName(i); @@ -59,9 +56,6 @@ if (typeof M.form.dependencyManager === 'undefined') { }, this); this.updateAllDependencies(); - - // Let behat know that JS is complete. - M.util.js_complete('mform-dependency-manager-' + this.get('form').get('id')); }, /** @@ -595,12 +589,6 @@ M.form.initFormDependencies = function(Y, formid, dependencies) { */ M.form.updateFormState = function(formid) { if (formid in M.form.dependencyManagers) { - // Let behat know that JS is pending. - M.util.js_pending('mform-dependency-manager-' + formid); - M.form.dependencyManagers[formid].updateAllDependencies(); - - // Let behat know that JS is complete. - M.util.js_complete('mform-dependency-manager-' + formid); } }; diff --git a/mod/lti/tests/behat/addtool.feature b/mod/lti/tests/behat/addtool.feature index 4e7ed1da77e..4687519b62e 100644 --- a/mod/lti/tests/behat/addtool.feature +++ b/mod/lti/tests/behat/addtool.feature @@ -32,11 +32,10 @@ Feature: Add tools And I turn editing mode on And I add a "Teaching Tool 1" to section "1" # For tool that does not support Content-Item message type, the Select content button must be disabled. - And I wait until the page is ready - And the "Select content" "button" should be disabled And I set the field "Activity name" to "Test tool activity 1" And I click on "Show more..." "link" And I set the field "Launch container" to "Embed" + And the "Select content" "button" should be disabled And I press "Save and return to course" And I open "Test tool activity 1" actions menu And I choose "Edit settings" in the open action menu