decidim 0.0.5 → 0.0.6

data/decidim-proposals/db/migrate/20170215113152_create_proposal_reports.rb

@@ -0,0 +1,14 @@
+class CreateProposalReports < ActiveRecord::Migration[5.0]
+  def change
+    create_table :decidim_proposals_proposal_reports do |t|
+      t.references :decidim_proposal, null: false, index: { name: "decidim_proposals_proposal_result_proposal" }
+      t.references :decidim_user, null: false, index: { name: "decidim_proposals_proposal_result_user" }
+      t.string :reason, null: false
+      t.text :details
+
+      t.timestamps
+    end
+
+    add_index :decidim_proposals_proposal_reports, [:decidim_proposal_id, :decidim_user_id], unique: true, name: "decidim_proposals_proposal_report_proposal_user_unique"
+  end
+end

data/decidim-proposals/db/migrate/20170215131720_add_report_count_to_proposals.rb

@@ -0,0 +1,5 @@
+class AddReportCountToProposals < ActiveRecord::Migration[5.0]
+  def change
+    add_column :decidim_proposals_proposals, :report_count, :integer, default: 0
+  end
+end

data/decidim-proposals/db/migrate/20170215132030_add_reference_to_proposals.rb

@@ -0,0 +1,7 @@
+class AddReferenceToProposals < ActiveRecord::Migration[5.0]
+  def change
+    add_column :decidim_proposals_proposals, :reference, :string
+    Decidim::Proposals::Proposal.find_each(&:save)
+    change_column_null :decidim_proposals_proposals, :reference, false
+  end
+end

data/decidim-proposals/db/migrate/20170220152416_add_hidden_at_to_proposals.rb

@@ -0,0 +1,5 @@
+class AddHiddenAtToProposals < ActiveRecord::Migration[5.0]
+  def change
+    add_column :decidim_proposals_proposals, :hidden_at, :datetime
+  end
+end

data/decidim-proposals/db/migrate/20170228105156_add_geolocalization_fields_to_proposals.rb

@@ -0,0 +1,7 @@
+class AddGeolocalizationFieldsToProposals < ActiveRecord::Migration[5.0]
+  def change
+    add_column :decidim_proposals_proposals, :address, :text
+    add_column :decidim_proposals_proposals, :latitude, :float
+    add_column :decidim_proposals_proposals, :longitude, :float
+  end
+end

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

@@ -0,0 +1,26 @@
+class MigrateProposalReportsDataToReports < ActiveRecord::Migration[5.0]
+  class Decidim::Proposals::ProposalReport < ApplicationRecord
+    belongs_to :user, foreign_key: "decidim_user_id", class_name: "Decidim::User"
+    belongs_to :proposal, foreign_key: "decidim_proposal_id", class_name: "Decidim::Proposals::Proposal"
+  end
+
+  def change
+    Decidim::Proposals::ProposalReport.all.each do |proposal_report|
+      moderation = Decidim::Moderation.find_or_create_by!({
+        reportable: proposal_report.proposal,
+        participatory_process: proposal_report.proposal.feature.participatory_process
+      })
+      Decidim::Report.create!({
+        moderation: moderation,
+        user: proposal_report.user,
+        reason: proposal_report.reason,
+        details: proposal_report.details
+      })
+      moderation.update_attributes!(report_count: moderation.report_count + 1)
+    end
+
+    drop_table :decidim_proposals_proposal_reports
+    remove_column :decidim_proposals_proposals, :report_count
+    remove_column :decidim_proposals_proposals, :hidden_at
+  end
+end

data/decidim-proposals/decidim-proposals.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |s|
   s.add_dependency "decidim-comments", Decidim.version
   s.add_dependency "rectify", "~> 0.8.0"
   s.add_dependency "kaminari", "~> 1.0.1"
-  s.add_dependency 'social-share-button', "~> 0.8.8"
+  s.add_dependency 'social-share-button', "~> 0.9.0"
 
   s.add_development_dependency "decidim-dev", Decidim.version
   s.add_development_dependency "decidim-meetings", Decidim.version

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

@@ -19,8 +19,8 @@ Decidim.register_feature(:proposals) do |feature|
     settings.attribute :vote_limit, type: :integer, default: 0
     settings.attribute :proposal_answering_enabled, type: :boolean, default: true
     settings.attribute :official_proposals_enabled, type: :boolean, default: true
-    settings.attribute :scoped_proposals_enabled, type: :boolean, default: true
     settings.attribute :comments_enabled, type: :boolean, default: true
+    settings.attribute :geocoding_enabled, type: :boolean, default: false
   end
 
   feature.settings(:step) do |settings|
@@ -53,7 +53,8 @@ Decidim.register_feature(:proposals) do |feature|
         }
       )
       categories = feature.participatory_process.categories
