decidim 0.0.6 → 0.0.7

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

@@ -40,7 +40,6 @@ fi:
         participatory_scope: Osallistumiskonteksti
         participatory_structure: Osallistumisen rakenne
         promoted: Korostettu
-        scope: Konteksti
         short_description: Lyhyt kuvaus
         slug: URL-tunniste
         subtitle: Alaotsikko
@@ -96,7 +95,6 @@ fi:
         activate: Aktivoi
         configure: Asetukset
         confirm_destroy: Haluatko varmasti poistaa tämän?
-        create: Luo
         destroy: Tuhoa
         edit: Muokkaa
         manage: Hallitse
@@ -105,7 +103,6 @@ fi:
         preview: Esikatsele
         publish: Julkaise
         resend_invitation: Lähetä kutsu uudelleen
-        title: Toiminnot
         unpublish: Lopeta julkaisu
         verify: Vahvista
       attachments:
@@ -149,11 +146,7 @@ fi:
               categories_title: Kategoriat
           participatory_process_steps:
             index:
-              steps_hint: Voit vetää taulukon rivejä järjestääksesi prosessin vaiheet uuteen järjestykseen.
               steps_title: Vaihe
-          participatory_process_user_roles:
-            index:
-              process_admins_title: Osallistumisprosessin hallinnoijat
       feature_permissions:
         edit:
           everyone: Kaikki
@@ -194,22 +187,17 @@ fi:
       menu:
         dashboard: Hallintapaneeli
         newsletters: Uutiskirjeet
-        participatory_process_groups: Osallistumisprosessien ryhmät
-        participatory_processes: Osallistumisprosessit
         participatory_processes_submenu:
           attachments: Liitteet
           categories: Kategoriat
           features: Ominaisuudet
           info: Tiedot
           moderations: Moderointi
-          process_admins: Prosessin hallinnoijat
-          settings: Asetukset
           steps: Vaiheet
         scopes: Kontekstit
         settings: Asetukset
         static_pages: Sivut
         user_groups: Käyttäjäryhmät
-        users: Hallinnointikäyttäjät
       models:
         attachment:
           fields:
@@ -237,10 +225,8 @@ fi:
         participatory_process_group:
           fields:
             name: Nimi
-          name: Osallistumisprosessin ryhmä
         participatory_process_step:
           fields:
-            active: Aktivoi
             end_date: Lopetusaika
             start_date: Aloitusaika
             title: Otsikko
@@ -252,12 +238,10 @@ fi:
           fields:
             created_at: Luonnin ajankohta
             name: Nimi
-          name: Konteksti
         static_page:
           fields:
             created_at: Luonnin ajankohta
             title: Otsikko
-          name: Sivu
         user:
           fields:
             created_at: Luontipäivämäärä
@@ -274,9 +258,6 @@ fi:
             name: Nimi
             phone: Puhelinnumero
             users_count: Käyttäjämäärä
-      moderations:
-        index:
-          title: Otsikko
       newsletters:
         create:
           error: Tämän uutiskirjeen luonnissa tapahtui virhe.
@@ -320,7 +301,6 @@ fi:
           update: Päivitä
         new:
           create: Luo
-          name: Nimi
         update:
           error: Tämän osallistumisprosessien ryhmän päivityksessä tapahtui virhe.
           success: Osallistumisprosessien ryhmä päivitetty onnistuneesti.
@@ -356,12 +336,6 @@ fi:
         update:
           error: Tämän osallistumisprosessin vaiheen päivityksessä tapahtui virhe.
           success: Osallistumisprosessin vaihe päivitetty onnistuneesti.
-      participatory_process_user_roles:
-        create:
-          error: Tämän osallistumisprosessin hallinnointikäyttäjän lisäyksessä tapahtui virhe.
-          success: Hallinnointikäyttäjä lisätty onnistuneesti tälle osallistumisprosessille.
-        destroy:
-          success: Tämän osallistumisprosessin hallinnointikäyttäjä tuhottu onnistuneesti.
       participatory_processes:
         create:
           error: Uuden osallistumisprosessin luonnissa tapahtui virhe.
