From 269a8e9d4dd3d8824e97e0e6df6c75e032c574e8 Mon Sep 17 00:00:00 2001 From: Attiya Ishaque Date: Wed, 17 Feb 2016 17:36:26 +0500 Subject: [PATCH] Styling on forums response vote button. --- .../discussion/view/discussion_view_spec_helper.coffee | 8 ++++++++ .../discussion/view/thread_response_show_view_spec.coffee | 3 +++ .../src/discussion/views/discussion_content_view.coffee | 1 - .../templates/discussion/forum-action-vote.underscore | 2 +- 4 files changed, 12 insertions(+), 2 deletions(-) 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 fb736186ef..a263903bcc 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 @@ -23,6 +23,14 @@ class @DiscussionViewSpecHelper } $.extend(thread, props) + @checkVoteClasses = (view) -> + view.render() + display_button = view.$el.find(".display-vote") + expect(display_button.hasClass("is-hidden")).toBe(true) + action_button = view.$el.find(".action-vote") + # Check that inline css is not applied to the ".action-vote" + expect(action_button).not.toHaveAttr('style','display: inline; '); + @expectVoteRendered = (view, model, user) -> button = view.$el.find(".action-vote") expect(button.hasClass("is-checked")).toBe(user.voted(model)) diff --git a/common/static/coffee/spec/discussion/view/thread_response_show_view_spec.coffee b/common/static/coffee/spec/discussion/view/thread_response_show_view_spec.coffee index 41f9511e7e..827031a999 100644 --- a/common/static/coffee/spec/discussion/view/thread_response_show_view_spec.coffee +++ b/common/static/coffee/spec/discussion/view/thread_response_show_view_spec.coffee @@ -30,6 +30,9 @@ describe "ThreadResponseShowView", -> it "renders the vote state correctly", -> DiscussionViewSpecHelper.checkRenderVote(@view, @comment) + it "check the vote classes after renders", -> + DiscussionViewSpecHelper.checkVoteClasses(@view) + it "votes correctly via click", -> DiscussionViewSpecHelper.checkUpvote(@view, @comment, @user, $.Event("click")) diff --git a/common/static/coffee/src/discussion/views/discussion_content_view.coffee b/common/static/coffee/src/discussion/views/discussion_content_view.coffee index a7823b2049..6e2375e718 100644 --- a/common/static/coffee/src/discussion/views/discussion_content_view.coffee +++ b/common/static/coffee/src/discussion/views/discussion_content_view.coffee @@ -138,7 +138,6 @@ if Backbone? closed: (closed) -> @updateButtonState(".action-close", closed) @$(".post-label-closed").toggleClass("is-hidden", not closed) - @$(".action-vote").toggle(not closed) @$(".display-vote").toggle(closed) }) diff --git a/common/static/common/templates/discussion/forum-action-vote.underscore b/common/static/common/templates/discussion/forum-action-vote.underscore index b837236e21..a9cb2dcdc7 100644 --- a/common/static/common/templates/discussion/forum-action-vote.underscore +++ b/common/static/common/templates/discussion/forum-action-vote.underscore @@ -1,5 +1,5 @@
  • -