decidim 0.4.3 → 0.4.4

data/decidim-proposals/app/views/decidim/proposals/admin/proposals/index.html.erb

@@ -53,7 +53,7 @@
                 <% if can? :update, proposal %>
                   <%= icon_link_to "chat", edit_proposal_proposal_answer_path(proposal_id: proposal.id, id: proposal.id), t("actions.answer", scope: "decidim.proposals"), class: "action-icon--edit-answer" %>
                 <% end %>
-                <%= icon_link_to "eye", decidim_proposals.proposal_path(id: proposal, feature_id: current_feature, participatory_process_id: current_participatory_process), t("actions.preview", scope: "decidim.proposals.admin"), class: "action-icon--preview", target: :blank %>
+                <%= icon_link_to "eye", resource_locator(proposal).path, t("actions.preview", scope: "decidim.proposals.admin"), class: "action-icon--preview", target: :blank %>
               </td>
             </tr>
           <% end %>

data/decidim-proposals/app/views/decidim/proposals/proposals/_tags.html.erb

@@ -1,10 +1,10 @@
 <% if proposal.category.present? || proposal.scope.present? %>
   <ul class="tags tags--proposal" >
     <% if proposal.category.present? %>
-      <li><%= link_to translated_attribute(proposal.category.name), decidim_proposals.proposals_path(filter: { category_id: proposal.category.id }) %></li>
+      <li><%= link_to translated_attribute(proposal.category.name), resource_locator(proposal).index(filter: { category_id: proposal.category.id }) %></li>
     <% end %>
     <% if proposal.scope.present? && !current_participatory_process.scope %>
-      <li><%= link_to proposal.scope.name, decidim_proposals.proposals_path(filter: { scope_id: [proposal.scope.id] }) %></li>
+      <li><%= link_to proposal.scope.name, resource_locator(proposal).index(filter: { scope_id: [proposal.scope.id] }) %></li>
     <% end %>
   </ul>
 <% end %>

data/decidim-proposals/decidim-proposals.gemspec

@@ -22,6 +22,7 @@ Gem::Specification.new do |s|
   s.add_dependency "social-share-button", "~> 0.10.0"
 
   s.add_development_dependency "decidim-dev", Decidim.version
+  s.add_development_dependency "decidim-admin", 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

@@ -71,75 +71,69 @@ Decidim.register_feature(:proposals) do |feature|
     exports.serializer Decidim::Comments::CommentSerializer
   end
 
