decidim 0.0.8.1 → 0.1.0

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

@@ -6,8 +6,8 @@ module Decidim
     describe CreateComment, :db do
       describe "call" do
         let(:organization) { create(:organization) }
-        let(:participatory_process) { create(:participatory_process, organization: organization)}
-        let(:feature) { create(:feature, participatory_process: participatory_process)}
+        let(:participatory_process) { create(:participatory_process, organization: organization) }
+        let(:feature) { create(:feature, participatory_process: participatory_process) }
         let(:author) { create(:user, organization: organization) }
         let(:dummy_resource) { create :dummy_resource, feature: feature }
         let(:commentable) { dummy_resource }
@@ -52,13 +52,15 @@ module Decidim
           end
 
           it "creates a new comment" do
-            expect(Comment).to receive(:create!).with({
+            expect(Comment).to receive(:create!).with(
               author: author,
               commentable: commentable,
+              root_commentable: commentable,
               body: body,
               alignment: alignment,
               decidim_user_group_id: user_group_id
-            }).and_call_original
+            ).and_call_original
+
             expect do
               command.call
             end.to change { Comment.count }.by(1)
@@ -107,7 +109,12 @@ module Decidim
           end
 
           context "and the comment is a reply" do
-            let (:commentable) { create(:comment, commentable: dummy_resource) }
+            let(:commentable) { create(:comment, commentable: dummy_resource) }
+
+            it "stores the root commentable" do
+              command.call
+              expect(Comment.last.root_commentable).to eq(dummy_resource)
+            end
 
             it "sends an email to the author of the parent comment" do
               expect(CommentNotificationMailer)
@@ -119,7 +126,7 @@ module Decidim
             end
 
             context "and I am the author of the parent comment" do
-              let (:commentable) { create(:comment, author: author, commentable: dummy_resource) }
+              let(:commentable) { create(:comment, author: author, commentable: dummy_resource) }
 
               it "doesn't send an email" do
                 expect(CommentNotificationMailer).not_to receive(:reply_created)

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

@@ -51,9 +51,7 @@ module Decidim
           end
 
           it "creates a new comment vote" do
-            expect(comment.up_votes).to receive(:create!).with({
-              author: author
-            }).and_call_original
+            expect(comment.up_votes).to receive(:create!).with(author: author).and_call_original
             expect do
               command.call
             end.to change { CommentVote.count }.by(1)
@@ -102,9 +100,7 @@ module Decidim
               end
 
               it "creates a new comment vote" do
-                expect(comment.down_votes).to receive(:create!).with({
-                  author: author
-                }).and_call_original
+                expect(comment.down_votes).to receive(:create!).with(author: author).and_call_original
                 expect do
                   command.call
                 end.to change { CommentVote.count }.by(1)

data/decidim-comments/spec/factories.rb

@@ -1,2 +1,3 @@
+# frozen_string_literal: true
 require "decidim/core/test/factories"
 require "decidim/comments/test/factories"

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

@@ -6,18 +6,18 @@ describe "Comment notifications", type: :feature 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
+  let!(:comments) do
+    Array.new(3) do
       create(:comment, commentable: commentable)
     end
-  }
+  end
 
   before do
     switch_to_host(organization.host)
     login_as user, scope: :user
   end
 
-  it "commentable author receives an email with a link to the comment", perform_enqueued: true  do
+  it "commentable author receives an email with a link to the comment", perform_enqueued: true do
     visit decidim_dummy.dummy_resource_path(commentable, feature_id: commentable.feature, participatory_process_id: commentable.feature.participatory_process)
     expect(page).to have_selector(".add-comment form")
 

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

@@ -15,7 +15,7 @@ describe "Process admin manages comments", type: :feature do
       create(:comment, commentable: resource)
     end
   end
-  
+
   before do
     switch_to_host(organization.host)
     login_as user, scope: :user

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

@@ -13,8 +13,10 @@ describe "Report Comment", type: :feature do
   let!(:user) { create :user, :confirmed, organization: organization }
 
   let!(:feature) do
-    create(:feature,
+    create(
+      :feature,
       manifest: manifest,
-      participatory_process: participatory_process)
+      participatory_process: participatory_process
+    )
   end
 end

data/decidim-comments/spec/helpers/comments_helper_spec.rb

@@ -10,12 +10,12 @@ module Decidim
         it "should render the react component `Comments` with the correct data" do
           expect(helper)
             .to receive(:react_comments_component)
