decidim 0.2.0 → 0.3.0

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

@@ -92,13 +92,17 @@ Decidim.register_feature(:proposals) do |feature|
       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: Decidim::User.where(organization: feature.organization).all.sample
+          author: author,
+          user_group: user_group
         )
 
         if n > 15

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

@@ -46,12 +46,7 @@ module Decidim
 
       def meetings
         @proposal.linked_resources(:meetings, "proposals_from_meeting").map do |meeting|
-          decidim_resource_url(
-            meeting,
-            feature_id: feature,
-            participatory_process_id: participatory_process,
-            host: organization.host
-          )
+          Decidim::ResourceLocatorPresenter.new(meeting).url
         end
       end
 

data/decidim-proposals/spec/commands/decidim/proposals/unvote_proposal_spec.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+module Decidim
+  module Proposals
+    describe UnvoteProposal do
+      describe "call" do
+        let(:proposal) { create(:proposal) }
+        let(:current_user) { create(:user, organization: proposal.feature.organization) }
+        let!(:proposal_vote) { create(:proposal_vote, author: current_user, proposal: proposal) }
+        let(:command) { described_class.new(proposal, current_user) }
+
+        it "broadcasts ok" do
+          expect { command.call }.to broadcast(:ok)
+        end
+
+        it "deletes the proposal vote for that user" do
+          expect do
+            command.call
+          end.to change { ProposalVote.count }.by(-1)
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,47 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+module Decidim
+  module Proposals
+    describe VoteProposal do
+      describe "call" do
+        let(:proposal) { create(:proposal) }
+        let(:current_user) { create(:user, organization: proposal.feature.organization) }
+        let(:command) { described_class.new(proposal, current_user) }
+
+        describe "when the vote is not valid" do
+          before do
+            allow_any_instance_of(ProposalVote).to receive(:valid?).and_return(false)
+          end
+
+          it "broadcasts invalid" do
+            expect { command.call }.to broadcast(:invalid)
+          end
+
+          it "doesn't create a new vote for the proposal" do
+            expect do
+              command.call
+            end.to change { ProposalVote.count }.by(0)
+          end
+        end
+
+        describe "when the vote is valid" do
+          before do
+            allow_any_instance_of(ProposalVote).to receive(:valid?).and_return(true)
+          end
+
+          it "broadcasts ok" do
+            expect { command.call }.to broadcast(:ok)
+          end
+
+          it "creates a new vote for the proposal" do
+            expect do
+              command.call
+            end.to change { ProposalVote.count }.by(1)
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -3,18 +3,13 @@
 require "spec_helper"
 
 describe "Admin manages proposals", type: :feature do
-  include_context "admin"
-  it_behaves_like "manage proposals"
-  it_behaves_like "manage moderations"
-  it_behaves_like "export proposals"
-  include_context "feature"
   let(:manifest_name) { "proposals" }
-
+  let!(:proposal) { create :proposal, feature: current_feature }
   let!(:reportables) { create_list(:proposal, 3, feature: current_feature) }
 
-  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
+  include_context "feature admin"
+
+  it_behaves_like "manage proposals"
+  it_behaves_like "manage moderations"
+  it_behaves_like "export proposals"
 end

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

@@ -3,19 +3,13 @@
 require "spec_helper"
 
 describe "Process admin manages proposals", type: :feature do
-  include_context "admin"
-  let(:user) { process_admin }
-  it_behaves_like "manage proposals"
-  it_behaves_like "manage moderations"
-  it_behaves_like "export proposals"
-  include_context "feature"
   let(:manifest_name) { "proposals" }
-
+  let!(:proposal) { create :proposal, feature: current_feature }
   let!(:reportables) { create_list(:proposal, 3, feature: current_feature) }
 
-  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
+  include_context "feature process admin"
+
+  it_behaves_like "manage proposals"
+  it_behaves_like "manage moderations"
+  it_behaves_like "export proposals"
 end

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

@@ -354,6 +354,22 @@ describe "Proposals", type: :feature do
         expect(page).to have_i18n_content(proposal.answer)
       end
     end
+
+    context "when the proposals'a author account has been deleted" do
+      let(:proposal) { proposals.first }
+
+      before do
+        Decidim::DestroyAccount.call(proposal.author, Decidim::DeleteAccountForm.from_params({}))
+      end
+
+      it "the user is displayed as a deleted user" do
+        visit_feature
+
+        click_link proposal.title
+
+        expect(page).to have_content("Deleted user")
+      end
+    end
   end
 
   context "when a proposal has been linked in a project" do