@@ -370,9 +344,6 @@ fi:
           success: Osallistumisprosessi tuhottu onnistuneesti.
         edit:
           update: Päivitä osallistumisprosessia
-        new:
-          create: Luo osallistumisprosessi
-          title: Uusi osallistumisprosessi
         update:
           error: Tämän osallistumisprosessin päivityksessä tapahtui virhe.
           success: Osallistumisprosessi päivitetty onnistuneesti.

data/decidim-admin/config/routes.rb

@@ -14,7 +14,7 @@ Decidim::Admin::Engine.routes.draw do
           post :ordering, to: "participatory_process_step_ordering#create"
         end
       end
-      resources :user_roles, controller: "participatory_process_user_roles", only: [:destroy, :create, :index]
+      resources :user_roles, controller: "participatory_process_user_roles"
       resources :attachments, controller: "participatory_process_attachments"
 
       resources :features do

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

@@ -22,16 +22,16 @@ RSpec.shared_examples "manage attachments examples" do
       click_link translated(attachment.title, locale: :en)
     end
 
-    expect(page).to have_content(stripped(translated(attachment.title, locale: :en)))
-    expect(page).to have_content(stripped(translated(attachment.description, locale: :en)))
-    expect(page).to have_content(attachment.file_type)
+    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}']")
   end
 
   it "can add attachments to a process" do
-    find("#attachments .actions .new").click
+    find(".card-title a.new").click
 