-            .with("comments-for-DummyResource-1", {
+            .with(
+              "comments-for-DummyResource-1",
               commentableType: "Decidim::DummyResource",
               commentableId: "1",
               locale: I18n.locale
-            })
-            .and_call_original
+            ).and_call_original
 
           helper.comments_for(dummy_resource)
         end

data/decidim-comments/spec/mailers/comment_notification_mailer_spec.rb

@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+# frozen_string_literal: true
 require "spec_helper"
 
 module Decidim
@@ -6,7 +7,7 @@ module Decidim
     describe CommentNotificationMailer, type: :mailer do
       let(:commentable) { create(:dummy_resource) }
       let(:comment) { create(:comment, commentable: commentable) }
-      let(:reply) { create(:comment, commentable: comment)}
+      let(:reply) { create(:comment, commentable: comment) }
 
       describe "comment_created" do
         let(:mail) { described_class.comment_created(user, comment, commentable) }

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

@@ -6,7 +6,7 @@ module Decidim
     describe Comment do
       let!(:commentable) { create(:dummy_resource) }
       let!(:comment) { create(:comment, commentable: commentable) }
-      let!(:replies) { 3.times.map { create(:comment, commentable: comment) } }
+      let!(:replies) { Array.new(3) { create(:comment, commentable: comment, root_commentable: commentable) } }
       let!(:up_vote) { create(:comment_vote, :up_vote, comment: comment) }
       let!(:down_vote) { create(:comment_vote, :down_vote, comment: comment) }
 
@@ -23,6 +23,10 @@ module Decidim
         expect(subject.commentable).to eq(commentable)
       end
 
+      it "has an associated commentable" do
+        expect(subject.root_commentable).to eq(commentable)
+      end
+
       it "has a up_votes association returning comment votes with weight 1" do
         expect(subject.up_votes.count).to eq(1)
       end
@@ -83,14 +87,6 @@ module Decidim
           expect(subject.down_voted_by?(user)).to be_falsy
         end
       end
-
-      describe "#root_commentable" do
-        let(:reply) { create(:comment, commentable: subject) }
-
-        it "returns the commentable object from the parent comment" do
-          expect(reply.root_commentable).to eq(subject.commentable)
-        end
-      end
     end
   end
 end

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

@@ -9,7 +9,7 @@ module Decidim
       let!(:feature) { create(:feature, participatory_process: participatory_process) }
       let!(:commentable) { create(:dummy_resource, feature: feature) }
       let!(:author) { create(:user, organization: organization) }
-      let!(:comment) { create(:comment, commentable: commentable, author: author)}
+      let!(:comment) { create(:comment, commentable: commentable, author: author) }
       let!(:comment_vote) { create(:comment_vote, comment: comment, author: author) }
 
       it "is valid" do
@@ -25,9 +25,9 @@ module Decidim
       end
 
       it "validates uniqueness for author and comment combination" do
-        expect {
+        expect do
           create(:comment_vote, comment: comment, author: author)
-        }.to raise_error(ActiveRecord::RecordInvalid)
+        end.to raise_error(ActiveRecord::RecordInvalid)
       end
 
       it "is invalid with a weight different from 1 and -1" do

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

@@ -7,7 +7,7 @@ module Decidim
       let(:subject) { Decidim::Comments::Seed }
 
       describe "#comments_for(resource)" do
-        it 'creates comments for a page if one is given' do
+        it "creates comments for a page if one is given" do
           dummy_resource = create(:dummy_resource)
           subject.comments_for(dummy_resource)
           expect(Decidim::Comments::SortedComments.for(dummy_resource).length).to be_between(1, 5).inclusive

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

@@ -18,11 +18,11 @@ describe Decidim::Comments::SortedComments do
 
   it "eager loads comment's author, up_votes and down_votes" do
     comment = subject.query[0]
-    expect {
+    expect do
       expect(comment.author.name).to be_present
       expect(comment.up_votes.size).to eq(0)
       expect(comment.down_votes.size).to eq(0)
-    }.not_to make_database_queries
+    end.not_to make_database_queries
   end
 
   it "return the comments ordered by created_at asc by default" do
@@ -44,7 +44,7 @@ describe Decidim::Comments::SortedComments do
 
   context "When order_by is not default" do
     context "When order by recent" do
