decidim 0.0.8.1 → 0.1.0

data/decidim-admin/spec/features/admin_manages_participatory_processes_spec.rb

@@ -16,7 +16,7 @@ describe "Admin manage participatory processes", type: :feature do
 
   it "creates a new participatory_process" do
     within ".secondary-nav__actions" do
-      page.find('a.button').click
+      page.find("a.button").click
     end
 
     within ".new_participatory_process" do
@@ -65,8 +65,8 @@ describe "Admin manage participatory processes", type: :feature do
     end
 
     within ".container" do
-      expect(page).to have_content("My participatory process")
-      expect(page).to have_content(@group_name)
+      expect(page).to have_selector("input[value='My participatory process']")
+      expect(page).to have_selector("option[selected]", text: @group_name)
       expect(page).to have_css("img[src*='#{image1_filename}']")
       expect(page).to have_css("img[src*='#{image2_filename}']")
     end

data/decidim-admin/spec/features/static_pages_spec.rb

@@ -21,8 +21,9 @@ describe "Content pages", type: :feature do
     it "shows the list of all the pages" do
       decidim_pages.each do |decidim_page|
         expect(page).to have_css(
-                          "a[href=\"#{decidim.page_path(decidim_page)}\"]",
-                          text: decidim_page.title[I18n.locale.to_s].upcase)
+          "a[href=\"#{decidim.page_path(decidim_page)}\"]",
+          text: decidim_page.title[I18n.locale.to_s].upcase
+        )
       end
     end
   end
@@ -79,19 +80,19 @@ describe "Content pages", type: :feature do
 
       it "can edit them" do
         within find("tr", text: translated(decidim_page.title)) do
-          page.find('.action-icon.action-icon--edit').click
+          page.find(".action-icon.action-icon--edit").click
         end
 
         within ".edit_static_page" do
           fill_in_i18n(
             :static_page_title,
             "#title-tabs",
-            en: "Not welcomed anymore",
+            en: "Not welcomed anymore"
           )
           fill_in_i18n_editor(
             :static_page_content,
             "#content-tabs",
-            en: "This is the new <strong>content</strong>",
+            en: "This is the new <strong>content</strong>"
           )
           find("*[type=submit]").click
         end
@@ -107,7 +108,7 @@ describe "Content pages", type: :feature do
 
       it "can destroy them" do
         within find("tr", text: translated(decidim_page.title)) do
-          page.find('.action-icon.action-icon--remove').click
+          page.find(".action-icon.action-icon--remove").click
         end
 
         within ".callout-wrapper" do
@@ -121,7 +122,7 @@ describe "Content pages", type: :feature do
 
       it "can visit them" do
         within find("tr", text: translated(decidim_page.title)) do
-          page.find('.action-icon.action-icon--preview').click
+          page.find(".action-icon.action-icon--preview").click
         end
 
         expect(page).to have_content(translated(decidim_page.title))

data/decidim-admin/spec/forms/newsletter_form_spec.rb

@@ -23,8 +23,8 @@ module Decidim
       end
 
       subject do
-        described_class.new(subject: newsletter_subject, body: body).
-          with_context(current_organization: organization)
+        described_class.new(subject: newsletter_subject, body: body)
+                       .with_context(current_organization: organization)
       end
 
       context "when everything is OK" do

data/decidim-admin/spec/forms/organization_form_spec.rb

@@ -27,18 +27,18 @@ module Decidim
         }
       end
       let(:organization) { create(:organization) }
-      let(:homepage_image_path) {
+      let(:homepage_image_path) do
         File.expand_path(
           File.join(File.dirname(__FILE__), "..", "..", "..", "decidim-dev", "spec", "support", "city.jpeg")
         )
-      }
+      end
       let(:attributes) do
         {
           "organization" => {
             "name" => name,
             "reference_prefix" => reference_prefix,
             "default_locale" => :en,
-            "available_locales" => %w{en ca es},
+            "available_locales" => %w(en ca es),
             "welcome_text_en" => welcome_text[:en],
             "welcome_text_es" => welcome_text[:es],
             "welcome_text_ca" => welcome_text[:ca],

data/decidim-admin/spec/forms/participatory_process_form_spec.rb

@@ -35,7 +35,7 @@ module Decidim
         }
       end
       let(:slug) { "slug" }
-      let(:attachement) { test_file("city.jpeg", "image/jpeg") }
+      let(:attachment) { test_file("city.jpeg", "image/jpeg") }
       let(:attributes) do
         {
           "participatory_process" => {
@@ -51,8 +51,8 @@ module Decidim
             "short_description_en" => short_description[:en],
             "short_description_es" => short_description[:es],
             "short_description_ca" => short_description[:ca],
-            "hero_image" => attachement,
-            "banner_image" => attachement,
+            "hero_image" => attachment,
+            "banner_image" => attachment,
             "slug" => slug
           }
         }
@@ -86,7 +86,7 @@ module Decidim
       end
 
       context "when images are not the expected type" do
-        let(:attachement) { test_file("Exampledocument.pdf", "application/pdf") }
+        let(:attachment) { test_file("Exampledocument.pdf", "application/pdf") }
 
         it { is_expected.not_to be_valid }
       end

data/decidim-admin/spec/forms/participatory_process_step_form_spec.rb

@@ -31,7 +31,7 @@ module Decidim
             "description_es" => description[:es],
             "description_ca" => description[:ca],
             "start_date" => start_date,
-            "end_date" => end_date,
+            "end_date" => end_date
           }
         }
       end

