Merge pull request #9187 from edx/release

Release merge to master
This commit is contained in:
Ned Batchelder
2015-08-04 14:18:50 -04:00
3 changed files with 43 additions and 10 deletions

View File

@@ -224,6 +224,13 @@ describe "DiscussionThreadListView", ->
checkThreadsOrdering(view, sort_order, type)
expect(view.$el.find(".forum-nav-thread-comments-count:visible").length).toEqual(if type == "votes" then 0 else 4)
expect(view.$el.find(".forum-nav-thread-votes-count:visible").length).toEqual(if type == "votes" then 4 else 0)
if type == "votes"
expect(
_.map(
view.$el.find(".forum-nav-thread-votes-count"),
(element) -> $(element).text().trim()
)
).toEqual(["+25 votes", "+20 votes", "+42 votes", "+12 votes"])
it "with sort preference date", ->
checkRender(@threads, "date", ["Thread1", "Thread4", "Thread2", "Thread3"])