decidim 0.4.3 → 0.4.4

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

@@ -133,6 +133,8 @@ fr:
         edit:
           title: Modifier le document lié
           update: Mettre à jour
+        index:
+          attachments_title: Pièces jointes
         new:
           create: Lier un document
           title: Nouveau document lié
@@ -149,6 +151,8 @@ fr:
         edit:
           title: Modifier la catégorie
           update: Mettre à jour
+        index:
+          categories_title: Catégories
         new:
           create: Créer une catégorie
           title: Nouvelle catégorie
@@ -158,20 +162,6 @@ fr:
       dashboard:
         show:
           welcome: Bienvenue dans le nouveau panneau d’administration Decidim.
-      decidim:
-        admin:
-          attachments:
-            index:
-              attachments_title: Pièces jointes
-          categories:
-            index:
-              categories_title: Catégories
-          participatory_process_steps:
-            index:
-              steps_title: Etapes
-          participatory_process_user_roles:
-            index:
-              process_admins_title: Administrateurs du processus participatifs
       feature_permissions:
         edit:
           everyone: Tout le monde
@@ -377,6 +367,8 @@ fr:
         edit:
           title: Modifier l'étape du processus participatif
           update: Mettre à jour
+        index:
+          steps_title: Etapes
         new:
           create: Créer
           title: Nouvelle étape du processus participatif
@@ -394,6 +386,8 @@ fr:
         edit:
           title: Mettre à jour l'utilisateur du processus participatif.
           update: Mettre à jour
+        index:
+          process_admins_title: Administrateurs du processus participatifs
         new:
           create: Créer
           title: Nouvel utilisateur de processus participatif.
@@ -516,4 +510,4 @@ fr:
   time:
     formats:
       datepicker: "%m / %j / %A"
-      timepicker: "%d/%m/%Y %H:%M"
+      timepicker: "%d/%m/%Y %H:%M"

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

@@ -111,6 +111,8 @@ it:
         edit:
           title: Modifica allegato
           update: Aggiorna
+        index:
+          attachments_title: Allegati
         new:
           create: Crea allegato
           title: Nuovo allegato
@@ -127,6 +129,8 @@ it:
         edit:
           title: Modifica categoria
           update: Aggiorna
+        index:
+          categories_title: Categorie
         new:
           create: Crea nuova categoria
           title: Nuova categoria
@@ -136,20 +140,6 @@ it:
       dashboard:
         show:
           welcome: Benvenuto nel nuovo pannello di amministarzione.
-      decidim:
-        admin:
-          attachments:
-            index:
-              attachments_title: Allegati
-          categories:
-            index:
-              categories_title: Categorie
-          participatory_process_steps:
-            index:
-              steps_title: Fasi
-          participatory_process_user_roles:
-            index:
-              process_admins_title: Utenti del processo partecipativo.
       exports:
         export_as: "%{name} esporta come %{export_format}"
         notice: Export in fase di elaborazione.  Riceverai un'email quando l'export sarà terminato.
@@ -347,6 +337,8 @@ it:
         edit:
           title: Modifica una fase del processo partecipativo.
           update: Aggiorna
+        index:
+          steps_title: Fasi
         new:
           create: Crea
           title: Nuova fase del processo partecipativo.
@@ -364,6 +356,8 @@ it:
         edit:
           title: Aggiornamento utente di un processo partecipativo.
           update: Aggiorna
+        index:
+          process_admins_title: Utenti del processo partecipativo.
         new:
           create: Crea
           title: Nuovo utente per un processo partecipativo.
@@ -482,4 +476,4 @@ it:
         settings:
           title: Impostazioni
         users:
-          title: Utenti
+          title: Utenti

data/decidim-admin/config/routes.rb

@@ -23,6 +23,15 @@ Decidim::Admin::Engine.routes.draw do
       end
       resources :attachments, controller: "participatory_process_attachments"
 
+      resources :moderations do
+        member do
+          put :unreport
+          put :hide
+        end
+      end
+    end
+
+    scope "/participatory_processes/:participatory_process_id" do
       resources :features do
         resource :permissions, controller: "feature_permissions"
         member do
@@ -31,13 +40,6 @@ Decidim::Admin::Engine.routes.draw do
         end
         resources :exports, only: :create
       end
-
-      resources :moderations do
-        member do
-          put :unreport
-          put :hide
-        end
-      end
     end
 
     scope "/participatory_processes/:participatory_process_id/features/:feature_id/manage" do

data/decidim-admin/spec/commands/copy_participatory_process_spec.rb

@@ -89,10 +89,10 @@ describe Decidim::Admin::CopyParticipatoryProcess do
     end
   end
 
-  context "when copy_steps exists" do
+  context "when copy_categories exists" do
     let(:copy_categories) { true }
 