data/decidim-admin/spec/forms/participatory_process_user_role_form_spec.rb

@@ -24,7 +24,7 @@ module Decidim
       end
 
       context "when email is missing" do
-        let(:email) { }
+        let(:email) {}
 
         it { is_expected.to be_invalid }
       end

data/decidim-admin/spec/forms/scope_form_spec.rb

@@ -15,7 +15,7 @@ module Decidim
       end
       let(:context) do
         {
-          "current_organization" => organization,
+          "current_organization" => organization
         }
       end
 

data/decidim-admin/spec/helpers/aria_selected_link_to_helper_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "spec_helper"
 
 module Decidim

data/decidim-admin/spec/helpers/feature_settings_helper_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "spec_helper"
 
 module Decidim

data/decidim-admin/spec/jobs/newsletter_delivery_job_spec.rb

@@ -16,9 +16,9 @@ module Decidim
       end
 
       it "increments the delivery count" do
-        expect {
+        expect do
           NewsletterDeliveryJob.perform_now(user, newsletter)
-        }.to change { newsletter.reload.total_deliveries }.by(1)
+        end.to change { newsletter.reload.total_deliveries }.by(1)
       end
     end
   end

data/decidim-admin/spec/queries/process_admins_spec.rb

@@ -3,7 +3,7 @@ require "spec_helper"
 
 describe Decidim::Admin::ProcessAdmins do
   let(:organization) { create :organization }
-  let(:participatory_process) { create :participatory_process, organization: organization}
+  let(:participatory_process) { create :participatory_process, organization: organization }
   let!(:admin) { create(:user, :admin, :confirmed, organization: organization) }
   let!(:participatory_process_admin) do
     user = create(:user, :confirmed, organization: organization)

data/decidim-admin/spec/shared/manage_process_admins_examples.rb

@@ -45,7 +45,7 @@ RSpec.shared_examples "manage process admins examples" do
     it "updates a process admin" do
       within "#process_admins" do
         within find("#process_admins tr", text: other_user.email) do
-          page.find('.action-icon--edit').click
+          page.find(".action-icon--edit").click
         end
       end
 
@@ -66,7 +66,7 @@ RSpec.shared_examples "manage process admins examples" do
 
     it "deletes a participatory_process_user_role" do
       within find("#process_admins tr", text: other_user.email) do
-        page.find('a.action-icon--remove').click
+        page.find("a.action-icon--remove").click
       end
 
       within ".callout-wrapper" do

data/decidim-admin/spec/shared/manage_process_categories_examples.rb

@@ -42,7 +42,7 @@ RSpec.shared_examples "manage process categories examples" do
   it "updates a category" do
     within "#categories" do
       within find("tr", text: translated(category.name)) do
-        page.find('a.action-icon--edit').click
+        page.find("a.action-icon--edit").click
       end
     end
 
@@ -77,7 +77,7 @@ RSpec.shared_examples "manage process categories examples" do
 
       it "deletes a category" do
         within find("tr", text: translated(category2.name)) do
-          page.find('a.action-icon--remove').click
+          page.find("a.action-icon--remove").click
         end
 
         within ".callout-wrapper" do
@@ -99,7 +99,7 @@ RSpec.shared_examples "manage process categories examples" do
 
       it "deletes a category" do
         within find("tr", text: translated(category2.name)) do
-          page.find('a.action-icon--remove').click
+          page.find("a.action-icon--remove").click
         end
 
         within ".callout-wrapper" do

data/decidim-admin/spec/shared/manage_process_steps_examples.rb

@@ -36,9 +36,9 @@ RSpec.shared_examples "manage process steps examples" do
     )
 
     page.execute_script("$('#date_field_participatory_process_step_start_date').focus()")