-  feature.seeds do
-    Decidim::ParticipatoryProcess.find_each do |process|
-      next unless process.steps.any?
-
-      feature = Decidim::Feature.create!(
-        name: Decidim::Features::Namer.new(process.organization.available_locales, :proposals).i18n_name,
-        manifest_name: :proposals,
-        published_at: Time.current,
-        participatory_process: process,
-        settings: {
-          vote_limit: 0
-        },
-        step_settings: {
-          process.active_step.id => { votes_enabled: true, votes_blocked: false, creation_enabled: true }
-        }
+  feature.seeds do |process|
+    feature = Decidim::Feature.create!(
+      name: Decidim::Features::Namer.new(process.organization.available_locales, :proposals).i18n_name,
+      manifest_name: :proposals,
+      published_at: Time.current,
+      participatory_process: process,
+      settings: {
+        vote_limit: 0
+      },
+      step_settings: {
+        process.active_step.id => { votes_enabled: true, votes_blocked: false, creation_enabled: true }
+      }
+    )
+    # So that we have some with global scope
+    scopes = feature.organization.scopes + [nil]
+
+    20.times do |n|
+      author = Decidim::User.where(organization: feature.organization).all.sample
+      user_group = [true, false].sample ? author.user_groups.verified.sample : nil
+      state, answer = if n > 15
+                        ["accepted", Decidim::Faker::Localized.sentence(10)]
+                      elsif n > 9
+                        ["rejected", nil]
+                      elsif n > 6
+                        ["evaluating", nil]
+                      else
+                        [nil, nil]
+                      end
+
+      proposal = Decidim::Proposals::Proposal.create!(
+        feature: feature,
+        category: process.categories.sample,
+        scope: scopes.sample,
+        title: Faker::Lorem.sentence(2),
+        body: Faker::Lorem.paragraphs(2).join("\n"),
+        author: author,
+        user_group: user_group,
+        state: state,
+        answer: answer,
+        answered_at: Time.current
       )
-      categories = feature.participatory_process.categories
-      # So that we have some with global scope
-      scopes = feature.organization.scopes + [nil]
-
-      20.times do |n|
-        author = Decidim::User.where(organization: feature.organization).all.sample
-        user_group = [true, false].sample ? author.user_groups.verified.sample : nil
-
-        proposal = Decidim::Proposals::Proposal.create!(
-          feature: feature,
-          category: categories.sample,
-          scope: scopes.sample,
-          title: Faker::Lorem.sentence(2),
-          body: Faker::Lorem.paragraphs(2).join("\n"),
-          author: author,
-          user_group: user_group
+
+      rand(3).times do |m|
+        email = "vote-author-#{process.id}-#{n}-#{m}@example.org"
+        name = "#{Faker::Name.name} #{process.id} #{n} #{m}"
+
+        author = Decidim::User.find_or_initialize_by(email: email)
+        author.update!(
+          password: "password1234",
+          password_confirmation: "password1234",
+          name: name,
+          organization: feature.organization,
+          tos_agreement: "1",
+          confirmed_at: Time.current,
+          comments_notifications: true,
+          replies_notifications: true
         )
 
-        if n > 15
-          proposal.state = "accepted"
-          proposal.answered_at = Time.current
-          proposal.save!
-        elsif n > 9
-          proposal.state = "rejected"
-          proposal.answered_at = Time.current
-          proposal.answer = Decidim::Faker::Localized.sentence(10)
-          proposal.save!
-        elsif n > 6
-          proposal.state = "evaluating"
-          proposal.answered_at = Time.current
-          proposal.save!
-        end
-
-        rand(3).times do |m|
-          email = "vote-author-#{process.id}-#{n}-#{m}@example.org"
-          name = "#{Faker::Name.name} #{process.id} #{n} #{m}"
-
-          author = Decidim::User.create!(email: email,
-                                         password: "password1234",
-                                         password_confirmation: "password1234",
-                                         name: name,
-                                         organization: feature.organization,
-                                         tos_agreement: "1",
-                                         confirmed_at: Time.current,
-                                         comments_notifications: true,
-                                         replies_notifications: true)
-
-          Decidim::Proposals::ProposalVote.create!(proposal: proposal,
-                                                   author: author)
-        end
-
-        Decidim::Comments::Seed.comments_for(proposal)
+        Decidim::Proposals::ProposalVote.create!(proposal: proposal,
+                                                 author: author)
       end
+
+      Decidim::Comments::Seed.comments_for(proposal)
     end
   end
 end

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

@@ -5,7 +5,6 @@ module Decidim
     # This class serializes a Proposal so can be exported to CSV, JSON or other
     # formats.
     class ProposalSerializer < Decidim::Exporters::Serializer
-      include Rails.application.routes.url_helpers
       include Decidim::ResourceHelper
 
       # Public: Initializes the serializer with a proposal.
@@ -44,27 +43,14 @@ module Decidim
         proposal.feature
       end
 
-      def organization
-        feature.organization
-      end
-
       def meetings
         @proposal.linked_resources(:meetings, "proposals_from_meeting").map do |meeting|
           Decidim::ResourceLocatorPresenter.new(meeting).url
         end
       end
 
-      def participatory_process
-        feature.participatory_process
-      end
-
       def url
-        Decidim::Proposals::Engine.routes.url_helpers.proposal_url(
-          proposal,
-          feature_id: feature,
-          participatory_process_id: participatory_process,
-          host: organization.host
-        )
+        Decidim::ResourceLocatorPresenter.new(proposal).url
       end
     end
   end

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

@@ -6,14 +6,12 @@ module Decidim
   module Proposals
     module Admin
       describe ProposalAnswersController, type: :controller do
+        routes { Decidim::Proposals::AdminEngine.routes }
+
         let(:feature) { proposal.feature }
         let(:proposal) { create(:proposal) }
         let(:user) { create(:user, :confirmed, :admin, organization: feature.organization) }
 
-        routes do
-          Decidim::Proposals::AdminEngine.routes
-        end
-
         before do
           @request.env["decidim.current_organization"] = feature.organization
           @request.env["decidim.current_participatory_process"] = feature.participatory_process

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

@@ -5,13 +5,11 @@ require "spec_helper"
 module Decidim
   module Proposals
     describe ProposalVotesController, type: :controller do
+      routes { Decidim::Proposals::Engine.routes }
+
       let(:proposal) { create(:proposal, feature: feature) }
       let(:user) { create(:user, :confirmed, organization: feature.organization) }
 
-      routes do
-        Decidim::Proposals::Engine.routes
-      end
-
       before do
         @request.env["decidim.current_organization"] = feature.organization
         @request.env["decidim.current_participatory_process"] = feature.participatory_process

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

@@ -5,11 +5,9 @@ require "spec_helper"
 module Decidim
   module Proposals
     describe ProposalsController, type: :controller do
-      let(:user) { create(:user, :confirmed, organization: feature.organization) }
+      routes { Decidim::Proposals::Engine.routes }
 
-      routes do
-        Decidim::Proposals::Engine.routes
-      end
+      let(:user) { create(:user, :confirmed, organization: feature.organization) }
 
       before do
         @request.env["decidim.current_organization"] = feature.organization

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

@@ -7,6 +7,6 @@ describe "Comments", type: :feature, perform_enqueued: true do
   let!(:author) { create(:user, :confirmed, organization: organization) }
   let!(:commentable) { create(:proposal, feature: feature, author: author) }
 
-  let(:resource_path) { decidim_proposals.proposal_path(commentable, feature_id: feature, participatory_process_id: feature.participatory_process) }
+  let(:resource_path) { resource_locator(commentable).path }
   include_examples "comments"
 end

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

@@ -9,7 +9,7 @@ describe "Report Proposal", type: :feature do
   let(:manifest_name) { "proposals" }
   let!(:proposals) { create_list(:proposal, 3, feature: feature) }
   let(:reportable) { proposals.first }
-  let(:reportable_path) { decidim_proposals.proposal_path(reportable, feature_id: feature, participatory_process_id: feature.participatory_process) }
+  let(:reportable_path) { resource_locator(reportable).path }
   let!(:user) { create :user, :confirmed, organization: organization }
 
   let!(:feature) do

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

@@ -81,6 +81,24 @@ module Decidim
             end
           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])
