decidim 0.3.2 → 0.4.0

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

@@ -111,9 +111,6 @@ it:
         edit:
           title: Modifica allegato
           update: Aggiorna
-        form:
-          current_file: File corrente
-          url: URL
         new:
           create: Crea allegato
           title: Nuovo allegato
@@ -381,9 +378,7 @@ it:
         edit:
           update: Aggiorna
         form:
-          current_image: Immagine corrente
           title: Informazioni generali
-          url: URL
         index:
           not_published: Non pubblicato
           published: Pubblicato

data/decidim-admin/config/routes.rb

@@ -16,7 +16,11 @@ Decidim::Admin::Engine.routes.draw do
           post :ordering, to: "participatory_process_step_ordering#create"
         end
       end
-      resources :user_roles, controller: "participatory_process_user_roles"
+      resources :user_roles, controller: "participatory_process_user_roles" do
+        member do
+          post :resend_invitation, to: "participatory_process_user_roles#resend_invitation"
+        end
+      end
       resources :attachments, controller: "participatory_process_attachments"
 
       resources :features do
@@ -44,8 +48,6 @@ Decidim::Admin::Engine.routes.draw do
           mount manifest.admin_engine, at: "/", as: "decidim_admin_#{manifest.name}"
         end
       end
-
-      get "/", to: redirect("/404"), as: :manage_feature
     end
 
     resources :static_pages

data/decidim-admin/decidim-admin.gemspec

@@ -9,8 +9,8 @@ require_relative "../decidim-core/lib/decidim/core/version"
 Gem::Specification.new do |s|
   Decidim.add_default_gemspec_properties(s)
 
-  s.name        = "decidim-admin"
-  s.summary     = "Organization administration"
+  s.name = "decidim-admin"
+  s.summary = "Organization administration"
   s.description = "Organization administration to manage a single organization."
   s.files = Dir["{app,config,db,lib,vendor}/**/*", "Rakefile", "README.md"]
 

data/decidim-admin/lib/decidim/admin/test/manage_attachments_examples.rb

@@ -25,8 +25,7 @@ RSpec.shared_examples "manage attachments examples" do
 
     expect(page).to have_selector("input#attachment_title_en[value='#{translated(attachment.title, locale: :en)}']")
     expect(page).to have_selector("input#attachment_description_en[value='#{translated(attachment.description, locale: :en)}']")
-    expect(page).to have_content(attachment.file.url)
-    expect(page).to have_css("img[src~='#{attachment.thumbnail_url}']")
+    expect(page).to have_css("img[src~='#{attachment.url}']")
   end
 
   it "can add attachments to a process" do

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

@@ -21,7 +21,7 @@ describe Decidim::Admin::CreateParticipatoryProcessAdmin do
 
   subject { described_class.new(form, current_user, my_process) }
 
-  context "when to form is not valid" do
+  context "when the form is not valid" do
     let(:invalid) { true }
 
     it "is not valid" do
@@ -29,41 +29,57 @@ describe Decidim::Admin::CreateParticipatoryProcessAdmin do
     end
   end
 
-  context "when there is no user with the given email" do
-    let(:email) { "does_not_exist@example.com" }
+  context "when everything is ok" do
+    it "creates the user role" do
+      subject.call
+      roles = Decidim::Admin::ParticipatoryProcessUserRole.where(user: user)
 
-    it "creates a new user with said email" do
+      expect(roles.count).to eq 1
+      expect(roles.first.role).to eq "admin"
+    end
+
+    it "creates a new user with no application admin privileges" do
       subject.call
-      expect(Decidim::User.last.email).to eq(email)
+      expect(Decidim::User.last.roles).not_to include("admin")
     end
-  end
 
-  context "when a user and a role already exist" do
-    before do
-      create(
-        :participatory_process_user_role,
-        user: user,
-        role: :admin,
-        participatory_process: my_process
-      )
+    context "when there is no user with the given email" do
+      let(:email) { "does_not_exist@example.com" }
+
+      it "creates a new user with said email" do
+        subject.call
+        expect(Decidim::User.last.email).to eq(email)
+      end
+
+      it "creates a new user with no application admin privileges" do
+        subject.call
+        expect(Decidim::User.last.roles).not_to include("admin")
+      end
     end
 
-    it "is not valid" do
-      form_errors = double
-      expect(form_errors).to receive(:add).with(:email, :taken)
-      expect(form).to receive(:errors).and_return(form_errors)
+    context "when a user and a role already exist" do
+      before do
+        subject.call
+      end
 
-      expect { subject.call }.to broadcast(:invalid)
+      it "doesn't get created twice" do
+        expect { subject.call }.to broadcast(:ok)
+
+        roles = Decidim::Admin::ParticipatoryProcessUserRole.where(user: user)
+
+        expect(roles.count).to eq 1
+        expect(roles.first.role).to eq "admin"
+      end
     end
-  end
 