-    page.find('.datepicker-dropdown .day', text: '12').click
+    page.find(".datepicker-dropdown .day", text: "12").click
     page.execute_script("$('#date_field_participatory_process_step_end_date').focus()")
-    page.find('.datepicker-dropdown .day', text: '22').click
+    page.find(".datepicker-dropdown .day", text: "22").click
 
     within ".new_participatory_process_step" do
       find("*[type=submit]").click
@@ -58,7 +58,7 @@ RSpec.shared_examples "manage process steps examples" do
   it "updates a participatory_process_step" do
     within "#steps" do
       within find("tr", text: translated(process_step.title)) do
-        page.find('.action-icon--edit').click
+        page.find(".action-icon--edit").click
       end
     end
 
@@ -93,7 +93,7 @@ RSpec.shared_examples "manage process steps examples" do
 
     it "deletes a participatory_process_step" do
       within find("tr", text: translated(process_step2.title)) do
-        page.find('.action-icon--remove').click
+        page.find(".action-icon--remove").click
       end
 
       within ".callout-wrapper" do
@@ -109,7 +109,7 @@ RSpec.shared_examples "manage process steps examples" do
   context "activating a step" do
     it "activates a step" do
       within find("tr", text: translated(process_step.title)) do
-        page.find('.action-icon--activate').click
+        page.find(".action-icon--activate").click
       end
 
       within find("tr", text: translated(process_step.title)) do

data/decidim-admin/spec/shared/manage_processes_examples.rb

@@ -7,7 +7,7 @@ RSpec.shared_examples "manage processes examples" do
 
       it "allows the user to preview the unpublished process" do
         within find("tr", text: translated(participatory_process.title)) do
-          page.find('a.action-icon--preview').click
+          page.find("a.action-icon--preview").click
         end
 
         expect(page).to have_css(".process-header")
@@ -20,7 +20,7 @@ RSpec.shared_examples "manage processes examples" do
 
       it "allows the user to preview the unpublished process" do
         within find("tr", text: translated(participatory_process.title)) do
-          page.find('a.action-icon--preview').click
+          page.find("a.action-icon--preview").click
         end
 
         expect(current_path).to eq decidim.participatory_process_path(participatory_process)
@@ -42,7 +42,7 @@ RSpec.shared_examples "manage processes examples" do
     attach_file :participatory_process_banner_image, image3_path
 
     page.execute_script("$('#date_field_participatory_process_end_date').focus()")
-    page.find('.datepicker-dropdown .day', text: '22').click
+    page.find(".datepicker-dropdown .day", text: "22").click
 
     within ".edit_participatory_process" do
       find("*[type=submit]").click
@@ -92,7 +92,7 @@ RSpec.shared_examples "manage processes examples" do
 
       participatory_process.reload
       expect(participatory_process).not_to be_published
-  end
+    end
   end
 
   context "when there are multiple organizations in the system" do

data/decidim-admin/spec/shared/participatory_admin_shared_context.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 RSpec.shared_context "participatory process admin" do
   let(:organization) { create(:organization) }
   let!(:user) { create(:user, :admin, :confirmed, organization: organization) }

data/decidim-admin/spec/spec_helper.rb

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

data/decidim-admin/spec/views/decidim/static_pages/_form.html.erb_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "spec_helper"
 
 module Decidim

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

@@ -3,7 +3,7 @@ module Decidim
   module Api
     # Base controller for `decidim-api`. All other controllers inherit from this.
     class ApplicationController < ::DecidimController
-      skip_before_filter :verify_authenticity_token
+      skip_before_action :verify_authenticity_token
       include NeedsOrganization
     end
   end

data/decidim-api/decidim-api.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |s|
   s.summary     = "API engine for decidim"
   s.description = "API engine for decidim"
 
-  s.files = Dir["{app,config,db,lib,vendor}/**/*", "LICENSE.txt", "Rakefile", "README.md"]
+  s.files = Dir["{app,config,db,lib,vendor}/**/*", "Rakefile", "README.md"]
 
   s.add_dependency "rails", *Decidim.rails_version
   s.add_dependency "graphql", "~> 1.5.3"

data/decidim-api/spec/factories.rb

@@ -1,2 +1,3 @@
+# frozen_string_literal: true
 require "decidim/core/test/factories"
 require "decidim/comments/test/factories"

data/decidim-api/spec/spec_helper.rb

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

data/decidim-budgets/app/queries/decidim/budgets/filtered_projects.rb

