From 63cbe2f7c115e5602cd8f73bbc2f9029b8e38759 Mon Sep 17 00:00:00 2001 From: Manuel Lucena Date: Tue, 3 Oct 2017 18:25:22 +0200 Subject: [PATCH 1/9] 20171003 - [WIP] Functionality and tests for polls comments --- app/controllers/polls_controller.rb | 5 + app/helpers/flags_helper.rb | 2 +- app/models/comment.rb | 2 +- app/models/comment_notifier.rb | 1 + app/models/poll.rb | 5 +- app/views/polls/questions/show.html.erb | 92 +++++++++++++++++++ app/views/polls/show.html.erb | 6 +- app/views/shared/_comments.html.erb | 31 +++++++ ...71003143034_add_comments_count_to_polls.rb | 7 ++ db/schema.rb | 3 + spec/features/polls/polls_spec.rb | 33 +++++++ 11 files changed, 183 insertions(+), 4 deletions(-) create mode 100644 app/views/polls/questions/show.html.erb create mode 100644 app/views/shared/_comments.html.erb create mode 100644 db/migrate/20171003143034_add_comments_count_to_polls.rb diff --git a/app/controllers/polls_controller.rb b/app/controllers/polls_controller.rb index 41a038b46..289a33be3 100644 --- a/app/controllers/polls_controller.rb +++ b/app/controllers/polls_controller.rb @@ -1,8 +1,10 @@ class PollsController < ApplicationController + include CommentableActions load_and_authorize_resource has_filters %w{current expired incoming} + has_orders %w{most_voted newest oldest}, only: :show ::Poll::Answer # trigger autoload @@ -13,6 +15,9 @@ class PollsController < ApplicationController def show @questions = @poll.questions.for_render.sort_for_list + @commentable = @poll + @comment_tree = CommentTree.new(@commentable, params[:page], @current_order) + @answers_by_question_id = {} poll_answers = ::Poll::Answer.by_question(@poll.question_ids).by_author(current_user.try(:id)) poll_answers.each do |answer| diff --git a/app/helpers/flags_helper.rb b/app/helpers/flags_helper.rb index b5ba67f41..9983b34ae 100644 --- a/app/helpers/flags_helper.rb +++ b/app/helpers/flags_helper.rb @@ -12,7 +12,7 @@ module FlagsHelper def flagged?(flaggable) if flaggable.is_a? Comment - @comment_flags[flaggable.id] + @comment_flags[flaggable.id] unless flaggable.commentable_type == "Poll" else Flag.flagged?(current_user, flaggable) end diff --git a/app/models/comment.rb b/app/models/comment.rb index 8b68e11ad..37fa9b630 100644 --- a/app/models/comment.rb +++ b/app/models/comment.rb @@ -3,7 +3,7 @@ class Comment < ActiveRecord::Base include HasPublicAuthor include Graphqlable - COMMENTABLE_TYPES = %w(Debate Proposal Budget::Investment Poll::Question Legislation::Question Legislation::Annotation Topic).freeze + COMMENTABLE_TYPES = %w(Debate Proposal Budget::Investment Poll::Question Legislation::Question Legislation::Annotation Topic Poll).freeze acts_as_paranoid column: :hidden_at include ActsAsParanoidAliases diff --git a/app/models/comment_notifier.rb b/app/models/comment_notifier.rb index 68b350e6b..600009a23 100644 --- a/app/models/comment_notifier.rb +++ b/app/models/comment_notifier.rb @@ -22,6 +22,7 @@ class CommentNotifier end def email_on_comment? + return false if @comment.commentable.is_a?(Poll) commentable_author = @comment.commentable.author commentable_author != @author && commentable_author.email_on_comment? end diff --git a/app/models/poll.rb b/app/models/poll.rb index 84349bf0b..60b6d1406 100644 --- a/app/models/poll.rb +++ b/app/models/poll.rb @@ -1,6 +1,7 @@ class Poll < ActiveRecord::Base include Imageable - + acts_as_paranoid column: :hidden_at + include ActsAsParanoidAliases has_many :booth_assignments, class_name: "Poll::BoothAssignment" has_many :booths, through: :booth_assignments has_many :partial_results, through: :booth_assignments @@ -9,8 +10,10 @@ class Poll < ActiveRecord::Base has_many :officer_assignments, through: :booth_assignments has_many :officers, through: :officer_assignments has_many :questions + has_many :comments, as: :commentable has_and_belongs_to_many :geozones + belongs_to :author, -> { with_hidden }, class_name: 'User', foreign_key: 'author_id' validates :name, presence: true diff --git a/app/views/polls/questions/show.html.erb b/app/views/polls/questions/show.html.erb new file mode 100644 index 000000000..f8d12c59d --- /dev/null +++ b/app/views/polls/questions/show.html.erb @@ -0,0 +1,92 @@ +<% provide :title do %><%= @question.title %><% end %> + +
+
+
+ <%= back_link_to %> + +

<%= @question.title %>