-    within ".new_attachment" do
+    within ".new_participatory_process_attachment" do
       fill_in_i18n(
         :attachment_title,
         "#title-tabs",
@@ -52,7 +52,7 @@ RSpec.shared_examples "manage attachments examples" do
       find("*[type=submit]").click
     end
 
-    within ".flash" do
+    within ".callout-wrapper" do
       expect(page).to have_content("successfully")
     end
 
@@ -63,10 +63,10 @@ RSpec.shared_examples "manage attachments examples" do
 
   it "can delete an attachment from a process" do
     within find("tr", text: stripped(translated(attachment.title))) do
-      click_link "Destroy"
+      page.find('a.action-icon--remove').click
     end
 
-    within ".flash" do
+    within ".callout-wrapper" do
       expect(page).to have_content("successfully")
     end
 
@@ -76,11 +76,11 @@ RSpec.shared_examples "manage attachments examples" do
   it "can update an attachment" do
     within "#attachments" do
       within find("tr", text: stripped(translated(attachment.title))) do
-        click_link "Edit"
+        page.find('a.action-icon--edit').click
       end
     end
 
-    within ".edit_attachment" do
+    within ".edit_participatory_process_attachment" do
       fill_in_i18n(
         :attachment_title,
         "#title-tabs",
@@ -92,7 +92,7 @@ RSpec.shared_examples "manage attachments examples" do
       find("*[type=submit]").click
     end
 
-    within ".flash" do
+    within ".callout-wrapper" do
       expect(page).to have_content("successfully")
     end
 

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

@@ -13,12 +13,15 @@ module Decidim
         end
 
         let!(:deliverable_users) do
-          create_list(:user, 5, organization: organization, newsletter_notifications: true)
+          create_list(:user, 5, :confirmed, organization: organization, newsletter_notifications: true)
         end
 
         let!(:not_deliverable_users) do
           create_list(:user, 3, organization: organization, newsletter_notifications: false)
         end
+        let!(:unconfirmed_users) do
+          create_list(:user, 3, organization: organization, newsletter_notifications: true)
+        end
 
         let(:command) { described_class.new(newsletter) }
 

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

@@ -0,0 +1,117 @@
+# -*- coding: utf-8 -*-
+# frozen_string_literal: true
+require "spec_helper"
+
+module Decidim
+  module Admin
+    describe UpdateParticipatoryProcess, :db do
+      describe "call" do
+        let(:my_process) { create :participatory_process }
+        let(:params) do
+          {
+            participatory_process: {
+              id: my_process.id,
+              title_en: 'Foo title',
+              title_ca: 'Foo title',
+              title_es: 'Foo title',
+              subtitle_en: my_process.subtitle,
+              subtitle_ca: my_process.subtitle,
+              subtitle_es: my_process.subtitle,
+              slug: my_process.slug,
+              hashtag: my_process.hashtag,
+              meta_scope: my_process.meta_scope,
+              hero_image: nil,
+              banner_image: nil,
+              promoted: my_process.promoted,
+              description_en: my_process.description,
+              description_ca: my_process.description,
+              description_es: my_process.description,
+              short_description_en: my_process.short_description,
+              short_description_ca: my_process.short_description,
+              short_description_es: my_process.short_description,
+              current_organization: my_process.organization,
+              scope: my_process.scope,
+              errors: my_process.errors,
+              participatory_process_group: my_process.participatory_process_group
+            }
+          }
+        end
+        let(:context) do
+          { current_organization: my_process.organization }
+        end
+        let(:form) do
+          ParticipatoryProcessForm.from_params(params).with_context(context)
+        end
+        let(:command) { described_class.new(my_process, form) }
+
+        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 update the participatory process" do
+            command.call
+            my_process.reload
+
+            expect(my_process.title['en']).not_to eq("Foo title")
+          end
+        end
+
+        describe "when the participatory process is not valid" do
+          before do
+            expect(form).to receive(:invalid?).and_return(false)
+            expect(my_process).to receive(:valid?).at_least(:once).and_return(false)
+            my_process.errors.add(:hero_image, "Image too big")
+            my_process.errors.add(:banner_image, "Image too big")
+          end
+
+          it "broadcasts invalid" do
+            expect { command.call }.to broadcast(:invalid)
+          end
+
+          it "adds errors to the form" do
+            command.call
+
+            expect(form.errors[:hero_image]).not_to be_empty
+            expect(form.errors[:banner_image]).not_to be_empty
+          end
+        end
+
+        describe "when the form is valid" do
+          it "broadcasts ok" do
+            expect { command.call }.to broadcast(:ok)
+          end
+
+          it "updates the participatory process" do
+            expect { command.call }.to broadcast(:ok)
+            my_process.reload
+
+            expect(my_process.title['en']).to eq("Foo title")
+          end
+
+          context "when no homepage image is set" do
+            it "does not replace the homepage image" do
+              command.call
+              my_process.reload
+
+              expect(my_process.hero_image).to be_present
+            end
+          end
+
+          context "when no banner image is set" do
+            it "does not replace the banner image" do
+              command.call
+              my_process.reload
+
+              expect(my_process.banner_image).to be_present
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -35,7 +35,11 @@ describe "Admin invite", type: :feature do
         find("*[type=submit]").click
       end
 
-      expect(page).to have_content("Dashboard")
+      within ".callout-wrapper" do
+        page.find('.close-button').click
+      end
+
+      expect(page).to have_content("DASHBOARD")
     end
   end
 end

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

@@ -19,7 +19,7 @@ describe "manage a feature's permissions", type: :feature do
     visit decidim_admin.participatory_process_features_path(participatory_process)
 
     within ".feature-#{feature.id}" do
-      click_link "Permissions"
+      page.find(".action-icon--permissions").click
     end
   end
 

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

@@ -47,14 +47,14 @@ describe "Admin manages features", type: :feature do
         find("*[type=submit]").click
       end
 
-      within_flash_messages do
+      within ".callout-wrapper" do
         expect(page).to have_content("successfully")
       end
 
       expect(page).to have_content("My feature")
 
       within find("tr", text: "My feature") do
-        click_link "Configure"
+        page.find(".action-icon--configure").click
       end
 
       within ".global-settings" do
@@ -86,7 +86,7 @@ describe "Admin manages features", type: :feature do
 
     it "updates the feature" do
       within ".feature-#{feature.id}" do
-        click_link "Configure"
+        page.find(".action-icon--configure").click
       end
 
       within ".edit_feature" do
@@ -109,14 +109,14 @@ describe "Admin manages features", type: :feature do
         find("*[type=submit]").click
       end
 
-      within_flash_messages do
+      within ".callout-wrapper" do
         expect(page).to have_content("successfully")
       end
 
       expect(page).to have_content("My updated feature")
 
       within find("tr", text: "My updated feature") do
-        click_link "Configure"
+        page.find(".action-icon--configure").click
       end
 
       within ".global-settings" do
@@ -148,7 +148,7 @@ describe "Admin manages features", type: :feature do
 
     it "removes the feature" do
       within ".feature-#{feature.id}" do
-        click_link "Destroy"
+        page.find(".action-icon--remove").click
       end
 
       expect(page).to have_no_content("My feature")
@@ -169,11 +169,11 @@ describe "Admin manages features", type: :feature do
     context "when the feature is unpublished" do
       it "publishes the feature" do
         within ".feature-#{feature.id}" do
-          click_link "Publish"
+          page.find(".action-icon--publish").click
         end
 
         within ".feature-#{feature.id}" do
-          expect(page).to have_content("Unpublish")
+          expect(page).to have_css(".action-icon--unpublish")
         end
       end
     end
@@ -183,11 +183,11 @@ describe "Admin manages features", type: :feature do
 
       it "unpublishes the feature" do
         within ".feature-#{feature.id}" do
-          click_link "Unpublish"
+          page.find(".action-icon--unpublish").click
         end
 
         within ".feature-#{feature.id}" do
-          expect(page).to have_content("Publish")
+          expect(page).to have_css(".action-icon--publish")
         end
       end
     end

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

@@ -6,7 +6,7 @@ require "spec_helper"
 describe "Admin manages newsletters", type: :feature do
   let(:organization) { create(:organization) }
   let(:user) { create(:user, :admin, :confirmed, name: "Sarah Kerrigan", organization: organization) }
-  let!(:deliverable_users) { create_list(:user, 5, newsletter_notifications: true, organization: organization) }
+  let!(:deliverable_users) { create_list(:user, 5, :confirmed, newsletter_notifications: true, organization: organization) }
 
   before do
     switch_to_host(organization.host)
@@ -23,7 +23,9 @@ describe "Admin manages newsletters", type: :feature do
     it "allows a newsletter to be created" do
       visit decidim_admin.newsletters_path
 
-      find("#newsletters .actions .new").click
+      within ".secondary-nav" do
+        find(".button.new").click
+      end
 
       within ".new_newsletter" do
         fill_in_i18n(
@@ -45,7 +47,7 @@ describe "Admin manages newsletters", type: :feature do
         find("*[type=submit]").click
       end
 
-      expect(page).to have_content("Preview")
+      expect(page).to have_content("PREVIEW")
       expect(page).to have_content("A fancy newsletter for #{user.name}")
     end
   end
@@ -83,7 +85,7 @@ describe "Admin manages newsletters", type: :feature do
     it "allows a newsletter to be updated" do
       visit decidim_admin.newsletters_path
       within("tr[data-newsletter-id=\"#{newsletter.id}\"]") do
-        click_link "Edit"
+        page.find('.action-icon.edit').click
       end
 
       within ".edit_newsletter" do
@@ -106,7 +108,7 @@ describe "Admin manages newsletters", type: :feature do
         find("*[type=submit]").click
       end
 
-      expect(page).to have_content("Preview")
+      expect(page).to have_content("PREVIEW")
       expect(page).to have_content("A fancy newsletter")
     end
   end
@@ -117,14 +119,14 @@ describe "Admin manages newsletters", type: :feature do
     it "allows a newsletter to be created" do
       visit decidim_admin.newsletter_path(newsletter)
 
-      within ".actions" do
+      within ".button--double" do
         find("*", text: "Deliver").click
       end
 
-      expect(page).to have_content("Newsletters")
+      expect(page).to have_content("NEWSLETTERS")
       expect(page).to have_content("successfully")
 
-      within ".newsletters tbody" do
+      within "tbody" do
         expect(page).to have_content("5 / 5")
       end
     end
@@ -137,7 +139,7 @@ describe "Admin manages newsletters", type: :feature do
       visit decidim_admin.newsletters_path
 
       within("tr[data-newsletter-id=\"#{newsletter.id}\"]") do
-        click_link "Destroy"
+        page.find('.action-icon.action-icon--remove').click
       end
 
       expect(page).to have_content("successfully")