-    it "duplicates a participatory process and the steps" do
+    it "duplicates a participatory process and the categories" do
       expect { subject.call }.to change { Decidim::Category.count }.by(1)
       expect(Decidim::Category.pluck(:decidim_participatory_process_id).uniq.count).to eq 2
 
@@ -105,10 +105,10 @@ describe Decidim::Admin::CopyParticipatoryProcess do
     end
   end
 
-  context "when copy_steps exists" do
+  context "when copy_features exists" do
     let(:copy_features) { true }
 
-    it "duplicates a participatory process and the steps" do
+    it "duplicates a participatory process and the features" do
       dummy_hook = proc {}
       feature.manifest.on :copy, &dummy_hook
       expect(dummy_hook).to receive(:call).with(new_feature: an_instance_of(Decidim::Feature), old_feature: feature)

data/decidim-admin/spec/controllers/exports_controller_spec.rb

@@ -5,6 +5,8 @@ require "spec_helper"
 module Decidim
   module Admin
     describe ExportsController, type: :controller do
+      routes { Decidim::Admin::Engine.routes }
+
       let!(:organization) { create(:organization) }
       let!(:participatory_process) { create :participatory_process, organization: organization }
       let!(:user) { create(:user, :admin, :confirmed, organization: organization) }

data/decidim-admin/spec/controllers/participatory_processes_controller_spec.rb

@@ -5,6 +5,8 @@ require "spec_helper"
 module Decidim
   module Admin
     describe ParticipatoryProcessesController, type: :controller do
+      routes { Decidim::Admin::Engine.routes }
+
       let(:organization) { create(:organization) }
       let(:user) { create(:user, :admin, :confirmed, organization: organization) }
 

data/decidim-admin/spec/controllers/static_pages_controller_spec.rb

@@ -5,6 +5,8 @@ require "spec_helper"
 module Decidim
   module Admin
     describe StaticPagesController, type: :controller do
+      routes { Decidim::Admin::Engine.routes }
+
       let(:organization) { create :organization }
       let(:user) { create(:user, :admin, :confirmed, organization: organization) }
 

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

@@ -2,8 +2,9 @@
 
 require "spec_helper"
 
-describe "Admin copy participatory process", type: :feature do
-  include_context "participatory process admin"
+describe "Admin copies participatory process", type: :feature do
+  include_context "participatory process administration by admin"
+
   let!(:participatory_process) { create(:participatory_process, :with_steps, organization: organization) }
   let!(:feature) { create :feature, manifest_name: :dummy, participatory_process: participatory_process }
   let!(:category) do

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

@@ -17,7 +17,7 @@ describe "manage a feature's permissions", type: :feature do
   before do
     switch_to_host(organization.host)
     login_as user, scope: :user
-    visit decidim_admin.participatory_process_features_path(participatory_process)
+    visit decidim_admin.features_path(participatory_process)
 
     within ".feature-#{feature.id}" do
       page.find(".action-icon--permissions").click

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

@@ -17,7 +17,7 @@ describe "Admin manages features", type: :feature do
 
   describe "add a feature" do
     before do
-      visit decidim_admin.participatory_process_features_path(participatory_process)
+      visit decidim_admin.features_path(participatory_process)
     end
 
     it "adds a feature" do
@@ -81,7 +81,7 @@ describe "Admin manages features", type: :feature do
     end
 
     before do
-      visit decidim_admin.participatory_process_features_path(participatory_process)
+      visit decidim_admin.features_path(participatory_process)
     end
 
     it "updates the feature" do
@@ -175,7 +175,7 @@ describe "Admin manages features", type: :feature do
     end
 
     before do
-      visit decidim_admin.participatory_process_features_path(participatory_process)
+      visit decidim_admin.features_path(participatory_process)
     end
 
     it "removes the feature" do
@@ -195,7 +195,7 @@ describe "Admin manages features", type: :feature do
     let(:published_at) { nil }
 
     before do
-      visit decidim_admin.participatory_process_features_path(participatory_process)
+      visit decidim_admin.features_path(participatory_process)
     end
 
     context "when the feature is unpublished" do

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

@@ -3,6 +3,7 @@
 require "spec_helper"
 
 describe "Admin manages participatory process admins", type: :feature do
-  include_context "participatory process admin"
+  include_context "participatory process administration by admin"
+
   it_behaves_like "manage process admins examples"
 end

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

@@ -3,6 +3,7 @@
 require "spec_helper"
 
 describe "Admin manages participatory process attachments", type: :feature do
-  include_context "participatory process admin"
+  include_context "participatory process administration by admin"
+
   it_behaves_like "manage process attachments examples"
 end

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

