decidim 0.5.1 → 0.6.0

data/decidim-proposals/db/migrate/20170307085300_migrate_proposal_reports_data_to_reports.rb

@@ -9,7 +9,7 @@ class MigrateProposalReportsDataToReports < ActiveRecord::Migration[5.0]
   def change
     Decidim::Proposals::ProposalReport.find_each do |proposal_report|
       moderation = Decidim::Moderation.find_or_create_by!(reportable: proposal_report.proposal,
-                                                          participatory_process: proposal_report.proposal.feature.participatory_process)
+                                                          participatory_process: proposal_report.proposal.feature.participatory_space)
       Decidim::Report.create!(moderation: moderation,
                               user: proposal_report.user,
                               reason: proposal_report.reason,

data/decidim-proposals/decidim-proposals.gemspec

@@ -23,6 +23,7 @@ Gem::Specification.new do |s|
 
   s.add_development_dependency "decidim-dev", Decidim.version
   s.add_development_dependency "decidim-admin", Decidim.version
+  s.add_development_dependency "decidim-participatory_processes", Decidim.version
   s.add_development_dependency "decidim-meetings", Decidim.version
   s.add_development_dependency "decidim-results", Decidim.version
   s.add_development_dependency "decidim-budgets", Decidim.version

data/decidim-proposals/lib/decidim/proposals/feature.rb

@@ -59,7 +59,7 @@ Decidim.register_feature(:proposals) do |feature|
     exports.collection do |feature_instance|
       Decidim::Proposals::Proposal
         .where(feature: feature_instance)
-        .includes(:category, feature: { participatory_process: :organization })
+        .includes(:category, feature: { participatory_space: :organization })
     end
 
     exports.serializer Decidim::Proposals::ProposalSerializer
@@ -75,25 +75,29 @@ Decidim.register_feature(:proposals) do |feature|
     exports.serializer Decidim::Comments::CommentSerializer
   end
 
-  feature.seeds do |process|
+  feature.seeds do |participatory_space|
+    step_settings = if participatory_space.allows_steps?
+                      { participatory_space.active_step.id => { votes_enabled: true, votes_blocked: false, creation_enabled: true } }
+                    else
+                      {}
+                    end
+
     feature = Decidim::Feature.create!(
-      name: Decidim::Features::Namer.new(process.organization.available_locales, :proposals).i18n_name,
+      name: Decidim::Features::Namer.new(participatory_space.organization.available_locales, :proposals).i18n_name,
       manifest_name: :proposals,
       published_at: Time.current,
-      participatory_process: process,
+      participatory_space: participatory_space,
       settings: {
         vote_limit: 0
       },
-      step_settings: {
-        process.active_step.id => { votes_enabled: true, votes_blocked: false, creation_enabled: true }
-      }
+      step_settings: step_settings
     )
 
-    if process.scope
-      scopes = process.scope.descendants
-      global = process.scope
+    if participatory_space.scope
+      scopes = participatory_space.scope.descendants
+      global = participatory_space.scope
     else
-      scopes = process.organization.scopes
+      scopes = participatory_space.organization.scopes
       global = nil
     end
 
@@ -112,7 +116,7 @@ Decidim.register_feature(:proposals) do |feature|
 
       proposal = Decidim::Proposals::Proposal.create!(
         feature: feature,
-        category: process.categories.sample,
+        category: participatory_space.categories.sample,
         scope: Faker::Boolean.boolean(0.5) ? global : scopes.sample,
         title: Faker::Lorem.sentence(2),
         body: Faker::Lorem.paragraphs(2).join("\n"),
@@ -124,8 +128,8 @@ Decidim.register_feature(:proposals) do |feature|
       )
 
       rand(3).times do |m|
-        email = "vote-author-#{process.id}-#{n}-#{m}@example.org"
-        name = "#{Faker::Name.name} #{process.id} #{n} #{m}"
+        email = "vote-author-#{participatory_space.underscored_name}-#{participatory_space.id}-#{n}-#{m}@example.org"
+        name = "#{Faker::Name.name} #{participatory_space.id} #{n} #{m}"
 
         author = Decidim::User.find_or_initialize_by(email: email)
         author.update!(
@@ -134,9 +138,7 @@ Decidim.register_feature(:proposals) do |feature|
           name: name,
           organization: feature.organization,
           tos_agreement: "1",
-          confirmed_at: Time.current,
-          comments_notifications: true,
-          replies_notifications: true
+          confirmed_at: Time.current
         )
 
         Decidim::Proposals::ProposalVote.create!(proposal: proposal,

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

@@ -2,14 +2,14 @@
 
 FactoryGirl.define do
   factory :proposal_feature, parent: :feature do
-    name { Decidim::Features::Namer.new(participatory_process.organization.available_locales, :proposals).i18n_name }
+    name { Decidim::Features::Namer.new(participatory_space.organization.available_locales, :proposals).i18n_name }
     manifest_name :proposals
-    participatory_process { create(:participatory_process, :with_steps) }
+    participatory_space { create(:participatory_process, :with_steps, organization: organization) }
 
     trait :with_votes_enabled do
       step_settings do
         {
-          participatory_process.active_step.id => { votes_enabled: true }
+          participatory_space.active_step.id => { votes_enabled: true }
         }
       end
     end
@@ -17,7 +17,7 @@ FactoryGirl.define do
     trait :with_votes_disabled do
       step_settings do
         {
-          participatory_process.active_step.id => { votes_enabled: false }
+          participatory_space.active_step.id => { votes_enabled: false }
         }
       end
     end
@@ -37,7 +37,7 @@ FactoryGirl.define do
     trait :with_votes_blocked do
       step_settings do
         {
-          participatory_process.active_step.id => {
+          participatory_space.active_step.id => {
             votes_enabled: true,
             votes_blocked: true
           }
@@ -48,7 +48,7 @@ FactoryGirl.define do
     trait :with_creation_enabled do
       step_settings do
         {
-          participatory_process.active_step.id => { creation_enabled: true }
+          participatory_space.active_step.id => { creation_enabled: true }
         }
       end
     end

data/decidim-proposals/spec/controllers/decidim/admin/proposal_answers_controller_spec.rb

@@ -23,7 +23,7 @@ module Decidim
             id: proposal.id,
             proposal_id: proposal.id,
             feature_id: feature.id,
-            participatory_process_id: feature.participatory_process.id,
+            participatory_process_id: feature.participatory_space.id,
             state: "rejected"
           }
         end

data/decidim-proposals/spec/controllers/decidim/proposal_votes_controller_spec.rb

@@ -12,7 +12,6 @@ module Decidim
 
       before do
         @request.env["decidim.current_organization"] = feature.organization
-        @request.env["decidim.current_participatory_process"] = feature.participatory_process
         @request.env["decidim.current_feature"] = feature
         sign_in user
       end
@@ -21,7 +20,7 @@ module Decidim
         {
           proposal_id: proposal.id,
           feature_id: feature.id,
-          participatory_process_id: feature.participatory_process.id
+          participatory_process_id: feature.participatory_space.id
         }
       end
 

data/decidim-proposals/spec/controllers/decidim/proposals_controller_spec.rb

@@ -11,7 +11,6 @@ module Decidim
 
       before do
         @request.env["decidim.current_organization"] = feature.organization
-        @request.env["decidim.current_participatory_process"] = feature.participatory_process
         @request.env["decidim.current_feature"] = feature
         sign_in user
       end
@@ -19,7 +18,7 @@ module Decidim
       let(:params) do
         {
           feature_id: feature.id,
-          participatory_process_id: feature.participatory_process.id
+          participatory_process_id: feature.participatory_space.id
         }
       end
 

data/decidim-proposals/spec/factories.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require "decidim/core/test/factories"
+require "decidim/participatory_processes/test/factories"
 require "decidim/comments/test/factories"
 require "decidim/meetings/test/factories"
 require "decidim/results/test/factories"

data/decidim-proposals/spec/features/follow_proposals_spec.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+describe "Follow proposals", type: :feature do
+  let(:manifest_name) { "proposals" }
+
+  let!(:followable) do
+    create(:proposal, feature: feature)
+  end
+
+  include_examples "follows"
+end

data/decidim-proposals/spec/features/proposals_spec.rb

@@ -6,7 +6,7 @@ describe "Proposals", type: :feature do
   include_context "feature"
   let(:manifest_name) { "proposals" }
 
-  let!(:category) { create :category, participatory_process: participatory_process }
+  let!(:category) { create :category, participatory_space: participatory_process }
   let!(:scope) { create :scope, organization: participatory_process.organization }
   let!(:user) { create :user, :confirmed, organization: participatory_process.organization }
 
@@ -32,7 +32,7 @@ describe "Proposals", type: :feature do
           create(:proposal_feature,
                  :with_creation_enabled,
                  manifest: manifest,
-                 participatory_process: participatory_process)
+                 participatory_space: participatory_process)
         end
 
         context "when process is not related to any scope" do
@@ -93,7 +93,7 @@ describe "Proposals", type: :feature do
                    :with_creation_enabled,
                    :with_geocoding_enabled,
                    manifest: manifest,
-                   participatory_process: participatory_process)
+                   participatory_space: participatory_process)
           end
 
           it "creates a new proposal" do
