Merge pull request DevExpress#146 from MikhailTymchukDX/fix-validator…

…-callout-test Fix ValidatorCallout flashing test
CharlieBP · Jun 24, 2016 · 0f3a1dd · 0f3a1dd
2 parents b03ed4e + 90fa928
commit 0f3a1dd
Showing 1 changed file with 15 additions and 9 deletions.
diff --git 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) {