+ + <% if @question.proposal.present? %> +
+ <%= link_to t('poll_questions.show.original_proposal'), @question.proposal %> +
+ <% end %> + + <% if can? :answer, @question %> + <%= link_to t('poll_questions.show.answer_this_question'), + @question.poll, + class: 'large button' %> + <% else %> + <%= render 'polls/reasons_for_not_answering', poll: @question.poll %> + <% end %> +
+ +
+

+ + <%= t('poll_questions.show.author') %> + +
+ <% if @question.author_visible_name.present? %> + <%= @question.author_visible_name %> + <% else %> + <%= link_to @question.author.name, @question.author %> + <% end %> + +

+ +

+ + <%= t('poll_questions.show.poll') %> + +
+ <%= link_to @question.poll.name, @question.poll %> +

+ +

+ + <%= t('poll_questions.show.dates_title') %> + +
+ <%= poll_dates(@question.poll) %> +

+
+
+
+ +<% if @question.video_url.present? %> +
+
+
+

+   + <%= t('proposals.show.title_video_url') %> +

+ <%= text_with_links @question.video_url %> +
+
+
+ +<% end %> + +
+
+

<%= t('poll_questions.show.more_info') %>

+ <%= @question.description %> +
+
+ +
+ <%= render "polls/questions/filter_subnav" %> + +
+ <%= render "shared/comments" %> +
+ +
+ <%= render 'documents/documents', + documents: @question.documents, + max_documents_allowed: Poll::Question.max_documents_allowed %> +
+
diff --git a/app/views/polls/show.html.erb b/app/views/polls/show.html.erb index b632fac55..ae334568c 100644 --- a/app/views/polls/show.html.erb +++ b/app/views/polls/show.html.erb @@ -79,6 +79,10 @@ <% end %> - + + +
+ <%= render "shared/comments" %> +
diff --git a/app/views/shared/_comments.html.erb b/app/views/shared/_comments.html.erb new file mode 100644 index 000000000..db097a7c4 --- /dev/null +++ b/app/views/shared/_comments.html.erb @@ -0,0 +1,31 @@ +<% cache [locale_and_user_status, @current_order, commentable_cache_key(@commentable), @comment_tree.comments, @comment_tree.comment_authors, @commentable.comments_count, @comment_flags] do %> +
+
+
+

+ <%= t("shared.comments.title") %> + (<%= @commentable.comments_count %>) +

