decidim 0.0.2 → 0.0.3

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

@@ -5,12 +5,14 @@ module Decidim
   module Proposals
     describe ProposalVote do
       let!(:organization) { create(:organization) }
-      let!(:feature) { create(:feature, organization: organization)}      
+      let!(:feature) { create(:feature, organization: organization, manifest_name: "proposals") }
       let!(:participatory_process) { create(:participatory_process, organization: organization) }
       let!(:author) { create(:user, organization: organization) }
       let!(:proposal) { create(:proposal, feature: feature, author: author)}
       let!(:proposal_vote) { create(:proposal_vote, proposal: proposal, author: author) }
 
+      subject { proposal_vote }
+
       it "is valid" do
         expect(proposal_vote).to be_valid
       end
@@ -29,6 +31,22 @@ module Decidim
         }.to raise_error(ActiveRecord::RecordInvalid)
       end
 
+      context "when no author" do
+        before do
+          proposal_vote.author = nil
+        end
+
+        it { is_expected.to be_invalid }
+      end
+
+      context "when no proposal" do
+        before do
+          proposal_vote.proposal = nil
+        end
+
+        it { is_expected.to be_invalid }
+      end
+
       context "when proposal and author have different organization" do
         let(:other_author) { create(:user) }
         let(:other_proposal) { create(:proposal) }

data/decidim-proposals/spec/services/decidim/proposals/proposal_search_spec.rb

@@ -3,23 +3,25 @@ require "spec_helper"
 module Decidim
   module Proposals
     describe ProposalSearch do
-      let(:feature) { create(:feature) }
+      let(:feature) { create(:feature, manifest_name: "proposals") }
       let(:user) { create(:user, organization: feature.organization) }
       let!(:proposal) { create(:proposal, feature: feature)}
-      let(:page) { 1 }
 
       describe "results" do
         let(:random_seed) { 0.2 }
         let(:activity) { [] }
-        let(:search_text) { nil }        
+        let(:search_text) { nil }
+        let(:origin) { nil }
+        let(:state) { nil }
 
-        subject do 
+        subject do
           described_class.new({
             feature: feature,
-            page: page,
             random_seed: random_seed,
             activity: activity,
             search_text: search_text,
+            state: state,
+            origin: origin,
             current_user: user
           }).results
         end
@@ -36,7 +38,7 @@ module Decidim
           other_proposal = create(:proposal)
 
           expect(subject).to include(proposal)
-          expect(subject).to_not include(other_proposal)
+          expect(subject).not_to include(other_proposal)
         end
 
         it "randomizes the order of proposals" do
@@ -45,28 +47,15 @@ module Decidim
           subject
         end
 
-        it "filters the proposals per page" do
-          create_list(:proposal, 3, feature: feature)
-          proposals = described_class.new({
-            feature: feature,
-            per_page: 2,
-            page: page,
-            random_seed: random_seed
-          }).results
-
-          expect(proposals.total_pages).to eq(2)
-          expect(proposals.total_count).to eq(4)
-        end
-
         describe "when the filter includes search_text" do
-          let(:search_text) { "dog" }        
-          
+          let(:search_text) { "dog" }
+
           it "returns the proposals containing the search in the title or the body" do
             create_list(:proposal, 3, feature: feature)
-            create(:proposal, title: "A dog", feature: feature)            
+            create(:proposal, title: "A dog", feature: feature)
             create(:proposal, body: "There is a dog in the office", feature: feature)
 
-            expect(subject.total_count).to eq(2)            
+            expect(subject.size).to eq(2)
           end
         end
 
@@ -77,7 +66,60 @@ module Decidim
             create_list(:proposal, 3, feature: feature)
             create(:proposal_vote, proposal: Proposal.first, author: user)
 
-            expect(subject.total_count).to eq(1)            
+            expect(subject.size).to eq(1)
+          end
+        end
+
+        describe "when the filter includes origin" do
+          context "when filtering official proposals" do
+            let(:origin) { "official" }
+
+            it "returns only official proposals" do
+              official_proposals = create_list(:proposal, 3, :official, feature: feature)
+              create_list(:proposal, 3, feature: feature)
+
+              expect(subject.size).to eq(3)
+              expect(subject).to match_array(official_proposals)
+            end
+          end
+
+          context "when filtering citizen proposals" do
+            let(:origin) { "citizenship" }
+
+            it "returns only citizen proposals" do
+              create_list(:proposal, 3, :official, feature: feature)
+              citizen_proposals = create_list(:proposal, 2, feature: feature)
+              citizen_proposals << proposal
+
+              expect(subject.size).to eq(3)
+              expect(subject).to match_array(citizen_proposals)
+            end
+          end
+        end
+
+        describe "when the filter includes state" do
+          context "when filtering accpeted proposals" do
+            let(:state) { "accepted" }
+
+            it "returns only accepted proposals" do
+              accepted_proposals = create_list(:proposal, 3, :accepted, feature: feature)
+              create_list(:proposal, 3, feature: feature)
+
+              expect(subject.size).to eq(3)
+              expect(subject).to match_array(accepted_proposals)
+            end
+          end
+
+          context "when filtering rejected proposals" do
+            let(:state) { "rejected" }
+
+            it "returns only rejected proposals" do
+              create_list(:proposal, 3, feature: feature)
+              rejected_proposals = create_list(:proposal, 3, :rejected, feature: feature)
+
+              expect(subject.size).to eq(3)
+              expect(subject).to match_array(rejected_proposals)
+            end
           end
         end
       end
