diff --git a/common/static/coffee/spec/discussion/view/discussion_thread_list_view_spec.coffee b/common/static/coffee/spec/discussion/view/discussion_thread_list_view_spec.coffee index 06d2a7783f..3f434dd2fd 100644 --- a/common/static/coffee/spec/discussion/view/discussion_thread_list_view_spec.coffee +++ b/common/static/coffee/spec/discussion/view/discussion_thread_list_view_spec.coffee @@ -2,75 +2,8 @@ describe "DiscussionThreadListView", -> beforeEach -> DiscussionSpecHelper.setUpGlobals() - setFixtures """ - + DiscussionSpecHelper.setUnderscoreFixtures() + appendSetFixtures(""" - -
- """ + """) @threads = [ DiscussionViewSpecHelper.makeThreadWithProps({ id: "1", @@ -194,7 +115,7 @@ describe "DiscussionThreadListView", -> spyOn($, "ajax") @discussion = new Discussion([]) - @view = new DiscussionThreadListView({collection: @discussion, el: $(".forum-nav")}) + @view = new DiscussionThreadListView({collection: @discussion, el: $("#fixture-element")}) @view.render() renderSingleThreadWithProps = (props) -> @@ -202,7 +123,7 @@ describe "DiscussionThreadListView", -> makeView = (discussion) -> return new DiscussionThreadListView( - el: $(".forum-nav"), + el: $("#fixture-element"), collection: discussion ) @@ -444,23 +365,23 @@ describe "DiscussionThreadListView", -> it "for pinned", -> renderSingleThreadWithProps({pinned: true}) - expect($(".forum-nav-thread-label-pinned").length).toEqual(1) + expect($(".post-label-pinned").length).toEqual(1) it "for following", -> renderSingleThreadWithProps({subscribed: true}) - expect($(".forum-nav-thread-label-following").length).toEqual(1) + expect($(".post-label-following").length).toEqual(1) it "for moderator", -> renderSingleThreadWithProps({user_id: @moderatorId}) - expect($(".forum-nav-thread-label-staff").length).toEqual(1) + expect($(".post-label-by-staff").length).toEqual(1) it "for administrator", -> renderSingleThreadWithProps({user_id: @administratorId}) - expect($(".forum-nav-thread-label-staff").length).toEqual(1) + expect($(".post-label-by-staff").length).toEqual(1) it "for community TA", -> renderSingleThreadWithProps({user_id: @communityTaId}) - expect($(".forum-nav-thread-label-community-ta").length).toEqual(1) + expect($(".post-label-by-community-ta").length).toEqual(1) it "when none should be present", -> renderSingleThreadWithProps({}) diff --git a/common/static/coffee/spec/discussion/view/discussion_view_spec_helper.coffee b/common/static/coffee/spec/discussion/view/discussion_view_spec_helper.coffee index be0c1bca96..2afd95af81 100644 --- a/common/static/coffee/spec/discussion/view/discussion_view_spec_helper.coffee +++ b/common/static/coffee/spec/discussion/view/discussion_view_spec_helper.coffee @@ -7,6 +7,7 @@ class @DiscussionViewSpecHelper pinned: false, endorsed: false, votes: {up_count: '0'}, + read: false, unread_comments_count: 0, comments_count: 0, abuse_flaggers: [],