@@ -158,7 +158,7 @@ describe "Proposals", type: :feature do
                      :with_creation_enabled,
                      :with_geocoding_enabled,
                      manifest: manifest,
-                     participatory_process: participatory_process)
+                     participatory_space: participatory_process)
             end
 
             it "creates a new proposal as a user group" do
@@ -208,7 +208,7 @@ describe "Proposals", type: :feature do
                    :with_creation_enabled,
                    :with_attachments_allowed,
                    manifest: manifest,
-                   participatory_process: participatory_process)
+                   participatory_space: participatory_process)
           end
 
           it "creates a new proposal with attachments" do
@@ -246,7 +246,7 @@ describe "Proposals", type: :feature do
     let!(:feature) do
       create(:proposal_feature,
              manifest: manifest,
-             participatory_process: participatory_process)
+             participatory_space: participatory_process)
     end
 
     let!(:proposals) { create_list(:proposal, 3, feature: feature) }
@@ -320,7 +320,7 @@ describe "Proposals", type: :feature do
     context "when a proposal has been linked in a meeting" do
       let(:proposal) { create(:proposal, feature: feature) }
       let(:meeting_feature) do
-        create(:feature, manifest_name: :meetings, participatory_process: proposal.feature.participatory_process)
+        create(:feature, manifest_name: :meetings, participatory_space: proposal.feature.participatory_space)
       end
       let(:meeting) { create(:meeting, feature: meeting_feature) }
 