@@ -86,7 +128,6 @@ module Decidim
         subject do
           described_class.new({
             feature: feature,
-            page: page,
             random_seed: random_seed
           }).random_seed
         end

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

@@ -0,0 +1,69 @@
+# -*- coding: utf-8 -*-
+# frozen_string_literal: true
+RSpec.shared_examples "create a proposal" do |with_author| 
+  let(:feature) { create(:proposal_feature) }
+  let(:organization) { feature.organization }
+  let(:form) do
+    form_klass.from_params(
+      form_params
+    ).with_context(
+      current_organization: organization,
+      current_feature: feature
+    )
+  end
+  let(:author) { create(:user, organization: organization) } if with_author
+
+  describe "call" do
+    let(:form_params) do
+      {
+        title: "Proposal title",
+        body: "Proposal body"
+      }
+    end
+
+    let(:command) do
+      if with_author
+        described_class.new(form, author)
+      else
+        described_class.new(form)
+      end
+    end
+
+    describe "when the form is not valid" do
+      before do
+        expect(form).to receive(:invalid?).and_return(true)
+      end
+
+      it "broadcasts invalid" do
+        expect { command.call }.to broadcast(:invalid)
+      end
+
+      it "doesn't create a proposal" do
+        expect do
+          command.call
+        end.not_to change { Decidim::Proposals::Proposal.count }
+      end
+    end
+
+    describe "when the form is valid" do
+      it "broadcasts ok" do
+        expect { command.call }.to broadcast(:ok)
+      end
+
+      it "creates a new proposal" do
+        expect do
+          command.call
+        end.to change { Decidim::Proposals::Proposal.count }.by(1)
+      end
+
+      if with_author
+        it "sets the author" do
+          command.call
+          proposal = Decidim::Proposals::Proposal.last
+
+          expect(proposal.author).to eq(author)
+        end
+      end
+    end
+  end
+end

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

@@ -37,4 +37,53 @@ RSpec.shared_examples "manage proposals" do
       expect(proposal.scope).to eq(scope)
     end
   end
+
+  it "can reject a proposal" do
+    within find("tr", text: proposal.title) do
+      click_link "Answer"
+    end
+
+    within ".edit_proposal_answer" do
+      fill_in_i18n(
+        :proposal_answer_answer,
+        "#answer-tabs",
+        en: "The proposal doesn't make any sense",
+        es: "La propuesta no tiene sentido",
+        ca: "La proposta no te sentit"
+      )
+      choose "Rejected"
+      click_button "Answer proposal"
+    end
+
+    within ".flash" do
+      expect(page).to have_content("Proposal successfully answered")
+    end
+
+    within find("tr", text: proposal.title) do
+      within find("td:nth-child(4)") do
+        expect(page).to have_content("Rejected")
+      end
+    end
+  end
+
+  it "can accept a proposal" do
+    within find("tr", text: proposal.title) do
+      click_link "Answer"
+    end
+
+    within ".edit_proposal_answer" do
+      choose "Accepted"
+      click_button "Answer proposal"
+    end
+
+    within ".flash" do
+      expect(page).to have_content("Proposal successfully answered")
+    end
+
+    within find("tr", text: proposal.title) do
+      within find("td:nth-child(4)") do
+        expect(page).to have_content("Accepted")
+      end
+    end
+  end
 end

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