@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+module Decidim
+  module Budgets
+    # A class used to find projects filtered by features and a date range
+    class FilteredProjects < Rectify::Query
+      # Syntactic sugar to initialize the class and return the queried objects.
+      #
+      # features - An array of Decidim::Feature
+      # start_at - A date to filter resources created after it
+      # end_at - A date to filter resources created before it.
+      def self.for(features, start_at = nil, end_at = nil)
+        new(features, start_at, end_at).query
+      end
+
+      # Initializes the class.
+      #
+      # features - An array of Decidim::Feature
+      # start_at - A date to filter resources created after it
+      # end_at - A date to filter resources created before it.
+      def initialize(features, start_at = nil, end_at = nil)
+        @features = features
+        @start_at = start_at
+        @end_at = end_at
+      end
+
+      # Finds the Projects scoped to an array of features and filtered
+      # by a range of dates.
+      def query
+        projects = Decidim::Budgets::Project.where(feature: @features)
+        projects = projects.where("created_at >= ?", @start_at) if @start_at.present?
+        projects = projects.where("created_at <= ?", @end_at) if @end_at.present?
+        projects
+      end
+    end
+  end
+end

data/decidim-budgets/config/locales/ca.yml

@@ -112,6 +112,7 @@ ca:
             vote_threshold_percent: Percentatge del pressupost mínim per fer el vot
           step:
             comments_blocked: Comentaris bloquejats
+            show_votes: Mostra vots
             votes_enabled: Suports habilitats
     orders:
       checkout:

data/decidim-budgets/config/locales/en.yml

@@ -119,6 +119,7 @@ en:
             vote_threshold_percent: Vote threshold percent
           step:
             comments_blocked: Comments blocked
+            show_votes: Show votes
             votes_enabled: Votes enabled
     orders:
       checkout:

data/decidim-budgets/config/locales/es.yml

@@ -112,6 +112,7 @@ es:
             vote_threshold_percent: Porcentaje mínimo del presupuesto
           step:
             comments_blocked: Comentarios bloqueados
+            show_votes: Mostrar votos
             votes_enabled: Votos habilitados
     orders:
       checkout:

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

@@ -4,7 +4,7 @@ fr:
       project:
         budget: Budget
         decidim_category_id: Catégorie
-        decidim_scope_id: Champ d'application
+        decidim_scope_id: Domaine d'application
         description: Description
         proposal_ids: Propositions liées
         title: Titre
@@ -15,6 +15,7 @@ fr:
         confirm_destroy: Êtes-vous certain de vouloir supprimer ce projet?
         destroy: Supprimer
         edit: Modifier
+        new: Nouveau
         preview: Aperçu
         title: Actions
       admin:
@@ -29,11 +30,13 @@ fr:
             success: Projet supprimé avec succès
           edit:
             title: Éditer un projet
+            update: Mettre à jour
           index:
             finished_orders: Commandes terminées
             pending_orders: Commandes en attente
             title: Projets
           new:
+            create: Créer
             title: Nouveau résultat
           update:
             invalid: Il y a eu un problème de mise à jour de ce projet
@@ -70,7 +73,7 @@ fr:
         filters:
           category: Catégorie
           category_prompt: Sélectionner une catégorie
-          scopes: Étendues
+          scopes: Domaines d'application
           search: Rechercher
         filters_small_view:
           close_modal: Fermer la vue
@@ -90,8 +93,37 @@ fr:
           count:
             one: 1 soutien
             other: "%{count} soutiens"
+          remove: Supprimer
+        project_budget_button:
+          add: Ajouter
+          added: Ajouté
+        show:
+          budget: Budget
+          view_all_projects: Voir tous les projets
     features:
       budgets:
+        actions:
+          vote: Voter
+        name: Budgets
         settings:
           global:
-            vote_threshold_percent: Pourcentage de seuil de vote
+            comments_enabled: Commentaires activés
+            total_budget: Budget total
+            vote_threshold_percent: Pourcentage de seuil de vote
+          step:
+            comments_blocked: Commentaires bloqués
+            show_votes: Afficher les votes
+            votes_enabled: Votes activés
+    orders:
+      checkout:
+        error: Une erreur s'est produite lors du traitement de votre vote
+        success: Votre vote a été enregistré avec succès
+      destroy:
+        error: Une erreur s'est produite lors de l'annulation de votre vote
+        success: Votre vote a été annulé avec succès
+    resource_links:
+      included_proposals:
+        project_proposals: 'Propositions incluses dans ce projet:'
+  index:
+    confirmed_orders_count: Nombre de votes comptés
+  total_budget: Budget total