+ + <%= render 'shared/wide_order_selector', i18n_namespace: "comments" %> + + <% if user_signed_in? %> + <%= render 'comments/form', {commentable: @commentable, parent_id: nil, toggeable: false} %> + <% else %> +
+ +
+ <%= t("shared.comments.login_to_comment", + signin: link_to(t("votes.signin"), new_user_session_path), + signup: link_to(t("votes.signup"), new_user_registration_path)).html_safe %> +
+ <% end %> + + <% @comment_tree.root_comments.each do |comment| %> + <%= render 'comments/comment', comment: comment %> + <% end %> + <%= paginate @comment_tree.root_comments %> +
+
+
+<% end %> diff --git a/db/migrate/20171003143034_add_comments_count_to_polls.rb b/db/migrate/20171003143034_add_comments_count_to_polls.rb new file mode 100644 index 000000000..675acae3f --- /dev/null +++ b/db/migrate/20171003143034_add_comments_count_to_polls.rb @@ -0,0 +1,7 @@ +class AddCommentsCountToPolls < ActiveRecord::Migration + def change + add_column :polls, :comments_count, :integer, default: 0 + add_column :polls, :author_id, :integer + add_column :polls, :hidden_at, :datetime + end +end diff --git a/db/schema.rb b/db/schema.rb index dbbd3ec46..d393716e6 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -792,6 +792,9 @@ ActiveRecord::Schema.define(version: 20171004151553) do t.boolean "geozone_restricted", default: false t.text "summary" t.text "description" + t.integer "comments_count", default: 0 + t.integer "author_id" + t.datetime "hidden_at" end add_index "polls", ["starts_at", "ends_at"], name: "index_polls_on_starts_at_and_ends_at", using: :btree diff --git a/spec/features/polls/polls_spec.rb b/spec/features/polls/polls_spec.rb index 22b90740a..1c18e752d 100644 --- a/spec/features/polls/polls_spec.rb +++ b/spec/features/polls/polls_spec.rb @@ -256,5 +256,38 @@ feature 'Polls' do expect(page).to have_link('Han Solo') end + scenario 'User can write comments' do + create(:comment, commentable: poll) + + visit poll_path(poll) + + expect(page).to have_css('.comment', count: 1) + + comment = Comment.last + within first('.comment') do + expect(page).to have_content comment.user.name + expect(page).to have_content I18n.l(comment.created_at, format: :datetime) + expect(page).to have_content comment.body + end + end + + scenario 'user can reply to comment' do + oliver = create(:user, username: 'Oliver Atom') + benji = create(:user, username: 'Benji Prince') + create(:comment, commentable: poll, user: oliver) + + login_as(oliver) + visit poll_path(poll) + + expect(page).to have_content oliver.username + end + + scenario 'user can upvote a comment' do + + end + + scenario 'user can downvote a comment' do + + end end end From c3d7d47c3f24de2ffa90edbb66f3b42d6704946d Mon Sep 17 00:00:00 2001 From: Manuel Lucena Date: Wed, 4 Oct 2017 15:23:24 +0200 Subject: [PATCH 2/9] 20171004 - Refactored specs for polls comments On branch mlucena-poll-comments Changes to be committed: modified: app/views/comments/show.html.erb modified: spec/features/polls/polls_spec.rb --- app/views/comments/show.html.erb | 2 +- spec/features/polls/polls_spec.rb | 52 ++++++++++++++++++++++++++++--- 2 files changed, 49 insertions(+), 5 deletions(-) diff --git a/app/views/comments/show.html.erb b/app/views/comments/show.html.erb index a779d1dfa..ce76633a0 100644 --- a/app/views/comments/show.html.erb +++ b/app/views/comments/show.html.erb @@ -1,7 +1,7 @@
<%= back_link_to commentable_path(@comment), - t("comments.show.return_to_commentable") + @comment.commentable.title %> + t("comments.show.return_to_commentable") + @comment.commentable.title unless @comment != "Poll" %>
diff --git a/spec/features/polls/polls_spec.rb b/spec/features/polls/polls_spec.rb index 1c18e752d..76932558b 100644 --- a/spec/features/polls/polls_spec.rb +++ b/spec/features/polls/polls_spec.rb @@ -271,23 +271,67 @@ feature 'Polls' do end end - scenario 'user can reply to comment' do + scenario 'user b can access to comments from user a' do oliver = create(:user, username: 'Oliver Atom') benji = create(:user, username: 'Benji Prince') create(:comment, commentable: poll, user: oliver) - login_as(oliver) + login_as(benji) visit poll_path(poll) expect(page).to have_content oliver.username end - scenario 'user can upvote a comment' do + scenario 'user b can reply to comments from user a', :js do + koji = create(:user, username: 'Koji Kabuto') + sayaka = create(:user, username: 'Sayaka') + comment = create(:comment, commentable: poll, user: koji) + login_as(sayaka) + visit poll_path(poll) + + click_link "Reply" + + within "#js-comment-form-comment_#{comment.id}" do + fill_in "comment-body-comment_#{comment.id}", with: 'MAZINGER!!.' + click_button 'Publish reply' + end + + within "#comment_#{comment.id}" do + expect(page).to have_content 'MAZINGER!!.' + end + + expect(page).to_not have_selector("#js-comment-form-comment_#{comment.id}", visible: true) end - scenario 'user can downvote a comment' do + scenario 'user can upvote a comment', :js do + goku = create(:user, username: 'Goku') + vegeta = create(:user, username: 'Vegeta') + comment = create(:comment, commentable: poll, user: goku) + login_as(vegeta) + visit poll_path(poll) + + within("#comment_#{comment.id}_votes") do + find('.in_favor a').click + + expect(page).to have_content "1 vote" + end + end + + scenario 'user can downvote a comment', :js do + doraemon = create(:user, username: 'Doraemon') + nobita = create(:user, username: 'Nobi Nobita') + comment = create(:comment, commentable: poll, user: doraemon) + + login_as(nobita) + visit poll_path(poll) + + within("#comment_#{comment.id}_votes") do + find('.against a').click + + expect(page).to have_content "1 vote" + end end end end From 8277e3cc2b7c332d2bd009adf8220759ded683bb Mon Sep 17 00:00:00 2001 From: Manuel Lucena Date: Thu, 5 Oct 2017 18:24:16 +0200 Subject: [PATCH 3/9] removed obsolete polls questions view --- app/views/polls/questions/show.html.erb | 92 ------------------------- app/views/polls/show.html.erb | 2 - 2 files changed, 94 deletions(-) delete mode 100644 app/views/polls/questions/show.html.erb diff --git a/app/views/polls/questions/show.html.erb b/app/views/polls/questions/show.html.erb deleted file mode 100644 index f8d12c59d..000000000 --- a/app/views/polls/questions/show.html.erb +++ /dev/null @@ -1,92 +0,0 @@ -<% provide :title do %><%= @question.title %><% end %> - -
-
-
- <%= back_link_to %> - -

<%= @question.title %>

- - <% if @question.proposal.present? %> -
- <%= link_to t('poll_questions.show.original_proposal'), @question.proposal %> -
- <% end %> - - <% if can? :answer, @question %> - <%= link_to t('poll_questions.show.answer_this_question'), - @question.poll, - class: 'large button' %> - <% else %> - <%= render 'polls/reasons_for_not_answering', poll: @question.poll %> - <% end %> -
- -
-