-      scopes = feature.organization.scopes
+      # So that we have some with global scope
+      scopes = feature.organization.scopes + [nil]
 
       20.times do |n|
         proposal = Decidim::Proposals::Proposal.create!(
@@ -77,7 +78,7 @@ Decidim.register_feature(:proposals) do |feature|
         end
 
         rand(3).times do |m|
-          email = "vote-author-#{process.id}-#{n}-#{m}@decidim.org"
+          email = "vote-author-#{process.id}-#{n}-#{m}@example.org"
           name = "#{Faker::Name.name} #{process.id} #{n} #{m}"
 
           author = Decidim::User.create!(email: email,

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

@@ -50,6 +50,14 @@ FactoryGirl.define do
         }
       end
     end
+
+    trait :with_geocoding_enabled do
+      settings do
+        {
+          geocoding_enabled: true
+        }
+      end
+    end
   end
 
   factory :proposal, class: Decidim::Proposals::Proposal do

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

@@ -5,9 +5,12 @@ require "spec_helper"
 describe "Admin manages proposals", type: :feature do
   include_context "admin"
   it_behaves_like "manage proposals"
+  it_behaves_like "manage moderations"
   include_context "feature"
   let(:manifest_name) { "proposals" }
 
+  let!(:reportables) { create_list(:proposal, 3, feature: current_feature) }
+
   before do
     switch_to_host(organization.host)
     login_as user, scope: :user

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

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+require "spec_helper"
+
+describe "Comments", type: :feature, perform_enqueued: true do
+  let!(:feature) { create(:proposal_feature, organization: organization) }
+  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) }
+  include_examples "comments"
+end

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

@@ -6,9 +6,12 @@ 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"
   include_context "feature"
   let(:manifest_name) { "proposals" }
 
+  let!(:reportables) { create_list(:proposal, 3, feature: current_feature) }
+
   before do
     switch_to_host(organization.host)
     login_as user, scope: :user

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

@@ -3,6 +3,11 @@ require "spec_helper"
 
 describe "Proposals", type: :feature do
   include_context "feature"
+  let!(:feature) do
+    create(:proposal_feature,
+      manifest: manifest,
+      participatory_process: participatory_process)
+  end
   let(:manifest_name) { "proposals" }
 
   let!(:proposals) { create_list(:proposal, 3, feature: feature) }
@@ -10,6 +15,16 @@ describe "Proposals", type: :feature do
   let!(:scope) { create :scope, organization: organization }
   let!(:user) { create :user, :confirmed, organization: organization }
 
+  let(:address) { "Carrer Pare Llaurador 113, baixos, 08224 Terrassa" }
+  let(:latitude) { 40.1234 }
+  let(:longitude) { 2.1234 }
+
+  before do
+    Geocoder::Lookup::Test.add_stub(address, [
+      { 'latitude' => latitude, 'longitude' => longitude }
+    ])
+  end
+
   context "creating a new proposal" do
     context "when the user is logged in" do
       before do
@@ -24,12 +39,12 @@ describe "Proposals", type: :feature do
                  participatory_process: participatory_process)
         end
 
-        context "when scoped_proposals setting is enabled" do
+        context "when process is not related to any scope" do
           before do
-            feature.update_attributes(settings: { scoped_proposals_enabled: true})
+            participatory_process.update_attributes(scope: nil)
           end
 
-          it "cannot be related to a scope" do
+          it "can be related to a scope" do
             visit_feature
 
             click_link "New proposal"
@@ -40,9 +55,9 @@ describe "Proposals", type: :feature do
           end
         end
 
-        context "when scoped_proposals setting is not enabled" do
+        context "when process is related to any scope" do
           before do
-            feature.update_attributes(settings: { scoped_proposals_enabled: false})
+            participatory_process.update_attributes(scope: scope)
           end
 
           it "cannot be related to a scope" do
@@ -78,6 +93,40 @@ describe "Proposals", type: :feature do
           expect(page).to have_content(user.name)
         end
 
+        context "when geocoding is enabled" do
+          let!(:feature) do
+            create(:proposal_feature,
+                  :with_creation_enabled,
+                  :with_geocoding_enabled,
+                  manifest: manifest,
+                  participatory_process: participatory_process)
+          end
+
+          it "creates a new proposal" do
+            visit_feature
+
+            click_link "New proposal"
+
+            within ".new_proposal" do
+              fill_in :proposal_title, with: "Oriol for president"
+              fill_in :proposal_body, with: "He will solve everything"
+              fill_in :proposal_address, with: address
+              select category.name["en"], from: :proposal_category_id
+              select scope.name, from: :proposal_scope_id
+
+              find("*[type=submit]").click
+            end
+
+            expect(page).to have_content("successfully")
+            expect(page).to have_content("Oriol for president")
+            expect(page).to have_content("He will solve everything")
+            expect(page).to have_content(address)
+            expect(page).to have_content(category.name["en"])
+            expect(page).to have_content(scope.name)
+            expect(page).to have_content(user.name)
+          end
+        end
+
         context "when the user has verified organizations" do
           let(:user_group) { create(:user_group, :verified) }
 
@@ -107,6 +156,41 @@ describe "Proposals", type: :feature do
             expect(page).to have_content(scope.name)
             expect(page).to have_content(user_group.name)
           end