+          end
+        end
       end
     end
   end

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

@@ -20,7 +20,7 @@ RSpec.shared_examples "manage proposals" do
       end
 
       within_window @new_window do
-        expect(current_path).to eq decidim_proposals.proposal_path(id: proposal.id, participatory_process_id: participatory_process.id, feature_id: current_feature.id)
+        expect(current_path).to eq resource_locator(proposal).path
         expect(page).to have_content(translated(proposal.title))
       end
     end

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

@@ -133,4 +133,10 @@ RSpec.shared_examples "a proposal form" do
       it { is_expected.to eq(nil) }
     end
   end
+
+  it "properly maps category id from model" do
+    proposal = create(:proposal, feature: feature, category: category)
+
+    expect(described_class.from_model(proposal).category_id).to eq(category_id)
+  end
 end

data/decidim-results/app/controllers/decidim/results/result_widgets_controller.rb

@@ -3,8 +3,6 @@
 module Decidim
   module Results
     class ResultWidgetsController < Decidim::WidgetsController
-      helper_method :model
-
       private
 
       def model

data/decidim-results/app/forms/decidim/results/admin/result_form.rb

@@ -22,6 +22,10 @@ module Decidim
 
         def map_model(model)
           self.proposal_ids = model.linked_resources(:proposals, "included_proposals").pluck(:id)
+
+          return unless model.categorization
+
+          self.decidim_category_id = model.categorization.decidim_category_id
         end
 
         def proposals

data/decidim-results/app/views/decidim/results/admin/results/index.html.erb

@@ -22,7 +22,7 @@
                 <%= translated_attribute(result.title) %><br />
               </td>
               <td class="table-list__actions">
-                <%= icon_link_to "eye", decidim_results.result_path(id: result, feature_id: current_feature, participatory_process_id: current_participatory_process), t("actions.preview", scope: "decidim.results"), class: "action-icon--preview", target: :blank %>
+                <%= icon_link_to "eye", resource_locator(result).path, t("actions.preview", scope: "decidim.results"), class: "action-icon--preview", target: :blank %>
 
                 <% if can? :update, current_feature %>
                   <%= icon_link_to "pencil", edit_result_path(result), t("actions.edit", scope: "decidim.results"), class: "action-icon--edit" %>