@@ -339,7 +339,7 @@ describe "Proposals", type: :feature do
     context "when a proposal has been linked in a result" do
       let(:proposal) { create(:proposal, feature: feature) }
       let(:result_feature) do
-        create(:feature, manifest_name: :results, participatory_process: proposal.feature.participatory_process)
+        create(:feature, manifest_name: :results, participatory_space: proposal.feature.participatory_space)
       end
       let(:result) { create(:result, feature: result_feature) }
 
@@ -412,11 +412,11 @@ describe "Proposals", type: :feature do
     let(:feature) do
       create(:proposal_feature,
              manifest: manifest,
-             participatory_process: participatory_process)
+             participatory_space: participatory_process)
     end
     let(:proposal) { create(:proposal, feature: feature) }
     let(:budget_feature) do
-      create(:feature, manifest_name: :budgets, participatory_process: proposal.feature.participatory_process)
+      create(:feature, manifest_name: :budgets, participatory_space: proposal.feature.participatory_space)
     end
     let(:project) { create(:project, feature: budget_feature) }
 
@@ -450,7 +450,7 @@ describe "Proposals", type: :feature do
     it "lists all the proposals" do
       create(:proposal_feature,
              manifest: manifest,
-             participatory_process: participatory_process)
+             participatory_space: participatory_process)
 
       create_list(:proposal, 3, feature: feature)
 
@@ -467,7 +467,7 @@ describe "Proposals", type: :feature do
         create(:proposal_feature,
                :with_votes_blocked,
                manifest: manifest,
-               participatory_process: participatory_process)
+               participatory_space: participatory_process)
       end
 
       let!(:most_voted_proposal) do
@@ -497,7 +497,7 @@ describe "Proposals", type: :feature do
         create(:proposal_feature,
                :with_votes_disabled,
                manifest: manifest,
-               participatory_process: participatory_process)
+               participatory_space: participatory_process)
       end
 
       describe "order" do
@@ -666,7 +666,7 @@ describe "Proposals", type: :feature do
           before do
             feature.update_attributes(
               step_settings: {
-                feature.participatory_process.active_step.id => {
+                feature.participatory_space.active_step.id => {
                   proposal_answering_enabled: true
                 }
               }
@@ -722,7 +722,7 @@ describe "Proposals", type: :feature do
           before do
             feature.update_attributes(
               step_settings: {
-                feature.participatory_process.active_step.id => {
+                feature.participatory_space.active_step.id => {
                   proposal_answering_enabled: false
                 }
               }
@@ -779,7 +779,7 @@ describe "Proposals", type: :feature do
           create(:proposal_feature,
                  :with_votes_enabled,
                  manifest: manifest,
-                 participatory_process: participatory_process)
+                 participatory_space: participatory_process)
         end
 
         it "lists the proposals ordered by votes" do

data/decidim-proposals/spec/features/report_proposal_spec.rb

@@ -15,6 +15,6 @@ describe "Report Proposal", type: :feature do
   let!(:feature) do
     create(:proposal_feature,
            manifest: manifest,
-           participatory_process: participatory_process)
+           participatory_space: participatory_process)
   end
 end

data/decidim-proposals/spec/features/vote_proposal_spec.rb

@@ -22,7 +22,7 @@ describe "Vote Proposal", type: :feature do
       create(:proposal_feature,
              :with_votes_blocked,
              manifest: manifest,
-             participatory_process: participatory_process)
+             participatory_space: participatory_process)
     end
 
     it "shows the vote count and the vote button is disabled" do
@@ -37,7 +37,7 @@ describe "Vote Proposal", type: :feature do
       create(:proposal_feature,
              :with_votes_enabled,
              manifest: manifest,
-             participatory_process: participatory_process)
+             participatory_space: participatory_process)
     end
 
     context "when the user is not logged in" do