-      let!(:order_by) {"recent"}
+      let!(:order_by) { "recent" }
 
       it "return the comments ordered by recent" do
         previous_comment = create(:comment, commentable: commentable, author: author, created_at: 1.week.ago, updated_at: 1.week.ago)
@@ -54,7 +54,7 @@ describe Decidim::Comments::SortedComments do
     end
 
     context "When order by best_rated" do
-      let!(:order_by) {"best_rated"}
+      let!(:order_by) { "best_rated" }
 
       it "return the comments ordered by best_rated" do
         most_voted_comment = create(:comment, commentable: commentable, author: author, created_at: 1.week.ago, updated_at: 1.week.ago)
@@ -66,7 +66,7 @@ describe Decidim::Comments::SortedComments do
     end
 
     context "When order by most_discussed" do
-      let!(:order_by) {"most_discussed"}
+      let!(:order_by) { "most_discussed" }
 
       it "return the comments ordered by most_discussed" do
         most_commented = create(:comment, commentable: commentable, author: author, created_at: 1.week.ago, updated_at: 1.week.ago)

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 RSpec.shared_context "admin" do
   let(:organization) { create(:organization) }
   let!(:user) { create(:user, :admin, :confirmed, organization: organization) }

data/decidim-comments/spec/spec_helper.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 ENV["ENGINE_NAME"] = File.dirname(File.dirname(__FILE__)).split("/").last
 
 require "decidim/dev/test/base_spec_helper"

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

@@ -9,14 +9,10 @@ module Decidim
       let(:model) { create(:comment) }
 
       describe "upVote" do
-        let(:query) {
-          "{ upVote { upVoted } }"
-        }
+        let(:query) { "{ upVote { upVoted } }" }
 
         before do
-          allow(Decidim::Comments::VoteComment).to receive(:call).with(model, current_user, weight: 1).and_return (
-            model
-          )
+          allow(Decidim::Comments::VoteComment).to receive(:call).with(model, current_user, weight: 1).and_return(model)
         end
 
         it "should call UpVoteComment command" do
@@ -26,14 +22,10 @@ module Decidim
       end
 
       describe "downVote" do
-        let(:query) {
-          "{ downVote { downVoted } }"
-        }
+        let(:query) { "{ downVote { downVoted } }" }
 
         before do
-          allow(Decidim::Comments::VoteComment).to receive(:call).with(model, current_user, weight: -1).and_return (
-            model
-          )
+          allow(Decidim::Comments::VoteComment).to receive(:call).with(model, current_user, weight: -1).and_return(model)
         end
 
         it "should call UpVoteComment command" do

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

@@ -28,7 +28,7 @@ module Decidim
       end
 
       describe "hasComments" do
-        let (:query) { "{ hasComments }" }
+        let(:query) { "{ hasComments }" }
 
         it "returns false if the comment has not comments" do
           expect(response).to include("hasComments" => false)
@@ -47,7 +47,7 @@ module Decidim
       end
 
       describe "acceptsNewComments" do
-        let (:query) { "{ acceptsNewComments }" }
+        let(:query) { "{ acceptsNewComments }" }
 
         it "returns the return value of accepts_new_comments? method" do
           expect(response).to include("acceptsNewComments" => model.accepts_new_comments?)
@@ -56,8 +56,7 @@ module Decidim
 
       describe "comments" do
         let!(:random_comment) { FactoryGirl.create(:comment) }
-        let!(:replies) { 3.times.map { |n| FactoryGirl.create(:comment, commentable: model, created_at: Time.now - n.days) } }
-
+        let!(:replies) { Array.new(3) { |n| FactoryGirl.create(:comment, commentable: model, created_at: Time.now - n.days) } }
 
         let(:query) { "{ comments { id } }" }
 
@@ -69,7 +68,7 @@ module Decidim
         end
 
         it "return comment's comments ordered by date" do
-          response_ids = response["comments"].map{|reply| reply["id"].to_i }
+          response_ids = response["comments"].map { |reply| reply["id"].to_i }
           replies_ids = replies.sort_by(&:created_at).map(&:id)
           expect(response_ids).to eq(replies_ids)
         end

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

@@ -14,9 +14,9 @@ module Decidim
       let(:alignment) { 1 }
 
       describe "addComment" do
-        let(:query) {
+        let(:query) do
           "{ addComment(body: \"#{body}\", alignment: #{alignment}) { body } }"
-        }
+        end
 
         it "calls CreateComment command" do
           params = { "comment" => { "body" => body, "alignment" => alignment, "user_group_id" => nil } }

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