data/decidim-results/app/views/decidim/results/results/_tags.html.erb

@@ -1,10 +1,10 @@
 <% if result.category.present? || result.scope.present? %>
   <ul class="tags tags--result" >
     <% if result.category.present? %>
-      <li><%= link_to translated_attribute(result.category.name), decidim_results.results_path(filter: { category_id: result.category.id }) %></li>
+      <li><%= link_to translated_attribute(result.category.name), resource_locator(result).index(filter: { category_id: result.category.id }) %></li>
     <% end %>
     <% if !current_participatory_process.scope && result.scope.present? %>
-      <li><%= link_to result.scope.name, decidim_results.results_path(filter: { scope_id: [result.scope.id] }) %></li>
+      <li><%= link_to result.scope.name, resource_locator(result).index(filter: { scope_id: [result.scope.id] }) %></li>
     <% end %>
   </ul>
 <% end %>

data/decidim-results/decidim-results.gemspec

@@ -22,7 +22,8 @@ Gem::Specification.new do |s|
   s.add_dependency "kaminari", "~> 1.0.1"
 
   s.add_development_dependency "decidim-dev", Decidim.version
+  s.add_development_dependency "decidim-admin", Decidim.version
   s.add_development_dependency "decidim-comments", Decidim.version
-  s.add_development_dependency "decidim-meetings", Decidim.version
   s.add_development_dependency "decidim-proposals", Decidim.version
+  s.add_development_dependency "decidim-meetings", Decidim.version
 end

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

@@ -33,30 +33,26 @@ Decidim.register_feature(:results) do |feature|
     settings.attribute :comments_blocked, type: :boolean, default: false
   end
 
-  feature.seeds do
-    Decidim::ParticipatoryProcess.find_each do |process|
-      next unless process.steps.any?
-
-      feature = Decidim::Feature.create!(
-        name: Decidim::Features::Namer.new(process.organization.available_locales, :results).i18n_name,
-        manifest_name: :results,
-        published_at: Time.current,
-        participatory_process: process
+  feature.seeds do |process|
+    feature = Decidim::Feature.create!(
+      name: Decidim::Features::Namer.new(process.organization.available_locales, :results).i18n_name,
+      manifest_name: :results,
+      published_at: Time.current,
+      participatory_process: process
+    )
+
+    3.times do
+      result = Decidim::Results::Result.create!(
+        feature: feature,
+        scope: process.organization.scopes.sample,
+        category: process.categories.sample,
+        title: Decidim::Faker::Localized.sentence(2),
+        description: Decidim::Faker::Localized.wrapped("<p>", "</p>") do
+          Decidim::Faker::Localized.paragraph(3)
+        end
       )
 
-      3.times do
-        result = Decidim::Results::Result.create!(
-          feature: feature,
-          scope: process.organization.scopes.sample,
-          category: process.categories.sample,
-          title: Decidim::Faker::Localized.sentence(2),
-          description: Decidim::Faker::Localized.wrapped("<p>", "</p>") do
-            Decidim::Faker::Localized.paragraph(3)
-          end
-        )
-
-        Decidim::Comments::Seed.comments_for(result)
-      end
+      Decidim::Comments::Seed.comments_for(result)
     end
   end
 end

data/decidim-results/spec/controllers/results_controller_spec.rb

@@ -5,6 +5,8 @@ require "spec_helper"
 module Decidim
   module Results
     describe ResultsController, type: :controller do
+      routes { Decidim::Results::Engine.routes }
+
       before do
         @request.env["decidim.current_organization"] = feature.organization
         @request.env["decidim.current_participatory_process"] = feature.participatory_process

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

@@ -16,6 +16,6 @@ describe "Comments", type: :feature, perform_enqueued: true do
   end
   let!(:commentable) { create(:result, feature: feature) }
 
-  let(:resource_path) { decidim_results.result_path(commentable, feature_id: feature, participatory_process_id: feature.participatory_process) }
+  let(:resource_path) { resource_locator(commentable).path }
   include_examples "comments"
 end