@@ -112,7 +112,7 @@ describe "Vote Proposal", type: :feature do
                  :with_vote_limit,
                  vote_limit: vote_limit,
                  manifest: manifest,
-                 participatory_process: participatory_process)
+                 participatory_space: participatory_process)
         end
 
         context "when the proposal is not voted yet" do
@@ -189,7 +189,7 @@ describe "Vote Proposal", type: :feature do
               create(:proposal_feature,
                      :with_votes_blocked,
                      manifest: manifest,
-                     participatory_process: participatory_process)
+                     participatory_space: participatory_process)
             end
 
             it "shows the vote count but not the vote button" do

data/decidim-proposals/spec/models/decidim/proposals/abilities/participatory_process_admin_ability.rb

@@ -6,7 +6,7 @@ describe Decidim::Proposals::Abilities::ParticipatoryProcessAdminAbility do
   let(:user) { build(:user) }
   let(:user_process) { create :participatory_process, organization: user.organization }
   let!(:user_process_role) { create :participatory_process_user_role, user: user, participatory_process: user_process, role: :admin }
-  let(:feature) { create :proposal_feature, participatory_process: user_process }
+  let(:feature) { create :proposal_feature, participatory_space: user_process }
   let(:proposals) { create_list :proposal, 3, feature: feature }
   let(:other_proposals) { create_list :proposal, 3 }
   let(:context) { { current_participatory_process: user_process } }

data/decidim-proposals/spec/models/decidim/proposals/proposal_spec.rb

@@ -5,7 +5,6 @@ require "spec_helper"
 module Decidim
   module Proposals
     describe Proposal do
-      let(:comments_notifications) { true }
       let(:proposal) { build(:proposal) }
       subject { proposal }
 
@@ -49,54 +48,32 @@ module Decidim
         it { is_expected.to be_rejected }
       end
 
-      describe "#notifiable?" do
-        let(:context_author) { create(:user, organization: subject.author.organization) }
-
-        context "when the context author is the same as the proposal's author" do
-          let(:context_author) { subject.author }
-
-          it "is not notifiable" do
-            expect(subject.notifiable?(author: context_author)).to be_falsy
-          end
+      describe "#users_to_notify_on_comment_created" do
+        let!(:follows) { create_list(:follow, 3, followable: subject) }
+        let(:followers) { follows.map(&:user) }
+        let(:participatory_space) { subject.feature.participatory_space }
+        let(:organization) { participatory_space.organization }
+        let!(:participatory_process_admin) do
+          user = create(:user, :confirmed, organization: organization)
+          Decidim::ParticipatoryProcessUserRole.create!(
+            role: :admin,
+            user: user,
+            participatory_process: participatory_space
+          )
+          user
         end
 
-        context "when the context author is not the same as the proposal's author" do
-          context "when the comment's author has not comments notifications enabled" do
-            before do
-              expect(subject.author).to receive(:comments_notifications?).and_return(false)
-            end
-
-            it "is not notifiable" do
-              expect(subject.notifiable?(author: context_author)).to be_falsy
-            end
-          end
-
-          context "when the comment's author has comments notifications enabled" do
-            before do
-              expect(subject.author).to receive(:comments_notifications?).and_return(true)
-            end
+        context "when the proposal is official" do
+          let(:proposal) { build(:proposal, :official) }
 
-            it "is not notifiable" do
-              expect(subject.notifiable?(author: context_author)).to be_truthy
-            end
+          it "returns the followers and the feature's participatory space admins" do
+            expect(subject.users_to_notify_on_comment_created).to match_array(followers.concat([participatory_process_admin]))
           end
         end
 
-        context "when the proposal is official" do
-          let!(:organization) { create :organization }
-          let!(:admin) { create :user, :admin, organization: organization }
-          let!(:participatory_process) { create :participatory_process, organization: organization }
-          let!(:process_admin) { create :user, :process_admin, organization: organization, participatory_process: participatory_process }
-          let!(:feature) { create :proposal_feature, participatory_process: participatory_process }
-          let!(:context_author) { create(:user, organization: organization) }
-          let!(:proposal) { build(:proposal, :official, feature: feature) }
-
-          it "is notifiable" do
-            expect(subject.notifiable?(author: context_author)).to be_truthy
-          end
-
-          it "notifies admins and process admins" do
-            expect(subject.users_to_notify).to match_array([admin, process_admin])
+        context "when the proposal is not official" do
+          it "returns the followers" do
+            expect(subject.users_to_notify_on_comment_created).to match_array(followers)
           end
         end
       end