@@ -3,7 +3,7 @@
 require "spec_helper"
 
 describe "Admin manages participatory process categories", type: :feature do
-  include_context "participatory process admin"
+  include_context "participatory process administration by admin"
 
   let!(:category) do
     create(

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

@@ -3,8 +3,8 @@
 
 require "spec_helper"
 
-describe "Admin manage participatory process groups", type: :feature do
-  include_context "participatory process admin"
+describe "Admin manages participatory process groups", type: :feature do
+  include_context "participatory process administration by admin"
 
   before do
     switch_to_host(organization.host)

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

@@ -3,6 +3,7 @@
 require "spec_helper"
 
 describe "Admin manages participatory process steps", type: :feature do
-  include_context "participatory process admin"
+  include_context "participatory process administration by admin"
+
   it_behaves_like "manage process steps examples"
 end

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

@@ -3,8 +3,8 @@
 
 require "spec_helper"
 
-describe "Admin manage participatory processes", type: :feature do
-  include_context "participatory process admin"
+describe "Admin manages participatory processes", type: :feature do
+  include_context "participatory process administration by admin"
   it_behaves_like "manage processes examples"
 
   before do
@@ -14,7 +14,7 @@ describe "Admin manage participatory processes", type: :feature do
     visit decidim_admin.participatory_processes_path
   end
 
-  it "creates a new participatory_process" do
+  it "creates a new participatory process" do
     within ".secondary-nav__actions" do
       page.find("a.button").click
     end

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

@@ -3,8 +3,9 @@
 
 require "spec_helper"
 
-describe "Admin manage user groups", type: :feature do
-  include_context "participatory process admin"
+describe "Admin manages user groups", type: :feature do
+  include_context "participatory process administration by admin"
+
   let!(:user_groups) { create_list(:user_group, 10, users: [create(:user, organization: organization)]) }
 
   before do

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

@@ -3,8 +3,7 @@
 require "spec_helper"
 
 describe "Participatory process admin manages participatory process admins", type: :feature do
-  include_context "participatory process admin"
-  let(:user) { process_admin }
+  include_context "participatory process administration by process admin"
 
   it_behaves_like "manage process admins examples"
 

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

@@ -3,9 +3,7 @@
 require "spec_helper"
 
 describe "Participatory process admin manages participatory process attachments", type: :feature do
-  include_context "participatory process admin"
-
-  let(:user) { process_admin }
+  include_context "participatory process administration by process admin"
 
   it_behaves_like "manage process attachments examples"
 end

data/decidim-admin/spec/features/{process_admin_manages_participatory_process_categories_spec.rb → participatory_process_admin_manages_participatory_process_categories_spec.rb}

@@ -2,10 +2,8 @@
 
 require "spec_helper"
 
-describe "Admin manages participatory process categories", type: :feature do
-  include_context "participatory process admin"
-
-  let(:user) { process_admin }
+describe "Participatory process admin manages participatory process categories", type: :feature do
+  include_context "participatory process administration by process admin"
 
   let!(:category) do
     create(

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

@@ -3,8 +3,7 @@
 require "spec_helper"
 
 describe "Participatory process admin manages participatory process steps", type: :feature do
-  include_context "participatory process admin"
+  include_context "participatory process administration by process admin"
 
-  let(:user) { process_admin }
   it_behaves_like "manage process steps examples"
 end

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

@@ -3,8 +3,8 @@
 require "spec_helper"
 
 describe "Participatory process admin manages participatory processes", type: :feature do
-  include_context "participatory process admin"
-  let(:user) { process_admin }
+  include_context "participatory process administration by process admin"
+
   it_behaves_like "manage processes examples"
 
   before do

data/decidim-admin/spec/helpers/{feature_settings_helper_spec.rb → settings_helper_spec.rb}

@@ -4,7 +4,7 @@ require "spec_helper"
 
 module Decidim
   module Admin
-    describe FeatureSettingsHelper do
+    describe SettingsHelper do
       let(:options) { double }
       let(:attribute) { double(type: type) }
       let(:type) { :boolean }

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

@@ -3,6 +3,14 @@
 RSpec.shared_examples "manage process admins examples" do
   let(:other_user) { create :user, organization: organization, email: "my_email@example.org" }
 
+  let!(:process_admin) do
+    create :user,
+           :process_admin,
+           :confirmed,
+           organization: organization,
+           participatory_process: participatory_process
+  end
+
   before do
     switch_to_host(organization.host)
     login_as user, scope: :user
@@ -10,7 +18,7 @@ RSpec.shared_examples "manage process admins examples" do
     click_link "Process users"
   end
 
-  it "process admins" do
+  it "shows process admin list" do
     within "#process_admins table" do
       expect(page).to have_content(process_admin.email)
     end