decidim 0.0.5 → 0.0.6

data/decidim-comments/lib/decidim/comments/api/comment_type.rb

@@ -12,6 +12,12 @@ module Decidim
 
       field :id, !types.ID, "The Comment's unique ID"
 
+      field :sgid, !types.String, "The Comment's signed global id" do
+        resolve lambda { |obj, _args, _ctx|
+          obj.to_sgid.to_s
+        }
+      end
+
       field :body, !types.String, "The comment message"
 
       field :createdAt, !types.String, "The creation date of the comment" do
@@ -57,6 +63,12 @@ module Decidim
           obj.accepts_new_comments? && obj.comments.size.positive?
         }
       end
+
+      field :alreadyReported, !types.Boolean, "Check if the current user has reported the comment" do
+        resolve lambda { |obj, _args, ctx|
+          obj.reported_by?(ctx[:current_user])
+        }
+      end
     end
   end
 end

data/decidim-comments/lib/decidim/comments/commentable.rb

@@ -9,8 +9,6 @@ module Decidim
       extend ActiveSupport::Concern
 
       included do
-        include Decidim::Authorable
-
         has_many :comments, as: :commentable, foreign_key: "decidim_commentable_id", foreign_type: "decidim_commentable_type", class_name: "Decidim::Comments::Comment"
 
         # Public: Wether the object's comments are visible or not.

data/decidim-comments/lib/decidim/comments/engine.rb

@@ -7,6 +7,7 @@ require "jquery-rails"
 require "sassc-rails"
 require "foundation-rails"
 require "foundation_rails_helper"
+require "autoprefixer-rails"
 
 require "decidim/comments/query_extensions"
 require "decidim/comments/mutation_extensions"

data/decidim-comments/lib/decidim/comments/test/factories.rb

@@ -1,4 +1,7 @@
 # frozen_string_literal: true
+require "decidim/core/test/factories"
+require "decidim/admin/test/factories"
+
 FactoryGirl.define do
   factory :comment, class: "Decidim::Comments::Comment" do
     author { build(:user, organization: commentable.organization) }

data/decidim-comments/spec/commands/create_comment_spec.rb

@@ -64,6 +64,17 @@ module Decidim
             end.to change { Comment.count }.by(1)
           end
 
+          context "and the commentable doesn't have an author" do
+            before do
+              commentable.author = nil
+            end
+
+            it "doesn't send an email" do
+              expect(CommentNotificationMailer).not_to receive(:comment_created)
+              command.call
+            end
+          end
+
           context "and the comment is a root comment" do
             it "sends an email to the author of the commentable" do
               expect(CommentNotificationMailer)

data/decidim-comments/spec/features/admin_manages_comments_spec.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+describe "Admin manages comments", type: :feature do
+  include_context "admin"
+  it_behaves_like "manage moderations"
+  include_context "feature"
+  let(:manifest_name) { "dummy" }
+
+  let!(:resources) { create_list(:dummy_resource, 3, feature: current_feature) }
+  let!(:reportables) do
+    resources.map do |resource|
+      create(:comment, commentable: resource)
+    end
+  end
+
+  before do
+    switch_to_host(organization.host)
+    login_as user, scope: :user
+    visit decidim_admin.manage_feature_path(participatory_process_id: participatory_process, feature_id: current_feature)
+  end
+end

data/decidim-comments/spec/features/comments_spec.rb

@@ -1,179 +1,11 @@
 # frozen_string_literal: true
 require "spec_helper"
 
-describe "Comments", type: :feature do
-  let!(:organization) { create(:organization) }
+describe "Comments", type: :feature, perform_enqueued: true do
   let!(:feature) { create(:feature, manifest_name: :dummy, organization: organization) }
-  let!(:user) { create(:user, :confirmed, organization: organization) }
-  let!(:commentable) { create(:dummy_resource, feature: feature) }
-  let!(:comments) {
-    3.times.map do
-      create(:comment, commentable: commentable)
-    end
-  }
-  let(:authenticated) { false }
+  let!(:author) { create(:user, :confirmed, organization: organization) }
+  let!(:commentable) { create(:dummy_resource, feature: feature, author: author) }
 
