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

Revert "Fix for flaky TeamDiscussionView js tests"

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

@@ -38,20 +38,12 @@ define([
         };
 
         createPost = function(requests, view, title, body, threadID) {
-            runs(function() {
             title = title || "Test title";
             body = body || "Test body";
             threadID = threadID || "999";
             view.$('.new-post-button').click();
             view.$('.js-post-title').val(title);
             view.$('.js-post-body textarea').val(body);
-            });
-            
-            waitsFor(function() {
-                return $('.submit').length;
-            }, "Submit button never appeared", 1000);
-
-            runs(function() {
             view.$('.submit').click();
             AjaxHelpers.expectRequest(
                 requests, 'POST',
@@ -80,15 +72,9 @@ define([
                 }),
                 annotated_content_info: TeamSpecHelpers.createAnnotatedContentInfo()
             });
-            });            
         };
 
         expandReplies = function(requests, view, threadID) {
-            waitsFor(function() {
-                return $('.forum-thread-expand').length;
-            }, "Forum expando link never appeared", 1000);
-
-            runs(function() {
             view.$('.forum-thread-expand').first().click();
             AjaxHelpers.expectRequest(
                 requests, 'GET',
@@ -106,20 +92,10 @@ define([
                 content: TeamSpecHelpers.createMockThreadResponse(),
                 annotated_content_info: TeamSpecHelpers.createAnnotatedContentInfo()
             });
-            });            
         };
 
         postReply = function(requests, view, reply, threadID) {
-            var replyForm;
-            runs(function() {
-                replyForm = view.$('.discussion-reply-new').first();
-            });
-
-            waitsFor(function() {
-                return replyForm.find('.discussion-submit-post').length;
-            }, "submit reply button never appeared", 1000);
-                
-            runs(function() {
+            var replyForm = view.$('.discussion-reply-new').first();
             replyForm.find('.reply-body textarea').val(reply);
             replyForm.find('.discussion-submit-post').click();
             AjaxHelpers.expectRequest(
@@ -141,7 +117,6 @@ define([
                 }),
                 "annotated_content_info": TeamSpecHelpers.createAnnotatedContentInfo()
             });
-            });
         };
 
         it('can render itself', function() {
@@ -152,96 +127,53 @@ define([
 
         it('can create a new post', function() {
             var requests = AjaxHelpers.requests(this),
-                view,
+                view = createDiscussionView(requests),
                 testTitle = 'New Post',
                 testBody = 'New post body',
                 newThreadElement;
-            runs(function() {
-                view = createDiscussionView(requests);
             createPost(requests, view, testTitle, testBody);
-            });
 
-            waitsFor(function() {
-                return $('.discussion-thread').length;
-            }, "Discussion thread never appeared", 1000);
-
-            runs(function() {
             // Expect the first thread to be the new post
             expect(view.$('.discussion-thread').length).toEqual(4);
             newThreadElement = view.$('.discussion-thread').first();
             expect(newThreadElement.find('.post-header-content h1').text().trim()).toEqual(testTitle);
             expect(newThreadElement.find('.post-body').text().trim()).toEqual(testBody);
         });
-        });
 
         it('can post a reply', function() {
             var requests = AjaxHelpers.requests(this),
                 view = createDiscussionView(requests),
                 testReply = "Test reply",
                 testThreadID = "1";
-            runs(function() {
             expandReplies(requests, view, testThreadID);
             postReply(requests, view, testReply, testThreadID);
-            });
-
-            waitsFor(function() {
-                return view.$('.discussion-response .response-body').length;
-            }, "Discussion response never made visible", 1000);
-            
-            runs(function() {
             expect(view.$('.discussion-response .response-body').text().trim()).toBe(testReply);
         });
-        });
 
         it('can post a reply to a new post', function() {
             var requests = AjaxHelpers.requests(this),
                 view = createDiscussionView(requests, []),
                 testReply = "Test reply";
-            runs(function() {
             createPost(requests, view);
             expandReplies(requests, view);
             postReply(requests, view, testReply);
-            });
-
-            waitsFor(function() {
-                return view.$('.discussion-response .response-body').length;
-            }, "Discussion response never made visible", 1000);
-            
-            runs(function() {
             expect(view.$('.discussion-response .response-body').text().trim()).toBe(testReply);
         });
-        });
 
         it('cannot move an existing thread to a different topic', function() {
             var requests = AjaxHelpers.requests(this),
-                view,
+                view = createDiscussionView(requests),
                 postTopicButton, updatedThreadElement,
                 updatedTitle = 'Updated title',
                 updatedBody = 'Updated body',
                 testThreadID = "1";
-            runs(function() {
-                view  = createDiscussionView(requests);
             expandReplies(requests, view, testThreadID);
-            });
-
-            waitsFor(function() {
-                return view.$('.action-more .icon').length;
-            }, "Expanding replies never finished", 1000);
-
-            runs(function() {
             view.$('.action-more .icon').first().click();
             view.$('.action-edit').first().click();
             postTopicButton = view.$('.post-topic');
             expect(postTopicButton.length).toBe(0);
             view.$('.js-post-post-title').val(updatedTitle);
             view.$('.js-post-body textarea').val(updatedBody);
-            });
-
-            waitsFor(function() {
-                return $('.submit').length;
-            }, "submit button never appeared", 1000);
-            
-            runs(function() {
             view.$('.submit').click();
             AjaxHelpers.expectRequest(
                 requests, 'POST',
@@ -262,13 +194,11 @@ define([
                 annotated_content_info: TeamSpecHelpers.createAnnotatedContentInfo()
             });
 
-
             // Expect the thread to have been updated
             updatedThreadElement = view.$('.discussion-thread').first();
             expect(updatedThreadElement.find('.post-header-content h1').text().trim()).toEqual(updatedTitle);
             expect(updatedThreadElement.find('.post-body').text().trim()).toEqual(updatedBody);
         });
-        });
 
         it('cannot move a new thread to a different topic', function() {
             var requests = AjaxHelpers.requests(this),

lms/djangoapps/teams/static/teams/js/views/team_discussion.js

@@ -8,7 +8,6 @@
             var TeamDiscussionView = Backbone.View.extend({
                 initialize: function () {
                     window.$$course_id = this.$el.data("course-id");
-                    this.render();
                 },
 
                 render: function () {