+
+          context "when geocoding is enabled" do
+            let!(:feature) do
+              create(:proposal_feature,
+                    :with_creation_enabled,          
+                    :with_geocoding_enabled,
+                    manifest: manifest,
+                    participatory_process: participatory_process)
+            end
+
+            it "creates a new proposal as a user group" do
+              visit_feature
+
+              click_link "New proposal"
+
+              within ".new_proposal" do
+                fill_in :proposal_title, with: "Oriol for president"
+                fill_in :proposal_body, with: "He will solve everything"
+                fill_in :proposal_address, with: address
+                select category.name["en"], from: :proposal_category_id
+                select scope.name, from: :proposal_scope_id
+                select user_group.name, from: :proposal_user_group_id
+
+                find("*[type=submit]").click
+              end
+
+              expect(page).to have_content("successfully")
+              expect(page).to have_content("Oriol for president")
+              expect(page).to have_content("He will solve everything")
+              expect(page).to have_content(address)
+              expect(page).to have_content(category.name["en"])
+              expect(page).to have_content(scope.name)
+              expect(page).to have_content(user_group.name)
+            end
+          end
         end
 
         context "when the user isn't authorized" do
@@ -142,13 +226,14 @@ describe "Proposals", type: :feature do
       expect(page).to have_content(proposal.title)
       expect(page).to have_content(proposal.body)
       expect(page).to have_content(proposal.author.name)
+      expect(page).to have_content(proposal.reference)
     end
 
-    context "when scoped_proposals setting is enabled" do
+    context "when process is not related to any scope" do
       let!(:proposal) { create(:proposal, feature: feature, scope: scope) }
 
       before do
-        feature.update_attributes(settings: { scoped_proposals_enabled: true } )
+        participatory_process.update_attributes(scope: nil)
       end
 
       it "can be filtered by scope" do
@@ -158,14 +243,14 @@ describe "Proposals", type: :feature do
       end
     end
 
-    context "when scoped_proposals setting is not enabled" do
+    context "when process is related to a scope" do
       let!(:proposal) { create(:proposal, feature: feature, scope: scope) }
 
       before do
-        feature.update_attributes(settings: { scoped_proposals_enabled: false } )
+        participatory_process.update_attributes(scope: scope)
       end
 
-      it "cannot be filtered by scope" do
+      it "does not show the scope name" do
         visit_feature
         click_link proposal.title
         expect(page).not_to have_content(scope.name)
@@ -309,9 +394,7 @@ describe "Proposals", type: :feature do
 
         find(".pagination-next a").click
 
-        within ".pagination .current" do
-          expect(page).to have_content("2")
-        end
+        expect(page).to have_selector(".pagination .current", text: "2")
 
         expect(page).to have_css(".card--proposal", count: 8)
       end
@@ -387,9 +470,9 @@ describe "Proposals", type: :feature do
         end
       end
 
-      context "when scoped_proposals setting is not enabled" do
+      context "when process is related to a scope" do
         before do
-          feature.update_attributes(settings: { scoped_proposals_enabled: false } )
+          participatory_process.update_attributes(scope: scope)
         end
 
         it "cannot be filtered by scope" do

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

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+require "spec_helper"
+
+describe "Report Proposal", type: :feature do
+  include_context "feature"
+  include_examples "reports"
+
+  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!(:user) { create :user, :confirmed, organization: organization }
+
+  let!(:feature) do
+    create(:proposal_feature,
+      manifest: manifest,
+      participatory_process: participatory_process)
+  end
+end

data/decidim-proposals/spec/helpers/proposal_order_helper_spec.rb

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+require "spec_helper"
+
+module Decidim
+  module Proposals
+    describe ProposalOrderHelper do
+      before do
+        allow(helper).to receive(:current_settings).and_return(current_settings)
+      end
+
+      describe "#order_fields" do
+        context "with votes enabled" do
+          let(:current_settings) { double(:current_settings, { votes_enabled?: true }) }
+
+          it "shows most_voted option to sort" do
+            expect(helper.order_fields).to include(:most_voted)
+          end
+        end
+
+        context "with votes disabled" do
+          let(:current_settings) { double(:current_settings, { votes_enabled?: false }) }
+
+          it "doesn't show most_voted option to sort" do
+            expect(helper.order_fields).not_to include(:most_voted)
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -11,6 +11,8 @@ module Decidim
       include_examples "has feature"
       include_examples "has scope"
       include_examples "has category"
+      include_examples "has reference"
+      include_examples "reportable"
 
       it { is_expected.to be_valid }
 

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

@@ -132,6 +132,15 @@ module Decidim
               expect(subject).to match_array [proposal, proposal2]
             end
           end
+
+          context "when `global` is being sent" do
+            let!(:resource_without_scope) { create(:proposal, feature: feature, scope: nil)}
+            let(:scope_id) { ["global"] }
+
+            it "returns resources without a scope" do
+              expect(subject).to eq [resource_without_scope]
+            end
+          end
         end
 
         describe "when the filter includes related_to" do