-  def visit_commentable_path
-    if authenticated
-      login_as user, scope: :user
-    end
-    visit decidim_dummy.dummy_resource_path(commentable, feature_id: commentable.feature, participatory_process_id: commentable.feature.participatory_process)
-  end
-
-  before do
-    switch_to_host(organization.host)
-  end
-
-  it "user should see a list of comments" do
-    visit_commentable_path
-
-    expect(page).to have_selector("#comments")
-    expect(page).to have_selector("article.comment", count: comments.length)
-
-    within "#comments" do
-      comments.each do |comment|
-        expect(page).to have_content comment.author.name
-        expect(page).to have_content comment.body
-      end
-    end
-  end
-
-  it "user should be able to sort the comments" do
-    comment = create(:comment, commentable: commentable, body: "Most Rated Comment")
-    create(:comment_vote, comment: comment, author: user, weight: 1)
-
-    visit_commentable_path
-
-    page.find("div.order-by__dropdown.order-by__dropdown--right").hover
-    within "div.order-by__dropdown.order-by__dropdown--right" do
-      click_link "Best rated"
-    end
-
-    within "#comments" do
-      expect(page.find('.comment', match: :first)).to have_content "Most Rated Comment"
-    end
-  end
-
-  context "when not authenticated" do
-    it "user should not see the form to add comments" do
-      visit_commentable_path
-      expect(page).not_to have_selector(".add-comment form")
-    end
-  end
-
-  context "when authenticated" do
-    let(:authenticated) { true }
-
-    it "user sees the form to add comments" do
-      visit_commentable_path
-
-      expect(page).to have_selector(".add-comment form")
-    end
-
-    it "user can add a new comment" do
-      visit_commentable_path
-
-      expect(page).to have_selector(".add-comment form")
-
-      within ".add-comment form" do
-        fill_in "add-comment-#{commentable.commentable_type}-#{commentable.id}", with: "This is a new comment"
-        click_button "Send"
-      end
-
-      within "#comments" do
-        expect(page).to have_content user.name
-        expect(page).to have_content "This is a new comment"
-      end
-    end
-
-    context "when the user has verified organizations" do
-      let(:user_group) { create(:user_group, :verified) }
-
-      before do
-        create(:user_group_membership, user: user, user_group: user_group)
-      end
-
-      it "user can add a new comment as a user group" do
-        visit_commentable_path
-
-        expect(page).to have_selector(".add-comment form")
-
-        within ".add-comment form" do
-          fill_in "add-comment-#{commentable.commentable_type}-#{commentable.id}", with: "This is a new comment"
-          select user_group.name, from: "Comment as"
-          click_button "Send"
-        end
-
-        within "#comments" do
-          expect(page).to have_content user_group.name
-          expect(page).to have_content "This is a new comment"
-        end
-      end
-    end
-
-    it "user can reply a comment" do
-      comment = create(:comment, commentable: commentable)
-
-      visit_commentable_path
-
-      expect(page).to have_selector(".comment__reply")
-
-      within "#comments #comment_#{comment.id}" do
-        click_button "Reply"
-        find("textarea").set("This is a reply")
-        click_button "Send"
-
-        expect(page).to have_content "This is a reply"
-      end
-    end
-
-    context "when arguable option is enabled" do
-      before do
-        expect_any_instance_of(Decidim::DummyResource).to receive(:comments_have_alignment?).and_return(true)
-      end
-
-      it "user can comment in favor" do
-        visit_commentable_path
-
-        expect(page).to have_selector(".add-comment form")
-
-        page.find('.opinion-toggle--ok').click
-
-        within ".add-comment form" do
-          fill_in "add-comment-#{commentable.commentable_type}-#{commentable.id}", with: "I am in favor about this!"
-          click_button "Send"
-        end
-
-        within "#comments" do
-          expect(page).to have_selector 'span.success.label', text: "In favor"
-        end
-      end
-    end
-
-    context "when votable option is enabled" do
-      before do
-        expect_any_instance_of(Decidim::DummyResource).to receive(:comments_have_votes?).and_return(true)
-      end
-
-      it "user can upvote a comment" do
-        visit_commentable_path
-
-        within "#comment_#{comments[0].id}" do
-          expect(page).to have_selector('.comment__votes--up', text: /0/)
-          page.find('.comment__votes--up').click
-          expect(page).to have_selector('.comment__votes--up', text: /1/)
-        end
-      end
-
-      it "user can downvote a comment" do
-        visit_commentable_path
-
-        within "#comment_#{comments[0].id}" do
-          expect(page).to have_selector('.comment__votes--down', text: /0/)
-          page.find('.comment__votes--down').click
-          expect(page).to have_selector('.comment__votes--down', text: /1/)
-        end
-      end
-    end
-  end
+  let(:resource_path) { decidim_dummy.dummy_resource_path(commentable, feature_id: commentable.feature, participatory_process_id: commentable.feature.participatory_process) }
+  include_examples "comments"
 end

data/decidim-comments/spec/features/process_admin_manages_comments_spec.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+describe "Process admin manages comments", type: :feature do
+  include_context "admin"
+  let(:user) { process_admin }
+  it_behaves_like "manage moderations"
+  include_context "feature"
+  let(:manifest_name) { "proposals" }
+
+  let!(:resources) { create_list(:dummy_resource, 3, feature: current_feature) }
+  let!(:reportables) do
+    resources.map do |resource|
+      create(:comment, commentable: resource)
+    end
+  end
+  
+  before do
+    switch_to_host(organization.host)
+    login_as user, scope: :user
+    visit decidim_admin.manage_feature_path(participatory_process_id: participatory_process, feature_id: current_feature)
+  end
+end

