Merge pull request #9405 from edx/efischer/js-flakes

JS Flakiness in TeamDiscussionView

lms/djangoapps/teams/static/teams/js/spec/views/team_discussion_spec.js

@@ -8,6 +8,7 @@ define([
         var discussionView, createDiscussionView, createPost, expandReplies, postReply;
 
         beforeEach(function() {
+            runs(function() {
                 setFixtures('<div class="discussion-module""></div>');
                 $('.discussion-module').data('course-id', TeamSpecHelpers.testCourseID);
                 $('.discussion-module').data('discussion-id', TeamSpecHelpers.testTeamDiscussionID);
@@ -16,6 +17,13 @@ define([
                 DiscussionSpecHelper.setUnderscoreFixtures();
             });
             
+            waitsFor(
+                function() {return typeof(jQuery)!='undefined' && jQuery.active==0;},
+                "Ajax did not finish",
+                10000
+            })
+        });
+
         createDiscussionView = function(requests, threads) {
             discussionView = new TeamDiscussionView({
                 el: '.discussion-module'