diff --git a/AjaxControlToolkit.Jasmine/Suites/ValidatorCalloutUpdatePanelUnobtrusiveTests.aspx b/AjaxControlToolkit.Jasmine/Suites/ValidatorCalloutUpdatePanelUnobtrusiveTests.aspx index 217ddce92..a291d15b5 100644 --- a/AjaxControlToolkit.Jasmine/Suites/ValidatorCalloutUpdatePanelUnobtrusiveTests.aspx +++ b/AjaxControlToolkit.Jasmine/Suites/ValidatorCalloutUpdatePanelUnobtrusiveTests.aspx @@ -66,17 +66,23 @@ }); it("validates inside UpdatePanel after postback", function(done) { + postBackCount = 0; $("#" + POSTBACK_BUTTON_CLIENT_ID).click(); - setTimeout(function() { - $("#" + SAVE_BUTTON_CLIENT_ID).click(); - - setTimeout(function() { - var $container = $("#" + UPDATEPANEL_VALIDATOR_CALLOUT_EXTENDER_CLIENT_ID + "_popupTable"); - expect($container.is(":visible")).toBeTruthy(); - done(); - }, 500); - }, 500); + waitFor( + function() { + return postBackCount === 1; + }, + function() { + $("#" + SAVE_BUTTON_CLIENT_ID).click(); + + waitFor( + function() { + var $container = $("#" + UPDATEPANEL_VALIDATOR_CALLOUT_EXTENDER_CLIENT_ID + "_popupTable"); + return $container.is(":visible"); + }, + done); + }); }); it("validates inside UpdatePanel after 2 postbacks", function(done) {