- - <%= t('poll_questions.show.author') %> - -
- <% if @question.author_visible_name.present? %> - <%= @question.author_visible_name %> - <% else %> - <%= link_to @question.author.name, @question.author %> - <% end %> - -

- -

- - <%= t('poll_questions.show.poll') %> - -
- <%= link_to @question.poll.name, @question.poll %> -

- -

- - <%= t('poll_questions.show.dates_title') %> - -
- <%= poll_dates(@question.poll) %> -

-
-
-
- -<% if @question.video_url.present? %> -
-
-
-

-   - <%= t('proposals.show.title_video_url') %> -

- <%= text_with_links @question.video_url %> -
-
-
- -<% end %> - -
-
-

<%= t('poll_questions.show.more_info') %>

- <%= @question.description %> -
-
- -
- <%= render "polls/questions/filter_subnav" %> - -
- <%= render "shared/comments" %> -
- -
- <%= render 'documents/documents', - documents: @question.documents, - max_documents_allowed: Poll::Question.max_documents_allowed %> -
-
diff --git a/app/views/polls/show.html.erb b/app/views/polls/show.html.erb index ae334568c..a67aca798 100644 --- a/app/views/polls/show.html.erb +++ b/app/views/polls/show.html.erb @@ -79,8 +79,6 @@ <% end %> - -
<%= render "shared/comments" %>
From faa2f31b3a4c698fa134d2d5df0db82ccbcbb5d8 Mon Sep 17 00:00:00 2001 From: rgarcia Date: Tue, 10 Oct 2017 12:04:16 +0200 Subject: [PATCH 4/9] Adds comment's tab --- app/views/polls/_filter_subnav.html.erb | 14 ++++++++++++++ app/views/polls/show.html.erb | 12 ++++++++---- 2 files changed, 22 insertions(+), 4 deletions(-) create mode 100644 app/views/polls/_filter_subnav.html.erb diff --git a/app/views/polls/_filter_subnav.html.erb b/app/views/polls/_filter_subnav.html.erb new file mode 100644 index 000000000..b096edaf2 --- /dev/null +++ b/app/views/polls/_filter_subnav.html.erb @@ -0,0 +1,14 @@ +
+
+
    +
  • + <%= link_to "#tab-comments" do %> +

    + <%= t("polls.show.comments_tab") %> + (<%= @poll.comments_count %>) +

    + <% end %> +
    • +
+
+
diff --git a/app/views/polls/show.html.erb b/app/views/polls/show.html.erb index 5d60ed284..d9d871249 100644 --- a/app/views/polls/show.html.erb +++ b/app/views/polls/show.html.erb @@ -128,10 +128,14 @@ <% end %> - -
- <%= render "shared/comments" %> -
+ +
+ <%= render "filter_subnav" %> + +
+ <%= render "comments" %> +
+
\ No newline at end of file From 23397eecb387fff16b1cb0c1b36517e63680d928 Mon Sep 17 00:00:00 2001 From: rgarcia Date: Tue, 10 Oct 2017 12:04:55 +0200 Subject: [PATCH 5/9] increases consistency by moving comment's view to poll's folder --- app/views/polls/_comments.html.erb | 24 ++++++++++++++++++++++ app/views/shared/_comments.html.erb | 31 ----------------------------- 2 files changed, 24 insertions(+), 31 deletions(-) create mode 100644 app/views/polls/_comments.html.erb delete mode 100644 app/views/shared/_comments.html.erb diff --git a/app/views/polls/_comments.html.erb b/app/views/polls/_comments.html.erb new file mode 100644 index 000000000..09b59cee6 --- /dev/null +++ b/app/views/polls/_comments.html.erb @@ -0,0 +1,24 @@ +<% cache [locale_and_user_status, @current_order, commentable_cache_key(@poll), @comment_tree.comments, @comment_tree.comment_authors, @poll.comments_count, @comment_flags] do %> +
+
+ <%= render 'shared/wide_order_selector', i18n_namespace: "comments" %> + + <% if user_signed_in? %> + <%= render 'comments/form', {commentable: @poll, parent_id: nil, toggeable: false} %> + <% else %> +
+ +
+ <%= t("polls.show.login_to_comment", + signin: link_to(t("votes.signin"), new_user_session_path), + signup: link_to(t("votes.signup"), new_user_registration_path)).html_safe %> +
+ <% end %> + + <% @comment_tree.root_comments.each do |comment| %> + <%= render 'comments/comment', comment: comment %> + <% end %> + <%= paginate @comment_tree.root_comments %> +
+
+<% end %> diff --git a/app/views/shared/_comments.html.erb b/app/views/shared/_comments.html.erb deleted file mode 100644 index db097a7c4..000000000 --- a/app/views/shared/_comments.html.erb +++ /dev/null @@ -1,31 +0,0 @@ -<% cache [locale_and_user_status, @current_order, commentable_cache_key(@commentable), @comment_tree.comments, @comment_tree.comment_authors, @commentable.comments_count, @comment_flags] do %> -
-
-
-