@@ -0,0 +1,100 @@
+# -*- coding: utf-8 -*-
+# frozen_string_literal: true
+RSpec.shared_examples "a proposal form" do
+  let(:feature) { create(:feature)}
+  let(:title) { "Oriol for president!" }
+  let(:body) { "Everything would be better" }
+  let(:author) { create(:user, organization: feature.organization) }
+  let(:category) { create(:category, participatory_process: feature.participatory_process) }
+  let(:scope) { create(:scope, organization: feature.organization) }
+  let(:category_id) { category.try(:id)}
+  let(:scope_id) { scope.try(:id)}
+  let(:params) do
+    {
+      title: title,
+      body: body,
+      author: author,
+      category_id: category_id,
+      scope_id: scope_id,
+    }
+  end
+
+  let(:form) do
+    described_class.from_params(params).with_context(
+      current_feature: feature,
+      current_organization: feature.organization
+    )
+  end
+
+  subject { form }
+
+  context "when everything is OK" do
+    it { is_expected.to be_valid }
+  end
+
+  context "when there's no title" do
+    let(:title) { nil }
+    it { is_expected.to be_invalid }
+  end
+
+  context "when there's no body" do
+    let(:body) { nil }
+    it { is_expected.to be_invalid }
+  end
+
+  context "when no category_id" do
+    let(:category_id) { nil }
+    it { is_expected.to be_valid }
+  end
+
+  context "when no scope_id" do
+    let(:scope_id) { nil }
+    it { is_expected.to be_valid }
+  end
+
+  context "with invalid category_id" do
+    let(:category_id) { 987 }
+    it { is_expected.to be_invalid}
+  end
+
+  context "with invalid scope_id" do
+    let(:scope_id) { 987 }
+    it { is_expected.to be_invalid}
+  end
+
+  describe "category" do
+    subject { form.category }
+
+    context "when the category exists" do
+      it { is_expected.to be_kind_of(Decidim::Category) }
+    end
+
+    context "when the category does not exist" do
+      let(:category_id) { 7654 }
+      it { is_expected.to eq(nil) }
+    end
+
+    context "when the category is from another process" do
+      let(:category_id) { create(:category).id }
+      it { is_expected.to eq(nil) }
+    end
+  end
+
+  describe "scope" do
+    subject { form.scope }
+
+    context "when the scope exists" do
+      it { is_expected.to be_kind_of(Decidim::Scope) }
+    end
+
+    context "when the scope does not exist" do
+      let(:scope_id) { 3456 }
+      it { is_expected.to eq(nil) }
+    end
+
+    context "when the scope is from another organization" do
+      let(:scope_id) { create(:scope).id }
+      it { is_expected.to eq(nil) }
+    end
+  end
+end

data/decidim-results/.gitignore

@@ -0,0 +1,7 @@
+.bundle/
+log/*.log
+pkg/
+test/dummy/db/*.sqlite3
+test/dummy/db/*.sqlite3-journal
+test/dummy/log/*.log
+test/dummy/tmp/

data/decidim-results/README.md

@@ -0,0 +1,23 @@
+# Decidim::Results
+The Results module adds results to any participatory process. It adds a CRUD engine to the admin and public views scoped inside the participatory process. Results will link to related meetings and proposals and will be used to show the progress on the related proposals.
+
+## Usage
+results will be available as a Feature for a Participatory Process.
+
+## Installation
+Add this line to your application's Gemfile:
+
+```ruby
+gem 'decidim-results
+```
+
+And then execute:
+```bash
+$ bundle
+```
+
+## Contributing
+See [Decidim](https://github.com/AjuntamentdeBarcelona/decidim).
+
+## License
+See [Decidim](https://github.com/AjuntamentdeBarcelona/decidim).

data/decidim-results/Rakefile

@@ -0,0 +1,2 @@
+# frozen_string_literal: true
+require "decidim/dev/common_rake"

data/decidim-results/app/assets/images/decidim/results/icon.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 35 35"><path d="M17.5 35A17.5 17.5 0 1 1 35 17.5 17.52 17.52 0 0 1 17.5 35zm0-33.06A15.56 15.56 0 1 0 33.06 17.5 15.57 15.57 0 0 0 17.5 1.94zM16 22.48a1 1 0 0 1-.68-.28l-4.08-4a1 1 0 0 1 1.36-1.39l3.4 3.3 8-8.8a1 1 0 0 1 1.44 1.31l-8.69 9.55a1 1 0 0 1-.69.32z"/></svg>

data/decidim-results/app/commands/decidim/results/admin/create_result.rb

@@ -0,0 +1,65 @@
+# frozen_string_literal: true
+module Decidim
+  module Results
+    module Admin
+      # This command is executed when the user creates a Result from the admin
+      # panel.
+      class CreateResult < Rectify::Command
+        def initialize(form)
+          @form = form
+        end
+
+        # Creates the result if valid.
+        #
+        # Broadcasts :ok if successful, :invalid otherwise.
+        def call
+          return broadcast(:invalid) if @form.invalid?
+
+          transaction do
+            create_result
+            link_meetings
+            link_proposals
+          end
+
+          broadcast(:ok)
+        end
+
+        private
+
+        attr_reader :result
+
+        def create_result
+          @result = Result.create!(
+            scope: @form.scope,
+            category: @form.category,
+            feature: @form.current_feature,
+            title: @form.title,
+            description: @form.description
+          )
+        end
+
+        def proposals
+          @proposals ||= result.sibling_scope(:proposals).where(id: @form.proposal_ids)
+        end
+
+        def meeting_ids
+          @meeting_ids ||= proposals.flat_map do |proposal|
+            proposal.linked_resources(:meetings, "proposals_from_meeting").pluck(:id)
+          end.uniq
+        end
+
+        def meetings
+          @meetings ||= result.sibling_scope(:meetings).where(id: meeting_ids)
+        end
+
+        def link_proposals
+          result.link_resources(proposals, "included_proposals")
+        end
+
+        def link_meetings
+          result.link_resources(meetings, "meetings_through_proposals")
+        end
+      end
+    end
+  end
+end