decidim 0.3.2 → 0.4.0

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

@@ -72,7 +72,7 @@ Decidim.register_feature(:proposals) do |feature|
   end
 
   feature.seeds do
-    Decidim::ParticipatoryProcess.all.each do |process|
+    Decidim::ParticipatoryProcess.find_each do |process|
       next unless process.steps.any?
 
       feature = Decidim::Feature.create!(

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

@@ -87,7 +87,7 @@ describe "Proposals", type: :feature do
           expect(page).to have_content(user.name)
         end
 
-        context "when geocoding is enabled" do
+        context "when geocoding is enabled", :serves_map do
           let!(:feature) do
             create(:proposal_feature,
                    :with_creation_enabled,
@@ -103,6 +103,9 @@ describe "Proposals", type: :feature do
             within ".new_proposal" do
               fill_in :proposal_title, with: "Oriol for president"
               fill_in :proposal_body, with: "He will solve everything"
+
+              check :proposal_has_address
+
               fill_in :proposal_address, with: address
               select category.name["en"], from: :proposal_category_id
               select scope.name, from: :proposal_scope_id
@@ -149,7 +152,7 @@ describe "Proposals", type: :feature do
             expect(page).to have_content(user_group.name)
           end
 
-          context "when geocoding is enabled" do
+          context "when geocoding is enabled", :serves_map do
             let!(:feature) do
               create(:proposal_feature,
                      :with_creation_enabled,
@@ -165,6 +168,9 @@ describe "Proposals", type: :feature do
               within ".new_proposal" do
                 fill_in :proposal_title, with: "Oriol for president"
                 fill_in :proposal_body, with: "He will solve everything"
+
+                check :proposal_has_address
+
                 fill_in :proposal_address, with: address
                 select category.name["en"], from: :proposal_category_id
                 select scope.name, from: :proposal_scope_id

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

@@ -5,6 +5,7 @@ require "spec_helper"
 module Decidim
   module Proposals
     describe Proposal do
+      let(:comments_notifications) { true }
       let(:proposal) { build(:proposal) }
       subject { proposal }
 
@@ -47,6 +48,40 @@ module Decidim
         it { is_expected.to be_answered }
         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
+        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
+
+            it "is not notifiable" do
+              expect(subject.notifiable?(author: context_author)).to be_truthy
+            end
+          end
+        end
+      end
     end
   end
 end

data/decidim-proposals/spec/shared/create_proposal_examples.rb

@@ -14,6 +14,7 @@ RSpec.shared_examples "create a proposal" do |with_author|
   end
   let(:author) { create(:user, organization: organization) } if with_author
 
+  let(:has_address) { false }
   let(:address) { nil }
   let(:latitude) { 40.1234 }
   let(:longitude) { 2.1234 }
@@ -23,7 +24,8 @@ RSpec.shared_examples "create a proposal" do |with_author|
       {
         title: "A reasonable proposal title",
         body: "A reasonable proposal body",
-        address: address
+        address: address,
+        has_address: has_address
       }
     end
 
@@ -74,22 +76,26 @@ RSpec.shared_examples "create a proposal" do |with_author|
       context "when geocoding is enabled" do
         let(:feature) { create(:proposal_feature, :with_geocoding_enabled) }
 
-        context "when the address is present" do
-          let(:address) { "Carrer Pare Llaurador 113, baixos, 08224 Terrassa" }
+        context "when the has address checkbox is checked" do
+          let(:has_address) { true }
 
-          before do
-            Geocoder::Lookup::Test.add_stub(
-              address,
-              [{ "latitude" => latitude, "longitude" => longitude }]
-            )
-          end
+          context "when the address is present" do
+            let(:address) { "Carrer Pare Llaurador 113, baixos, 08224 Terrassa" }
+
+            before do
+              Geocoder::Lookup::Test.add_stub(
+                address,
+                [{ "latitude" => latitude, "longitude" => longitude }]
+              )
+            end
 
-          it "sets the latitude and longitude" do
-            command.call
-            proposal = Decidim::Proposals::Proposal.last
+            it "sets the latitude and longitude" do
+              command.call
+              proposal = Decidim::Proposals::Proposal.last
 
-            expect(proposal.latitude).to eq(latitude)
-            expect(proposal.longitude).to eq(longitude)
+              expect(proposal.latitude).to eq(latitude)
+              expect(proposal.longitude).to eq(longitude)
+            end
           end
         end
       end

data/decidim-proposals/spec/shared/manage_proposals_examples.rb

@@ -29,13 +29,12 @@ RSpec.shared_examples "manage proposals" do
   context "creation" do
     context "when official_proposals setting is enabled" do
       before do
-        current_feature.settings[:official_proposals_enabled] = true
-        current_feature.save
+        current_feature.update_attributes!(settings: { official_proposals_enabled: true })
       end
 
       context "when creation is enabled" do
         before do
-          current_feature.update_attributes(
+          current_feature.update_attributes!(
             step_settings: {
               current_feature.participatory_process.active_step.id => {
                 creation_enabled: true
@@ -46,20 +45,18 @@ RSpec.shared_examples "manage proposals" do
 
         context "when process is not related to any scope" do
           before do
-            participatory_process.update_attributes(scope: nil)
+            participatory_process.update_attributes!(scope: nil)
+
+            click_link "New"
           end
 
           it "can be related to a scope" do
-            find(".card-title a.button").click
-
             within "form" do
               expect(page).to have_content(/Scope/i)
             end
           end
 
           it "creates a new proposal" do
-            find(".card-title a.button").click
-
             within ".new_proposal" do
               fill_in :proposal_title, with: "Make decidim great again"
               fill_in :proposal_body, with: "Decidim is great but it can be better"
@@ -86,7 +83,7 @@ RSpec.shared_examples "manage proposals" do
 
         context "when process is related to a scope" do
           before do
-            participatory_process.update_attributes(scope: scope)
+            participatory_process.update_attributes!(scope: scope)
           end
 
           it "cannot be related to a scope" do
@@ -123,7 +120,7 @@ RSpec.shared_examples "manage proposals" do
 
           context "when geocoding is enabled" do
             before do
-              current_feature.update_attributes(settings: { geocoding_enabled: true })
+              current_feature.update_attributes!(settings: { geocoding_enabled: true })
             end
 
             it "creates a new proposal related to the process scope" do
@@ -157,7 +154,7 @@ RSpec.shared_examples "manage proposals" do
 
     context "when official_proposals setting is disabled" do
       before do
-        current_feature.update_attributes(settings: { official_proposals_enabled: false })
+        current_feature.update_attributes!(settings: { official_proposals_enabled: false })
       end
 
       it "cannot create a new proposal" do
@@ -169,12 +166,12 @@ RSpec.shared_examples "manage proposals" do
 
   context "when the proposal_answering feature setting is enabled" do
     before do
-      current_feature.update_attributes(settings: { proposal_answering_enabled: true })
+      current_feature.update_attributes!(settings: { proposal_answering_enabled: true })
     end
 
     context "when the proposal_answering step setting is enabled" do
       before do
-        current_feature.update_attributes(
+        current_feature.update_attributes!(
           step_settings: {
             current_feature.participatory_process.active_step.id => {
               proposal_answering_enabled: true
@@ -241,7 +238,7 @@ RSpec.shared_examples "manage proposals" do
           answered_at: Time.current
         )
 
-        visit decidim_admin.manage_feature_path(participatory_process_id: participatory_process, feature_id: current_feature)
+        visit manage_feature_path(current_feature)
 
         within find("tr", text: proposal.title) do
           within find("td:nth-child(4)") do
@@ -269,7 +266,7 @@ RSpec.shared_examples "manage proposals" do
 
     context "when the proposal_answering step setting is disabled" do
       before do
-        current_feature.update_attributes(
+        current_feature.update_attributes!(
           step_settings: {
             current_feature.participatory_process.active_step.id => {
               proposal_answering_enabled: false
@@ -290,7 +287,7 @@ RSpec.shared_examples "manage proposals" do
 
   context "when the proposal_answering feature setting is disabled" do
     before do
-      current_feature.update_attributes(settings: { proposal_answering_enabled: false })
+      current_feature.update_attributes!(settings: { proposal_answering_enabled: false })
     end
 
     it "cannot answer a proposal" do

data/decidim-proposals/spec/shared/proposal_form_examples.rb

@@ -12,6 +12,7 @@ RSpec.shared_examples "a proposal form" do
   let(:scope_id) { scope.try(:id) }
   let(:latitude) { 40.1234 }
   let(:longitude) { 2.1234 }
+  let(:has_address) { false }
   let(:address) { nil }
   let(:params) do
     {
@@ -20,7 +21,8 @@ RSpec.shared_examples "a proposal form" do
       author: author,
       category_id: category_id,
       scope_id: scope_id,
-      address: address
+      address: address,
+      has_address: has_address
     }
   end
 
@@ -70,24 +72,28 @@ RSpec.shared_examples "a proposal form" do
   context "when geocoding is enabled" do
     let(:feature) { create(:proposal_feature, :with_geocoding_enabled) }
 
-    context "when the address is not present" do
-      it { is_expected.to be_invalid }
-    end
-
-    context "when the address is present" do
-      let(:address) { "Carrer Pare Llaurador 113, baixos, 08224 Terrassa" }
+    context "when the has address checkbox is checked" do
+      let(:has_address) { true }
 
-      before do
-        Geocoder::Lookup::Test.add_stub(
-          address,
-          [{ "latitude" => latitude, "longitude" => longitude }]
-        )
+      context "when the address is not present" do
+        it { is_expected.to be_invalid }
       end
 
-      it "validates the address and store its coordinates" do
-        expect(subject).to be_valid
-        expect(subject.latitude).to eq(latitude)
-        expect(subject.longitude).to eq(longitude)
+      context "when the address is present" do
+        let(:address) { "Carrer Pare Llaurador 113, baixos, 08224 Terrassa" }
+
+        before do
+          Geocoder::Lookup::Test.add_stub(
+            address,
+            [{ "latitude" => latitude, "longitude" => longitude }]
+          )
+        end
+
+        it "validates the address and store its coordinates" do
+          expect(subject).to be_valid
+          expect(subject.latitude).to eq(latitude)
+          expect(subject.longitude).to eq(longitude)
+        end
       end
     end
   end

data/decidim-proposals/spec/spec_helper.rb

@@ -1,5 +1,9 @@
 # frozen_string_literal: true
 
+require "decidim/dev"
+
 ENV["ENGINE_NAME"] = File.dirname(__dir__).split("/").last
 
+Decidim::Dev.dummy_app_path = File.expand_path(File.join("..", "spec", "decidim_dummy_app"))
+
 require "decidim/dev/test/base_spec_helper"

data/decidim-results/app/models/decidim/results/result.rb

@@ -33,6 +33,16 @@ module Decidim
       def comments_have_votes?
         true
       end
+
+      # Public: Overrides the `notifiable?` Notifiable concern method.
+      def notifiable?(_context)
+        true
+      end
+
+      # Public: Overrides the `users_to_notify` Notifiable concern method.
+      def users_to_notify
+        Decidim::Admin::ProcessAdmins.for(feature.participatory_process)
+      end
     end
   end
 end

data/decidim-results/bin/rails

@@ -8,8 +8,8 @@ ENGINE_ROOT = File.expand_path("..", __dir__)
 ENGINE_PATH = File.expand_path("../lib/decidim/results/engine", __dir__)
 
 # Set up gems listed in the Gemfile.
-ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../Gemfile", __dir__)
-require "bundler/setup" if File.exist?(ENV["BUNDLE_GEMFILE"])
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile", __dir__)
+require "bundler/setup"
 
 require "rails/all"
 require "rails/engine/commands"

data/decidim-results/config/locales/fr.yml

@@ -3,7 +3,7 @@ fr:
     attributes:
       result:
         decidim_category_id: Catégorie
-        decidim_scope_id: Domaine d'application
+        decidim_scope_id: Zone d'application
         description: Description
         proposal_ids: Propositions incluses
         title: Titre
@@ -62,7 +62,7 @@ fr:
         filters:
           category: Catégorie
           category_prompt: Sélectionner une catégorie
-          scopes: Domaines d'application
+          scopes: Zones d'application
           search: Rechercher
         filters_small_view:
           close_modal: Fermer la fenêtre de dialogue

data/decidim-results/decidim-results.gemspec

@@ -9,8 +9,8 @@ require_relative "../decidim-core/lib/decidim/core/version"
 Gem::Specification.new do |s|
   Decidim.add_default_gemspec_properties(s)
 
-  s.name        = "decidim-results"
-  s.summary     = "A results component for decidim's participatory processes."
+  s.name = "decidim-results"
+  s.summary = "A results component for decidim's participatory processes."
   s.description = s.summary
 
   s.files = Dir["{app,config,db,lib}/**/*", "Rakefile", "README.md"]

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

@@ -34,7 +34,7 @@ Decidim.register_feature(:results) do |feature|
   end
 
   feature.seeds do
-    Decidim::ParticipatoryProcess.all.each do |process|
+    Decidim::ParticipatoryProcess.find_each do |process|
       next unless process.steps.any?
 
       feature = Decidim::Feature.create!(

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

@@ -4,6 +4,16 @@ require "spec_helper"
 
 describe "Comments", type: :feature, perform_enqueued: true do
   let!(:feature) { create(:result_feature, organization: organization) }
+  let!(:participatory_process) { feature.participatory_process }
+  let!(:participatory_process_admin) do
+    user = create(:user, :confirmed, organization: organization)
+    Decidim::Admin::ParticipatoryProcessUserRole.create!(
+      role: :admin,
+      user: user,
+      participatory_process: participatory_process
+    )
+    user
+  end
   let!(:commentable) { create(:result, feature: feature) }
 
   let(:resource_path) { decidim_results.result_path(commentable, feature_id: feature, participatory_process_id: feature.participatory_process) }

data/decidim-results/spec/spec_helper.rb

@@ -1,5 +1,9 @@
 # frozen_string_literal: true
 
+require "decidim/dev"
+
 ENV["ENGINE_NAME"] = File.dirname(__dir__).split("/").last
 
+Decidim::Dev.dummy_app_path = File.expand_path(File.join("..", "spec", "decidim_dummy_app"))
+
 require "decidim/dev/test/base_spec_helper"

data/decidim-surveys/app/models/decidim/surveys/survey_question.rb

@@ -8,6 +8,8 @@ module Decidim
 
       belongs_to :survey, class_name: "Survey", foreign_key: "decidim_survey_id"
 
+      validates :question_type, inclusion: { in: TYPES }
+
       # Rectify can't handle a hash when using the from_model method so
       # the answer options must be converted to struct.
       def answer_options

data/decidim-surveys/bin/rails

@@ -8,8 +8,8 @@ ENGINE_ROOT = File.expand_path("..", __dir__)
 ENGINE_PATH = File.expand_path("../lib/decidim/surveys/engine", __dir__)
 
 # Set up gems listed in the Gemfile.
-ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../Gemfile", __dir__)
-require "bundler/setup" if File.exist?(ENV["BUNDLE_GEMFILE"])
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile", __dir__)
+require "bundler/setup"
 
 require "rails/all"
 require "rails/engine/commands"