data/decidim-comments/spec/features/report_comment_spec.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+require "spec_helper"
+
+describe "Report Comment", type: :feature do
+  include_context "feature"
+  include_examples "reports"
+
+  let(:manifest_name) { "dummy" }
+  let!(:commentable) { create(:dummy_resource, feature: feature) }
+  let!(:reportable) { create(:comment, commentable: commentable) }
+  let(:reportable_path) { decidim_dummy.dummy_resource_path(commentable, feature_id: commentable.feature, participatory_process_id: commentable.feature.participatory_process) }
+
+  let!(:user) { create :user, :confirmed, organization: organization }
+
+  let!(:feature) do
+    create(:feature,
+      manifest: manifest,
+      participatory_process: participatory_process)
+  end
+end

data/decidim-comments/spec/models/abilities/admin_user_spec.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+require "spec_helper"
+
+describe Decidim::Comments::Abilities::AdminUser do
+  let(:user) { build(:user, :admin) }
+  let(:context) { {} }
+
+  subject { described_class.new(user, context) }
+
+  context "when the user is not an admin" do
+    let(:user) { build(:user) }
+
+    it "doesn't have any permission" do
+      expect(subject.permissions[:can]).to be_empty
+      expect(subject.permissions[:cannot]).to be_empty
+    end
+  end
+
+  it { is_expected.to be_able_to(:manage, Decidim::Comments::Comment) }
+end

data/decidim-comments/spec/models/abilities/process_admin_user_spec.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+require "spec_helper"
+
+describe Decidim::Comments::Abilities::ProcessAdminUser do
+  let(:user) { build(:user) }
+  let(:user_process) { create :participatory_process, organization: user.organization }
+  let(:context) { {} }
+
+  subject { described_class.new(user, context) }
+
+  context "when the user is an admin" do
+    let(:user) { build(:user, :admin) }
+
+    it "doesn't have any permission" do
+      expect(subject.permissions[:can]).to be_empty
+      expect(subject.permissions[:cannot]).to be_empty
+    end
+  end
+
+  it { is_expected.to be_able_to(:manage, Decidim::Comments::Comment) }
+end

data/decidim-comments/spec/models/comment_spec.rb

@@ -13,6 +13,7 @@ module Decidim
       subject { comment }
 
       include_examples "authorable"
+      include_examples "reportable"
 
       it "is valid" do
         expect(subject).to be_valid

data/decidim-comments/spec/queries/sorted_comments_spec.rb

@@ -31,6 +31,17 @@ describe Decidim::Comments::SortedComments do
     expect(subject.query).to eq [previous_comment, comment, future_comment]
   end
 
+  context "when the comment is hidden" do
+    before do
+      moderation = create(:moderation, reportable: comment, participatory_process: comment.feature.participatory_process, report_count: 1, hidden_at: Time.current)
+      create(:report, moderation: moderation)
+    end
+
+    it "is not included in the query" do
+      expect(subject.query).to be_empty
+    end
+  end
+
   context "When order_by is not default" do
     context "When order by recent" do
       let!(:order_by) {"recent"}

data/decidim-comments/spec/shared/admin_shared_context.rb

@@ -0,0 +1,11 @@
+RSpec.shared_context "admin" do
+  let(:organization) { create(:organization) }
+  let!(:user) { create(:user, :admin, :confirmed, organization: organization) }
+  let(:participatory_process) { create(:participatory_process, organization: organization) }
+  let(:process_admin) { create :user, :confirmed, organization: organization }
+  let!(:user_role) { create :participatory_process_user_role, user: process_admin, participatory_process: participatory_process }
+  let(:current_feature) { create :feature, participatory_process: participatory_process }
+  let!(:dummy) { create :dummy_resource, feature: current_feature }
+  let!(:category) { create :category, participatory_process: participatory_process }
+  let!(:scope) { create :scope, organization: organization }
+end

data/decidim-comments/spec/types/comment_type_spec.rb

@@ -8,6 +8,16 @@ module Decidim
       include_context "graphql type"
 
       let(:model) { FactoryGirl.create(:comment) }
+      let(:sgid) { double("sgid", to_s: "1234") }
+
+      describe "sgid" do
+        let(:query) { "{ sgid }" }
+
+        it "returns its signed global id" do
+          expect(model).to receive(:to_sgid).at_least(:once).and_return(sgid)
+          expect(response).to include("sgid" => model.to_sgid.to_s)
+        end
+      end
 
       describe "createdAt" do
         let(:query) { "{ createdAt }" }
@@ -106,6 +116,15 @@ module Decidim
           expect(response).to include("downVoted" => true)
         end
       end
+
+      describe "alreadyReported" do
+        let(:query) { "{ alreadyReported }" }
+
+        it "returns the reported_by? method evaluation with the current user" do
+          expect(model).to receive(:reported_by?).with(current_user).and_return(true)
+          expect(response).to include("alreadyReported" => true)
+        end
+      end
     end
   end
 end