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

Revert "JS Flakiness in TeamDiscussionView"

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

@@ -8,20 +8,12 @@ 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);
-                $('.discussion-module').data('user-create-comment', true);
-                $('.discussion-module').data('user-create-subcomment', true);
-                DiscussionSpecHelper.setUnderscoreFixtures();
-            });
-            
-            waitsFor(
-                function() {return typeof(jQuery)!='undefined' && jQuery.active==0;},
-                "Ajax did not finish",
-                10000
-            })
+            setFixtures('<div class="discussion-module""></div>');
+            $('.discussion-module').data('course-id', TeamSpecHelpers.testCourseID);
+            $('.discussion-module').data('discussion-id', TeamSpecHelpers.testTeamDiscussionID);
+            $('.discussion-module').data('user-create-comment', true);
+            $('.discussion-module').data('user-create-subcomment', true);
+            DiscussionSpecHelper.setUnderscoreFixtures();
         });
 
         createDiscussionView = function(requests, threads) {