@@ -7,11 +7,11 @@ module Decidim
     describe MutationType do
       include_context "graphql type"
 
-     describe "commentable" do
+      describe "commentable" do
         let!(:commentable) { create(:dummy_resource) }
-        let(:query) {
+        let(:query) do
           "{ commentable(id: \"#{commentable.id}\", type: \"#{commentable.commentable_type}\") { id } }"
-        }
+        end
 
         it "should fetch the commentable given its id and commentable_type" do
           expect(response["commentable"]).to include("id" => commentable.id.to_s)
@@ -20,9 +20,7 @@ module Decidim
 
       describe "comment" do
         let!(:comment) { create(:comment) }
-        let(:query) {
-          "{ comment(id: \"#{comment.id}\") { id } }"
-        }
+        let(:query) { "{ comment(id: \"#{comment.id}\") { id } }" }
 
         it "should fetch the comment given its id" do
           expect(response["comment"]).to include("id" => comment.id.to_s)

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

@@ -10,7 +10,7 @@ describe Decidim::Api::QueryType do
 
     context "When the user is logged in" do
       it "return current user data" do
-        expect(response["session"]).to include({ "user" => { "name" => current_user.name } })
+        expect(response["session"]).to include("user" => { "name" => current_user.name })
       end
     end
 

data/decidim-dev/decidim-dev.gemspec

@@ -12,12 +12,12 @@ Gem::Specification.new do |s|
   s.summary     = "Decidim Dev tools"
   s.description = "Utilities and tools we need to develop Decidim"
 
-  s.files = Dir["{app,config,db,lib,vendor}/**/*", "LICENSE.txt", "Rakefile", "README.md"]
+  s.files = Dir["{app,config,db,lib,vendor}/**/*", "Rakefile", "README.md"]
 
   s.add_dependency "decidim", Decidim.version
   s.add_dependency "factory_girl_rails"
   s.add_dependency "database_cleaner", "~> 1.5.0"
-  s.add_dependency "capybara", "~> 2.12.0"
+  s.add_dependency "capybara", "~> 2.13.0"
   s.add_dependency "capybara-screenshot", "~> 1.0.14"
   s.add_dependency "rspec-rails", "~> 3.5"
   s.add_dependency "rspec-repeat", "~> 1.0.2"
@@ -25,15 +25,15 @@ Gem::Specification.new do |s|
   s.add_dependency "wisper-rspec", "~> 0.0.3"
   s.add_dependency "listen", "~> 3.1.0"
   s.add_dependency "launchy"
-  s.add_dependency "i18n-tasks", "0.9.12"
+  s.add_dependency "i18n-tasks", "0.9.13"
   s.add_dependency "faker", "~> 1.7.3"
   s.add_dependency "poltergeist", "~> 1.14.0"
   s.add_dependency "rails-controller-testing", "~> 1.0.1"
   s.add_dependency "simplecov", "~> 0.13"
   s.add_dependency "codecov", "~> 0.1.9"
-  s.add_dependency "rubocop", "~> 0.47"
-  s.add_dependency "db-query-matchers", "~> 0.7.0"
+  s.add_dependency "rubocop", "~> 0.46.0"
+  s.add_dependency "db-query-matchers", "~> 0.8.0"
   s.add_dependency "letter_opener_web", "~> 1.3.0"
   s.add_dependency "rspec-html-matchers", "~> 0.9.1"
-  s.add_dependency "webmock", "~> 2.3.2"
+  s.add_dependency "webmock", "~> 3.0.1"
 end

data/decidim-dev/lib/decidim/dev/common_rake.rb

@@ -2,5 +2,9 @@
 require "bundler/gem_tasks"
 require "rspec/core/rake_task"
 
-RSpec::Core::RakeTask.new(:spec)
+RSpec::Core::RakeTask.new(:spec) do |t|
+  # The i18n_spec part needs to go first or it won't be include. It seems like a
+  # bug in RSpec to me... https://github.com/rspec/rspec-core/issues/2418
+  t.rspec_opts = "--pattern #{__dir__}/test/i18n_spec.rb,**/*_spec.rb"
+end
 task default: [:spec]

data/decidim-dev/lib/decidim/dev/railtie.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Decidim
   module Dev
     class Railtie < Rails::Railtie