-  context "when everything is ok" do
-    it "creates the user role" do
-      subject.call
-      roles = Decidim::Admin::ParticipatoryProcessUserRole.where(user: user)
+    context "when the user hasn't accepted the invitation" do
+      before do
+        user.invite!
+      end
 
-      expect(roles.count).to eq 1
-      expect(roles.first.role).to eq "admin"
+      it "gets the invitation resent" do
+        expect { subject.call }.to have_enqueued_job(ActionMailer::DeliveryJob)
+      end
     end
   end
 end

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

@@ -82,10 +82,11 @@ describe Decidim::Admin::CreateParticipatoryProcess do
       expect { subject.call }.to broadcast(:ok)
     end
 
-    it "adds the default step" do
+    it "adds the default active step" do
       subject.call do
         on(:ok) do |process|
           expect(process.steps.count).to eq(1)
+          expect(process.steps.first).to be_active
         end
       end
     end

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

@@ -0,0 +1,56 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+describe Decidim::Admin::CreateParticipatoryProcessStep do
+  let(:participatory_process) { create :participatory_process }
+  let(:form) do
+    instance_double(
+      Decidim::Admin::ParticipatoryProcessStepForm,
+      title: { en: "title" },
+      description: { en: "description" },
+      start_date: Time.current,
+      end_date: Time.current + 1.week,
+      invalid?: invalid
+    )
+  end
+  let(:invalid) { false }
+
+  subject { described_class.new(form, participatory_process) }
+
+  context "when the form is not valid" do
+    let(:invalid) { true }
+
+    it "broadcasts invalid" do
+      expect { subject.call }.to broadcast(:invalid)
+    end
+  end
+
+  context "when everything is ok" do
+    it "creates a participatory process step" do
+      expect { subject.call }.to change { Decidim::ParticipatoryProcessStep.count }.by(1)
+    end
+
+    it "broadcasts ok" do
+      expect { subject.call }.to broadcast(:ok)
+    end
+
+    context "when the process has no active steps" do
+      it "creates the step as active" do
+        subject.call
+        expect(Decidim::ParticipatoryProcessStep.last).to be_active
+      end
+    end
+
+    context "when the process has active steps" do
+      before do
+        create(:participatory_process_step, participatory_process: participatory_process, active: true)
+      end
+
+      it "creates the step as active" do
+        subject.call
+        expect(Decidim::ParticipatoryProcessStep.last).not_to be_active
+      end
+    end
+  end
+end

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

@@ -52,8 +52,8 @@ describe Decidim::Admin::DestroyParticipatoryProcessStep, class: true do
   end
 
   context "when trying to destroy the last step" do
-    it "broadcasts invalid" do
-      expect { subject.call(active_step) }.to broadcast(:invalid, :last_step)
+    it "broadcasts ok" do
+      expect { subject.call(active_step) }.to broadcast(:ok)
     end
   end
 end

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

@@ -25,6 +25,12 @@ module Decidim
             dummy_global_attribute_1: true,
             dummy_global_attribute_2: false
           },