- <%= t("shared.comments.title") %> - (<%= @commentable.comments_count %>) -

- - <%= render 'shared/wide_order_selector', i18n_namespace: "comments" %> - - <% if user_signed_in? %> - <%= render 'comments/form', {commentable: @commentable, parent_id: nil, toggeable: false} %> - <% else %> -
- -
- <%= t("shared.comments.login_to_comment", - signin: link_to(t("votes.signin"), new_user_session_path), - signup: link_to(t("votes.signup"), new_user_registration_path)).html_safe %> -
- <% end %> - - <% @comment_tree.root_comments.each do |comment| %> - <%= render 'comments/comment', comment: comment %> - <% end %> - <%= paginate @comment_tree.root_comments %> -
-
-
-<% end %> From d405d70f4c9e5627c37cb6c11650203081499b6b Mon Sep 17 00:00:00 2001 From: rgarcia Date: Tue, 10 Oct 2017 12:05:02 +0200 Subject: [PATCH 6/9] add translations --- config/locales/en/general.yml | 2 ++ config/locales/es/general.yml | 2 ++ 2 files changed, 4 insertions(+) diff --git a/config/locales/en/general.yml b/config/locales/en/general.yml index 413a6abf8..77579a7ea 100644 --- a/config/locales/en/general.yml +++ b/config/locales/en/general.yml @@ -482,6 +482,8 @@ en: already_voted_in_web: "You have already participated in this poll. If you vote again it will be overwritten." back: Back to voting cant_answer_not_logged_in: "You must %{signin} or %{signup} to participate." + comments_tab: Comments + login_to_comment: You must %{signin} or %{signup} to leave a comment. signin: Sign in signup: Sign up cant_answer_verify_html: "You must %{verify_link} in order to answer." diff --git a/config/locales/es/general.yml b/config/locales/es/general.yml index b8747406b..11e5e252a 100644 --- a/config/locales/es/general.yml +++ b/config/locales/es/general.yml @@ -482,6 +482,8 @@ es: already_voted_in_web: "Ya has participado en esta votación. Si vuelves a votar se sobreescribirá tu resultado anterior." back: Volver a votaciones cant_answer_not_logged_in: "Necesitas %{signin} o %{signup} para participar." + comments_tab: Comentarios + login_to_comment: Necesitas %{signin} o %{signup} para comentar. signin: iniciar sesión signup: registrarte cant_answer_verify_html: "Por favor %{verify_link} para poder responder." From 37cae41ee91edcb386dc882f88ea893694fc56ae Mon Sep 17 00:00:00 2001 From: rgarcia Date: Tue, 10 Oct 2017 12:05:18 +0200 Subject: [PATCH 7/9] adds specs --- spec/features/comments/polls_spec.rb | 522 +++++++++++++++++++++++++++ 1 file changed, 522 insertions(+) create mode 100644 spec/features/comments/polls_spec.rb diff --git a/spec/features/comments/polls_spec.rb b/spec/features/comments/polls_spec.rb new file mode 100644 index 000000000..8ef528cd3 --- /dev/null +++ b/spec/features/comments/polls_spec.rb @@ -0,0 +1,522 @@ +require 'rails_helper' +include ActionView::Helpers::DateHelper + +feature 'Commenting polls' do + let(:user) { create :user } + let(:poll) { create :poll } + + scenario 'Index' do + 3.times { create(:comment, commentable: poll) } + + visit poll_path(poll) + + expect(page).to have_css('.comment', count: 3) + + comment = Comment.last + within first('.comment') do + expect(page).to have_content comment.user.name + expect(page).to have_content I18n.l(comment.created_at, format: :datetime) + expect(page).to have_content comment.body + end + end + + scenario 'Show' do + skip "Feature not implemented yet, review soon" + + parent_comment = create(:comment, commentable: poll) + first_child = create(:comment, commentable: poll, parent: parent_comment) + second_child = create(:comment, commentable: poll, parent: parent_comment) + + visit comment_path(parent_comment) + + expect(page).to have_css(".comment", count: 3) + expect(page).to have_content parent_comment.body + expect(page).to have_content first_child.body + expect(page).to have_content second_child.body + expect(page).to have_link "Go back to #{poll.name}", href: poll_path(poll) + + expect(page).to have_selector("ul#comment_#{parent_comment.id}>li", count: 2) + expect(page).to have_selector("ul#comment_#{first_child.id}>li", count: 1) + expect(page).to have_selector("ul#comment_#{second_child.id}>li", count: 1) + end + + scenario 'Collapsable comments', :js do + parent_comment = create(:comment, body: "Main comment", commentable: poll) + child_comment = create(:comment, body: "First subcomment", commentable: poll, parent: parent_comment) + grandchild_comment = create(:comment, body: "Last subcomment", commentable: poll, parent: child_comment) + + visit poll_path(poll) + + expect(page).to have_css('.comment', count: 3) + + find("#comment_#{child_comment.id}_children_arrow").trigger('click') + + expect(page).to have_css('.comment', count: 2) + expect(page).to_not have_content grandchild_comment.body + + find("#comment_#{child_comment.id}_children_arrow").trigger('click') + + expect(page).to have_css('.comment', count: 3) + expect(page).to have_content grandchild_comment.body + + find("#comment_#{parent_comment.id}_children_arrow").trigger('click') + + expect(page).to have_css('.comment', count: 1) + expect(page).to_not have_content child_comment.body + expect(page).to_not have_content grandchild_comment.body + end + + scenario 'Comment order' do + c1 = create(:comment, :with_confidence_score, commentable: poll, cached_votes_up: 100, + cached_votes_total: 120, created_at: Time.current - 2) + c2 = create(:comment, :with_confidence_score, commentable: poll, cached_votes_up: 10, + cached_votes_total: 12, created_at: Time.current - 1) + c3 = create(:comment, :with_confidence_score, commentable: poll, cached_votes_up: 1, + cached_votes_total: 2, created_at: Time.current) + + visit poll_path(poll, order: :most_voted) + + expect(c1.body).to appear_before(c2.body) + expect(c2.body).to appear_before(c3.body) + + visit poll_path(poll, order: :newest) + + expect(c3.body).to appear_before(c2.body) + expect(c2.body).to appear_before(c1.body) + + visit poll_path(poll, order: :oldest) + + expect(c1.body).to appear_before(c2.body) + expect(c2.body).to appear_before(c3.body) + end + + scenario 'Creation date works differently in roots and in child comments, when sorting by confidence_score' do + old_root = create(:comment, commentable: poll, created_at: Time.current - 10) + new_root = create(:comment, commentable: poll, created_at: Time.current) + old_child = create(:comment, commentable: poll, parent_id: new_root.id, created_at: Time.current - 10) + new_child = create(:comment, commentable: poll, parent_id: new_root.id, created_at: Time.current) + + visit poll_path(poll, order: :most_voted) + + expect(new_root.body).to appear_before(old_root.body) + expect(old_child.body).to appear_before(new_child.body) + + visit poll_path(poll, order: :newest) + + expect(new_root.body).to appear_before(old_root.body) + expect(new_child.body).to appear_before(old_child.body) + + visit poll_path(poll, order: :oldest) + + expect(old_root.body).to appear_before(new_root.body) + expect(old_child.body).to appear_before(new_child.body) + end + + scenario 'Turns links into html links' do + create :comment, commentable: poll, body: 'Built with http://rubyonrails.org/' + + visit poll_path(poll) + + within first('.comment') do + expect(page).to have_content 'Built with http://rubyonrails.org/' + expect(page).to have_link('http://rubyonrails.org/', href: 'http://rubyonrails.org/') + expect(find_link('http://rubyonrails.org/')[:rel]).to eq('nofollow') + expect(find_link('http://rubyonrails.org/')[:target]).to eq('_blank') + end + end + + scenario 'Sanitizes comment body for security' do + create :comment, commentable: poll, + body: " click me http://www.url.com" + + visit poll_path(poll) + + within first('.comment') do + expect(page).to have_content "click me http://www.url.com" + expect(page).to have_link('http://www.url.com', href: 'http://www.url.com') + expect(page).not_to have_link('click me') + end + end + + scenario 'Paginated comments' do + per_page = 10 + (per_page + 2).times { create(:comment, commentable: poll)} + + visit poll_path(poll) + + expect(page).to have_css('.comment', count: per_page) + within("ul.pagination") do + expect(page).to have_content("1") + expect(page).to have_content("2") + expect(page).to_not have_content("3") + click_link "Next", exact: false + end + + expect(page).to have_css('.comment', count: 2) + end + + feature 'Not logged user' do + scenario 'can not see comments forms' do + create(:comment, commentable: poll) + visit poll_path(poll) + + expect(page).to have_content 'You must Sign in or Sign up to leave a comment' + within('#comments') do + expect(page).to_not have_content 'Write a comment' + expect(page).to_not have_content 'Reply' + end + end + end + + scenario 'Create', :js do + login_as(user) + visit poll_path(poll) + + fill_in "comment-body-poll_#{poll.id}", with: 'Have you thought about...?' + click_button 'Publish comment' + + within "#comments" do + expect(page).to have_content 'Have you thought about...?' + end + + within "#tab-comments-label" do + expect(page).to have_content 'Comments (1)' + end + end + + scenario 'Errors on create', :js do + login_as(user) + visit poll_path(poll) + + click_button 'Publish comment' + + expect(page).to have_content "Can't be blank" + end + + scenario 'Reply', :js do + citizen = create(:user, username: 'Ana') + manuela = create(:user, username: 'Manuela') + comment = create(:comment, commentable: poll, user: citizen) + + login_as(manuela) + visit poll_path(poll) + + click_link "Reply" + + within "#js-comment-form-comment_#{comment.id}" do + fill_in "comment-body-comment_#{comment.id}", with: 'It will be done next week.' + click_button 'Publish reply' + end + + within "#comment_#{comment.id}" do + expect(page).to have_content 'It will be done next week.' + end + + expect(page).to_not have_selector("#js-comment-form-comment_#{comment.id}", visible: true) + end + + scenario 'Errors on reply', :js do + comment = create(:comment, commentable: poll, user: user) + + login_as(user) + visit poll_path(poll) + + click_link "Reply" + + within "#js-comment-form-comment_#{comment.id}" do + click_button 'Publish reply' + expect(page).to have_content "Can't be blank" + end + + end + + scenario "N replies", :js do + parent = create(:comment, commentable: poll) + + 7.times do + create(:comment, commentable: poll, parent: parent) + parent = parent.children.first + end + + visit poll_path(poll) + expect(page).to have_css(".comment.comment.comment.comment.comment.comment.comment.comment") + end + + scenario "Flagging as inappropriate", :js do + skip "Feature not implemented yet, review soon" + + comment = create(:comment, commentable: poll) + + login_as(user) + visit poll_path(poll) + + within "#comment_#{comment.id}" do + page.find("#flag-expand-comment-#{comment.id}").click + page.find("#flag-comment-#{comment.id}").click + + expect(page).to have_css("#unflag-expand-comment-#{comment.id}") + end + + expect(Flag.flagged?(user, comment)).to be + end + + scenario "Undoing flagging as inappropriate", :js do + skip "Feature not implemented yet, review soon" + + comment = create(:comment, commentable: poll) + Flag.flag(user, comment) + + login_as(user) + visit poll_path(poll) + + within "#comment_#{comment.id}" do + page.find("#unflag-expand-comment-#{comment.id}").click + page.find("#unflag-comment-#{comment.id}").click + + expect(page).to have_css("#flag-expand-comment-#{comment.id}") + end + + expect(Flag.flagged?(user, comment)).to_not be + end + + scenario "Flagging turbolinks sanity check", :js do + skip "Feature not implemented yet, review soon" + + poll = create(:poll, title: "Should we change the world?") + comment = create(:comment, commentable: poll) + + login_as(user) + visit polls_path + click_link "Should we change the world?" + + within "#comment_#{comment.id}" do + page.find("#flag-expand-comment-#{comment.id}").click + expect(page).to have_selector("#flag-comment-#{comment.id}") + end + end + + scenario "Erasing a comment's author" do + poll = create(:poll) + comment = create(:comment, commentable: poll, body: "this should be visible") + comment.user.erase + + visit poll_path(poll) + within "#comment_#{comment.id}" do + expect(page).to have_content('User deleted') + expect(page).to have_content('this should be visible') + end + end + + feature "Moderators" do + + scenario "can create comment as a moderator", :js do + skip "Feature not implemented yet, review soon" + + moderator = create(:moderator) + + login_as(moderator.user) + visit poll_path(poll) + + fill_in "comment-body-poll_#{poll.id}", with: "I am moderating!" + check "comment-as-moderator-poll_#{poll.id}" + click_button "Publish comment" + + within "#comments" do + expect(page).to have_content "I am moderating!" + expect(page).to have_content "Moderator ##{moderator.id}" + expect(page).to have_css "div.is-moderator" + expect(page).to have_css "img.moderator-avatar" + end + end + + scenario "can create reply as a moderator", :js do + skip "Feature not implemented yet, review soon" + + citizen = create(:user, username: "Ana") + manuela = create(:user, username: "Manuela") + moderator = create(:moderator, user: manuela) + comment = create(:comment, commentable: poll, user: citizen) + + login_as(manuela) + visit poll_path(poll) + + click_link "Reply" + + within "#js-comment-form-comment_#{comment.id}" do + fill_in "comment-body-comment_#{comment.id}", with: "I am moderating!" + check "comment-as-moderator-comment_#{comment.id}" + click_button 'Publish reply' + end + + within "#comment_#{comment.id}" do + expect(page).to have_content "I am moderating!" + expect(page).to have_content "Moderator ##{moderator.id}" + expect(page).to have_css "div.is-moderator" + expect(page).to have_css "img.moderator-avatar" + end + + expect(page).to_not have_selector("#js-comment-form-comment_#{comment.id}", visible: true) + end + + scenario "can not comment as an administrator" do + skip "Feature not implemented yet, review soon" + + moderator = create(:moderator) + + login_as(moderator.user) + visit poll_path(poll) + + expect(page).to_not have_content "Comment as administrator" + end + end + + feature "Administrators" do + scenario "can create comment as an administrator", :js do + skip "Feature not implemented yet, review soon" + + admin = create(:administrator) + + login_as(admin.user) + visit poll_path(poll) + + fill_in "comment-body-poll_#{poll.id}", with: "I am your Admin!" + check "comment-as-administrator-poll_#{poll.id}" + click_button "Publish comment" + + within "#comments" do + expect(page).to have_content "I am your Admin!" + expect(page).to have_content "Administrator ##{admin.id}" + expect(page).to have_css "div.is-admin" + expect(page).to have_css "img.admin-avatar" + end + end + + scenario "can create reply as an administrator", :js do + skip "Feature not implemented yet, review soon" + + citizen = create(:user, username: "Ana") + manuela = create(:user, username: "Manuela") + admin = create(:administrator, user: manuela) + comment = create(:comment, commentable: poll, user: citizen) + + login_as(manuela) + visit poll_path(poll) + + click_link "Reply" + + within "#js-comment-form-comment_#{comment.id}" do + fill_in "comment-body-comment_#{comment.id}", with: "Top of the world!" + check "comment-as-administrator-comment_#{comment.id}" + click_button 'Publish reply' + end + + within "#comment_#{comment.id}" do + expect(page).to have_content "Top of the world!" + expect(page).to have_content "Administrator ##{admin.id}" + expect(page).to have_css "div.is-admin" + expect(page).to have_css "img.admin-avatar" + end + + expect(page).to_not have_selector("#js-comment-form-comment_#{comment.id}", visible: true) + end + + scenario "can not comment as a moderator" do + skip "Feature not implemented yet, review soon" + + admin = create(:administrator) + + login_as(admin.user) + visit poll_path(poll) + + expect(page).to_not have_content "Comment as moderator" + end + end + + feature 'Voting comments' do + + background do + @manuela = create(:user, verified_at: Time.current) + @pablo = create(:user) + @poll = create(:poll) + @comment = create(:comment, commentable: @poll) + + login_as(@manuela) + end + + scenario 'Show' do + create(:vote, voter: @manuela, votable: @comment, vote_flag: true) + create(:vote, voter: @pablo, votable: @comment, vote_flag: false) + + visit poll_path(@poll) + + within("#comment_#{@comment.id}_votes") do + within(".in_favor") do + expect(page).to have_content "1" + end + + within(".against") do + expect(page).to have_content "1" + end + + expect(page).to have_content "2 votes" + end + end + + scenario 'Create', :js do + visit poll_path(@poll) + + within("#comment_#{@comment.id}_votes") do + find(".in_favor a").click + + within(".in_favor") do + expect(page).to have_content "1" + end + + within(".against") do + expect(page).to have_content "0" + end + + expect(page).to have_content "1 vote" + end + end + + scenario 'Update', :js do + visit poll_path(@poll) + + within("#comment_#{@comment.id}_votes") do + find('.in_favor a').click + find('.against a').click + + within('.in_favor') do + expect(page).to have_content "0" + end + + within('.against') do + expect(page).to have_content "1" + end + + expect(page).to have_content "1 vote" + end + end + + scenario 'Trying to vote multiple times', :js do + visit poll_path(@poll) + + within("#comment_#{@comment.id}_votes") do + find('.in_favor a').click + find('.in_favor a').click + + within('.in_favor') do + expect(page).to have_content "1" + end + + within('.against') do + expect(page).to have_content "0" + end + + expect(page).to have_content "1 vote" + end + end + end + +end From 843048a86176cbfe4b4f023a0b0debcd740add63 Mon Sep 17 00:00:00 2001 From: rgarcia Date: Tue, 10 Oct 2017 12:14:04 +0200 Subject: [PATCH 8/9] cleans up --- app/controllers/polls_controller.rb | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/app/controllers/polls_controller.rb b/app/controllers/polls_controller.rb index 6240d4809..7f8fc8e4d 100644 --- a/app/controllers/polls_controller.rb +++ b/app/controllers/polls_controller.rb @@ -1,6 +1,4 @@ class PollsController < ApplicationController - include CommentableActions - include PollsHelper load_and_authorize_resource @@ -17,13 +15,13 @@ class PollsController < ApplicationController def show @questions = @poll.questions.for_render.sort_for_list @token = poll_voter_token(@poll, current_user) - + @answers_by_question_id = {} poll_answers = ::Poll::Answer.by_question(@poll.question_ids).by_author(current_user.try(:id)) poll_answers.each do |answer| @answers_by_question_id[answer.question_id] = answer.answer end - + @commentable = @poll @comment_tree = CommentTree.new(@commentable, params[:page], @current_order) end From ffdbdacc789c43bddf885c89d71e9cb4874b70ab Mon Sep 17 00:00:00 2001 From: rgarcia Date: Tue, 10 Oct 2017 12:47:09 +0200 Subject: [PATCH 9/9] fixes specs --- app/views/comments/show.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/comments/show.html.erb b/app/views/comments/show.html.erb index ce76633a0..2b2e3e841 100644 --- a/app/views/comments/show.html.erb +++ b/app/views/comments/show.html.erb @@ -1,7 +1,7 @@
<%= back_link_to commentable_path(@comment), - t("comments.show.return_to_commentable") + @comment.commentable.title unless @comment != "Poll" %> + t("comments.show.return_to_commentable") + @comment.commentable.title unless @commentable.class == Poll %>