@@ -381,6 +397,20 @@ describe "Proposals", type: :feature do
   end
 
   context "listing proposals in a participatory process" do
+    shared_examples_for "a random proposal ordering" do
+      let!(:lucky_proposal) { create(:proposal, feature: feature) }
+      let!(:unlucky_proposal) { create(:proposal, feature: feature) }
+
+      it "lists the proposals ordered randomly by default" do
+        visit_feature
+
+        expect(page).to have_selector("a", text: "Random")
+        expect(page).to have_selector("#proposals .card-grid .column", count: 2)
+        expect(page).to have_selector("#proposals .card-grid .column", text: lucky_proposal.title)
+        expect(page).to have_selector("#proposals .card-grid .column", text: unlucky_proposal.title)
+      end
+    end
+
     it "lists all the proposals" do
       create(:proposal_feature,
              manifest: manifest,
@@ -392,6 +422,10 @@ describe "Proposals", type: :feature do
       expect(page).to have_css(".card--proposal", count: 3)
     end
 
+    describe "default ordering" do
+      it_behaves_like "a random proposal ordering"
+    end
+
     context "when voting phase is over" do
       let!(:feature) do
         create(:proposal_feature,
@@ -430,21 +464,13 @@ describe "Proposals", type: :feature do
                participatory_process: participatory_process)
       end
 
-      let!(:lucky_proposal) { create(:proposal, title: "A", feature: feature) }
-      let!(:unlucky_proposal) { create(:proposal, title: "B", feature: feature) }
-
-      it "lists the proposals ordered randomly by default" do
-        allow_any_instance_of(Decidim::Proposals::Proposal::ActiveRecord_Relation).to \
-          receive(:order_randomly) { |scope, _seed| scope.order(title: :asc) }
-
-        visit_feature
-
-        expect(page).to have_selector("a", text: "Random")
-        expect(page).to have_selector("#proposals .card-grid .column:first-child", text: lucky_proposal.title)
-        expect(page).to have_selector("#proposals .card-grid .column:last-child", text: unlucky_proposal.title)
+      describe "order" do
+        it_behaves_like "a random proposal ordering"
       end
 
       it "shows only links to full proposals" do
+        create_list(:proposal, 2, feature: feature)
+
         visit_feature
 
         expect(page).to have_no_button("Voting disabled", disabled: true)

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

@@ -122,11 +122,8 @@ RSpec.shared_examples "manage proposals" do
           end
 
           context "when geocoding is enabled" do
-            let!(:current_feature) do
-              create(:proposal_feature,
-                     :with_geocoding_enabled,
-                     manifest: manifest,
-                     participatory_process: participatory_process)
+            before do
+              current_feature.update_attributes(settings: { geocoding_enabled: true })
             end
 
             it "creates a new proposal related to the process scope" do
@@ -194,7 +191,7 @@ RSpec.shared_examples "manage proposals" do
         within ".edit_proposal_answer" do
           fill_in_i18n_editor(
             :proposal_answer_answer,
-            "#answer-tabs",
+            "#proposal_answer-answer-tabs",
             en: "The proposal doesn't make any sense",
             es: "La propuesta no tiene sentido",
             ca: "La proposta no te sentit"

data/decidim-proposals/spec/spec_helper.rb

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

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

@@ -5,7 +5,7 @@ module Decidim
     # This controller is the abstract class from which all other controllers of
     # this engine inherit.
     #
-    # Note that it inherits from `Decidim::Components::BaseController`, which
+    # Note that it inherits from `Decidim::Features::BaseController`, which
     # override its layout and provide all kinds of useful methods.
     class ApplicationController < Decidim::Features::BaseController
     end

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

@@ -2,7 +2,7 @@
   <% resources.each do |result| %>
     <div class="card--list__item">
       <%= icon "actions", class: "card--list__icon", remove_icon_class: true %>
-      <%= link_to decidim_resource_path(result), class: "card--list__text card__link card__link--block" do %>
+      <%= link_to resource_locator(result).path, class: "card--list__text card__link card__link--block" do %>
         <h5 class="card--list__heading">
           <%= translated_attribute(result.title) %>
         </h5>

data/decidim-results/bin/rails

@@ -4,11 +4,11 @@
 # This command will automatically be run when you run "rails" with Rails gems
 # installed from the root of your application.
 
-ENGINE_ROOT = File.expand_path("../..", __FILE__)
-ENGINE_PATH = File.expand_path("../../lib/decidim/results/engine", __FILE__)
+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", __FILE__)
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../Gemfile", __dir__)
 require "bundler/setup" if File.exist?(ENV["BUNDLE_GEMFILE"])
 
 require "rails/all"

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

@@ -0,0 +1,78 @@
+it:
+  activemodel:
+    attributes:
+      result:
+        decidim_category_id: Categoria
+        decidim_scope_id: Visibilità
+        description: Descrizione
+        proposal_ids: Proposte incluse
+        title: Titolo
+  decidim:
+    features:
+      results:
+        name: Risultati
+        settings:
+          global:
+            comments_enabled: Commenti abilitati
+          step:
+            comments_blocked: Commenti bloccati
+    resource_links:
+      included_proposals:
+        result_proposals: Proposte incluse in questo risultato
+      meetings_through_proposals:
+        result_meetings: Meetin correlati
+    results:
+      actions:
+        confirm_destroy: Sei sicuro di voler cancellare questo risultato?
+        destroy: Cancella
+        edit: Modifica
+        new: Nuovo
+        preview: Anteprima
+        title: Azioni
+      admin:
+        models:
+          result:
+            name: Risultato
+        results:
+          create:
+            invalid: C'è stato un problema durante la creazione di questo risultato
+            success: OK, il risultato è stato creato
+          destroy:
+            success: Il risultato è stato cancellato
+          edit:
+            title: Modifica il risultato (Ambito)
+            update: Modifica
+          index:
+            title: Risultati
+          new:
+            create: Crea
+            title: Nuovo risultato
+          update:
+            invalid: C'è stato un problema durante l'aggiornamento di questo risultato
+            success: OK, il risultato è stato modificato
+      models:
+        result:
+          fields:
+            title: Titolo
+      results:
+        count:
+          results_count:
+            one: 1 risultato
+            other: "%{count} risultati"
+        filters:
+          category: Categoria
+          category_prompt: Scegli una categoria
+          scopes: Visibilità
+          search: Cerca
+        filters_small_view:
+          close_modal: Chiudi modalità
+          filter: Filtro
+          filter_by: Filtra per
+          unfold: Espandi
+        show:
+          stats:
+            attendees: Partecipanti
+            comments: Commenti
+            contributions: Contributi
+            proposals: Proposte
+            votes: Voti

data/decidim-results/db/migrate/20170116104125_create_results.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class CreateResults < ActiveRecord::Migration[5.0]
   def change
     create_table :decidim_results_results do |t|

data/decidim-results/db/migrate/20170129164553_remove_short_description_from_results.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class RemoveShortDescriptionFromResults < ActiveRecord::Migration[5.0]
   def change
     remove_column :decidim_results_results, :short_description

data/decidim-results/db/migrate/20170215132624_add_reference_to_results.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class AddReferenceToResults < ActiveRecord::Migration[5.0]
   def change
     add_column :decidim_results_results, :reference, :string

data/decidim-results/db/migrate/20170410074358_remove_not_null_reference_results.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class RemoveNotNullReferenceResults < ActiveRecord::Migration[5.0]
   def change
     change_column_null :decidim_results_results, :reference, true

data/decidim-results/db/migrate/20170612101951_migrate_results_category.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+class MigrateResultsCategory < ActiveRecord::Migration[5.1]
+  def change
+    # Create categorizations ensuring database integrity
+    execute('
+      INSERT INTO decidim_categorizations(decidim_category_id, categorizable_id, categorizable_type, created_at, updated_at)
+        SELECT decidim_category_id, decidim_results_results.id, \'Decidim::Results::Result\', NOW(), NOW()
+        FROM decidim_results_results
+        INNER JOIN decidim_categories ON decidim_categories.id = decidim_results_results.decidim_category_id
+    ')
+    # Remove unused column
+    remove_column :decidim_results_results, :decidim_category_id
+  end
+end

data/decidim-results/decidim-results.gemspec

@@ -1,4 +1,6 @@
-$:.push File.expand_path("../lib", __FILE__)
+# frozen_string_literal: true
+
+$LOAD_PATH.push File.expand_path("lib", __dir__)
 
 # Maintain your gem's version:
 require_relative "../decidim-core/lib/decidim/core/version"

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

@@ -3,12 +3,10 @@
 require "spec_helper"
 
 describe "Admin manages results", type: :feature do
-  include_context "admin"
-  it_behaves_like "manage results"
+  let(:manifest_name) { "results" }
+  let!(:result) { create :result, scope: scope, feature: current_feature }
+
+  include_context "feature admin"
 
-  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
+  it_behaves_like "manage results"
 end