+          default_step_settings: {
+            step.id.to_s => {
+              dummy_step_attribute_1: true,
+              dummy_step_attribute_2: false
+            }
+          },
           step_settings: {
             step.id.to_s => {
               dummy_step_attribute_1: true,

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

@@ -6,19 +6,16 @@ module Decidim
   module Admin
     describe ParticipatoryProcessesController, type: :controller do
       let(:organization) { create(:organization) }
-      let!(:external_process) { create :participatory_process }
+      let(:user) { create(:user, :admin, :confirmed, organization: organization) }
 
       before do
         @request.env["decidim.current_organization"] = organization
+        sign_in user, scope: :user
       end
 
       describe "GET show" do
         context "process in another organization" do
-          let(:user) { create(:user, :admin, :confirmed, organization: organization) }
-
-          before do
-            sign_in user, scope: :user
-          end
+          let!(:external_process) { create :participatory_process }
 
           it "is not visible to the user" do
             expect do

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

@@ -25,13 +25,13 @@ describe "Admin copy participatory process", type: :feature do
 
       within ".copy_participatory_process" do
         fill_in_i18n(
-          :participatory_process_copy_title,
-          "#participatory_process_copy-title-tabs",
+          :participatory_process_title,
+          "#participatory_process-title-tabs",
           en: "Copy participatory process",
           es: "Copia del proceso participativo",
           ca: "Còpia del procés participatiu"
         )
-        fill_in :participatory_process_copy_slug, with: "pp-copy"
+        fill_in :participatory_process_slug, with: "pp-copy"
         click_button "Copy"
       end
 
@@ -47,18 +47,18 @@ describe "Admin copy participatory process", type: :feature do
 
       within ".copy_participatory_process" do
         fill_in_i18n(
-          :participatory_process_copy_title,
-          "#participatory_process_copy-title-tabs",
+          :participatory_process_title,
+          "#participatory_process-title-tabs",
           en: "Copy participatory process",
           es: "Copia del proceso participativo",
           ca: "Còpia del procés participatiu"
         )
-        fill_in :participatory_process_copy_slug, with: "pp-copy-with-steps"
+        fill_in :participatory_process_slug, with: "pp-copy-with-steps"
       end
     end
 
     it "copies the process with steps" do
-      page.check("participatory_process_copy[copy_steps]")
+      page.check("participatory_process[copy_steps]")
       click_button "Copy"
 
       expect(page).to have_content("successfully")
@@ -74,7 +74,7 @@ describe "Admin copy participatory process", type: :feature do
     end
 
     it "copies the process with categories" do
-      page.check("participatory_process_copy[copy_categories]")
+      page.check("participatory_process[copy_categories]")
       click_button "Copy"
 
       expect(page).to have_content("successfully")
@@ -90,7 +90,7 @@ describe "Admin copy participatory process", type: :feature do
     end
 
     it "copies the process with features" do
-      page.check("participatory_process_copy[copy_features]")
+      page.check("participatory_process[copy_features]")
       click_button "Copy"
 
       expect(page).to have_content("successfully")

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

@@ -127,6 +127,38 @@ describe "Admin manages features", type: :feature do
         expect(all("input[type=checkbox]").first).to be_checked
       end
     end
+
+    context "when the process doesn't have active steps" do
+      let!(:participatory_process) do
+        create(:participatory_process, organization: organization)
+      end
+
+      it "updates the default step settings" do
+        within ".feature-#{feature.id}" do
+          page.find(".action-icon--configure").click
+        end
+
+        within ".edit_feature" do
+          within ".default-step-settings" do
+            all("input[type=checkbox]").first.click
+          end
+
+          find("*[type=submit]").click
+        end
+
+        within ".callout-wrapper" do
+          expect(page).to have_content("successfully")
+        end
+
+        within find("tr", text: "My feature") do
+          page.find(".action-icon--configure").click
+        end
+
+        within ".default-step-settings" do
+          expect(all("input[type=checkbox]").first).to be_checked
+        end
+      end
+    end
   end
 
   describe "remove a feature" do

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

@@ -65,10 +65,9 @@ describe "Admin manage participatory processes", type: :feature do
     end
 
     within ".container" do
-      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}']")
+      expect(current_path).to eq decidim_admin.participatory_process_steps_path(Decidim::ParticipatoryProcess.last)
+      expect(page).to have_content("STEPS")
+      expect(page).to have_content("Introduction")
     end
   end
 

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

@@ -69,6 +69,18 @@ module Decidim
         it { is_expected.to be_invalid }
       end
 
+      context "when slug is invalid" do
+        let(:slug) { "#Slug.Invalid!" }
+
+        it { is_expected.to be_invalid }
+      end
+
+      context "when slug is not downcase" do
+        let(:slug) { "SLUG" }
+
+        it { is_expected.to be_valid }
+      end
+
       context "when slug is not unique" do
         before do
           create(:static_page, organization: organization, slug: slug)

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

@@ -7,9 +7,12 @@ module Decidim
     describe NewsletterJob do
       let!(:newsletter) { create(:newsletter, organization: organization, total_deliveries: 0) }
       let!(:organization) { create(:organization) }
+      let!(:another_organization) { create(:organization) }
       let!(:deliverable_user) { create(:user, :confirmed, newsletter_notifications: true, organization: organization) }
+      let!(:another_deliverable_user) { create(:user, :confirmed, newsletter_notifications: true, organization: another_organization) }
       let!(:undeliverable_user) { create(:user, newsletter_notifications: true, organization: organization) }
       let!(:non_deliverable_user) { create(:user, :confirmed, newsletter_notifications: false, organization: organization) }
+      let!(:deleted_user) { create(:user, :confirmed, :deleted, newsletter_notifications: true, organization: organization) }
 
       it "delivers a newsletter to a the eligible users" do
         expect(NewsletterDeliveryJob).to receive(:perform_later).with(deliverable_user, newsletter)

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

@@ -78,5 +78,27 @@ RSpec.shared_examples "manage process admins examples" do
         expect(page).not_to have_content(other_user.email)
       end
     end
+
+    context "when the user has not accepted the invitation" do
+      before do
+        form = Decidim::Admin::ParticipatoryProcessUserRoleForm.from_params(name: "test",
+                                                                            email: "test@example.org",
+                                                                            role: "admin")
+        Decidim::Admin::CreateParticipatoryProcessAdmin.call(form, user, participatory_process)
+        visit current_path
+      end
+
+      it "resends the invitation to the user" do
+        within "#process_admins" do
+          within find("#process_admins tr", text: "test@example.org") do
+            page.find(".action-icon.resend-invitation").click
+          end
+        end
+
+        within ".callout-wrapper" do
+          expect(page).to have_content("successfully")
+        end
+      end
+    end
   end
 end