decidim 0.0.6 → 0.0.7

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

@@ -15,11 +15,14 @@ describe "Organization admins", type: :feature do
     before do
       login_as admin, scope: :user
       visit decidim_admin.root_path
-      click_link "Admin users"
+      click_link "Users"
+      click_link "Admins"
     end
 
     it "can invite new users" do
-      find(".actions .new").click
+      within ".card-title" do
+        find(".button--title").click
+      end
 
       within ".new_user" do
         fill_in :user_name, with: "New admin"
@@ -28,7 +31,7 @@ describe "Organization admins", type: :feature do
         find("*[type=submit]").click
       end
 
-      within ".flash" do
+      within ".callout-wrapper" do
         expect(page).to have_content("successfully")
       end
 
@@ -51,7 +54,7 @@ describe "Organization admins", type: :feature do
 
       it "can resend the invitation" do
         within "tr[data-user-id=\"#{user.id}\"]" do
-          click_link "Resend invitation"
+          page.find('.action-icon.resend-invitation').click
         end
 
         expect(page).to have_content("Invitation email sent successfully")
@@ -61,7 +64,7 @@ describe "Organization admins", type: :feature do
         expect(page).to have_content(other_admin.name)
 
         within "tr[data-user-id=\"#{other_admin.id}\"]" do
-          click_link "Destroy"
+          page.find('.action-icon.action-icon--remove').click
         end
 
         expect(page).not_to have_content(other_admin.name)

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

@@ -15,11 +15,12 @@ describe "Organization scopes", type: :feature do
     before do
       login_as admin, scope: :user
       visit decidim_admin.root_path
+      click_link "Settings"
       click_link "Scopes"
     end
 
     it "can create new scopes" do
-      find(".actions .new").click
+      click_link "Add"
 
       within ".new_scope" do
         fill_in :scope_name, with: "My nice district"
@@ -27,7 +28,7 @@ describe "Organization scopes", type: :feature do
         find("*[type=submit]").click
       end
 
-      within ".flash" do
+      within ".callout-wrapper" do
         expect(page).to have_content("successfully")
       end
 
@@ -45,7 +46,7 @@ describe "Organization scopes", type: :feature do
 
       it "can edit them" do
         within find("tr", text: scope.name) do
-          click_link "Edit"
+          page.find('a.action-icon.action-icon--edit').click
         end
 
         within ".edit_scope" do
@@ -53,7 +54,7 @@ describe "Organization scopes", type: :feature do
           find("*[type=submit]").click
         end
 
-        within ".flash" do
+        within ".callout-wrapper" do
           expect(page).to have_content("successfully")
         end
 
@@ -64,10 +65,10 @@ describe "Organization scopes", type: :feature do
 
       it "can destroy them" do
         within find("tr", text: scope.name) do
-          click_link "Destroy"
+          page.find('a.action-icon.action-icon--remove').click
         end
 
-        within ".flash" do
+        within ".callout-wrapper" do
           expect(page).to have_content("successfully")
         end
 

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

@@ -30,7 +30,21 @@ describe "Admin manages ogranization", type: :feature do
         ca: "El meu súper text de benvinguda"
       }
 
+      %w(Twitter Facebook Instagram YouTube GitHub).each do |network|
+        click_link network
+        fill_in "organization_#{network.downcase}_handler", with: "decidim"
+      end
+
       click_button "Update organization"
+      select "Castellano", from: "Default locale"
+      fill_in "Reference prefix", with: "ABC"
+      fill_in "Official organization url", with: "http://www.example.com"
+
+      attach_file "Homepage image", Decidim::Dev.asset("city.jpeg")
+      attach_file "Logo", Decidim::Dev.asset("city2.jpeg")
+      attach_file "Icon", Decidim::Dev.asset("city3.jpeg")
+      attach_file "Official logo header", Decidim::Dev.asset("city2.jpeg")
+      attach_file "Official logo footer", Decidim::Dev.asset("city3.jpeg")
 
       expect(page).to have_content("updated successfully")
     end

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

@@ -14,7 +14,7 @@ describe "Admin manage participatory process groups", type: :feature do
   end
 
   it "creates a new participatory process group" do
-    find(".actions .new").click
+    find(".card-title .new").click
 
     within ".new_participatory_process_group" do
       fill_in_i18n(
@@ -37,7 +37,7 @@ describe "Admin manage participatory process groups", type: :feature do
       find("*[type=submit]").click
     end
 
-    within ".flash" do
+    within ".callout-wrapper" do
       expect(page).to have_content("successfully")
     end
 
@@ -56,7 +56,7 @@ describe "Admin manage participatory process groups", type: :feature do
 
     it "can edit them" do
       within find("tr", text: participatory_process_group.name["en"]) do
-        click_link "Edit"
+        page.find('.action-icon.action-icon--edit').click
       end
 
       within ".edit_participatory_process_group" do
@@ -80,7 +80,7 @@ describe "Admin manage participatory process groups", type: :feature do
         find("*[type=submit]").click
       end
 
-      within ".flash" do
+      within ".callout-wrapper" do
         expect(page).to have_content("successfully")
       end
 
@@ -92,10 +92,10 @@ describe "Admin manage participatory process groups", type: :feature do
 
     it "can destroy them" do
       within find("tr", text: participatory_process_group.name["en"]) do
-        click_link "Destroy"
+        page.find('.action-icon.action-icon--remove').click
       end
 
-      within ".flash" do
+      within ".callout-wrapper" do
         expect(page).to have_content("successfully")
       end
 

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

@@ -15,7 +15,9 @@ describe "Admin manage participatory processes", type: :feature do
   end
 
   it "creates a new participatory_process" do
-    find(".actions .new").click
+    within ".secondary-nav__actions" do
+      page.find('a.button').click
+    end
 
     within ".new_participatory_process" do
       fill_in_i18n(
@@ -58,11 +60,11 @@ describe "Admin manage participatory processes", type: :feature do
       find("*[type=submit]").click
     end
 
-    within ".flash" do
+    within ".callout-wrapper" do
       expect(page).to have_content("successfully")
     end
 
-    within ".tabs-content" do
+    within ".container" do
       expect(page).to have_content("My participatory process")
       expect(page).to have_content(@group_name)
       expect(page).to have_css("img[src*='#{image1_filename}']")
@@ -70,6 +72,27 @@ describe "Admin manage participatory processes", type: :feature do
     end
   end
 
+  context "updating a participatory process" do
+    let!(:participatory_process3) { create(:participatory_process, organization: organization) }
+
+    before do
+      visit decidim_admin.participatory_processes_path
+    end
+
+    it "update a participatory process without images does not delete them" do
+      click_link translated(participatory_process3.title)
+      click_processes_menu_link "Info"
+      click_button "Update participatory process"
+
+      within ".callout-wrapper" do
+        expect(page).to have_content("successfully")
+      end
+
+      expect(page).to have_css("img[src*='#{participatory_process3.hero_image.url}']")
+      expect(page).to have_css("img[src*='#{participatory_process3.banner_image.url}']")
+    end
+  end
+
   context "deleting a participatory process" do
     let!(:participatory_process2) { create(:participatory_process, organization: organization) }
 
@@ -79,10 +102,9 @@ describe "Admin manage participatory processes", type: :feature do
 
     it "deletes a participatory_process" do
       click_link translated(participatory_process2.title)
-      click_processes_menu_link "Settings"
       click_link "Destroy"
 
-      within ".flash" do
+      within ".callout-wrapper" do
         expect(page).to have_content("successfully")
       end
 

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

@@ -17,7 +17,7 @@ describe "Admin manage user groups", type: :feature do
 
   it "verifies a user group" do
     within "tr[data-user-group-id=\"#{user_group.id}\"]" do
-      click_button "Verify", match: :first
+      click_link "Verify", match: :first
     end
 
     expect(page).to have_content("verified successfully")

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

@@ -12,8 +12,8 @@ describe "Participatory process admin manages participatory process admins", typ
     before do
       switch_to_host(organization.host)
       login_as user, scope: :user
-      visit decidim_admin.participatory_process_path(participatory_process)
-      click_link "Process admins"
+      visit decidim_admin.edit_participatory_process_path(participatory_process)
+      click_link "Process users"
     end
 
     it "cannot remove himself" do

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

@@ -35,7 +35,9 @@ describe "Content pages", type: :feature do
     end
 
     it "can create new pages" do
-      find(".actions .new").click
+      within ".secondary-nav" do
+        find(".new").click
+      end
 
       within ".new_static_page" do
         fill_in :static_page_slug, with: "welcome"
@@ -59,7 +61,7 @@ describe "Content pages", type: :feature do
         find("*[type=submit]").click
       end
 
-      within ".flash" do
+      within ".callout-wrapper" do
         expect(page).to have_content("successfully")
       end
 
@@ -77,7 +79,7 @@ describe "Content pages", type: :feature do
 
       it "can edit them" do
         within find("tr", text: translated(decidim_page.title)) do
-          click_link "Edit"
+          page.find('.action-icon.action-icon--edit').click
         end
 
         within ".edit_static_page" do
@@ -94,7 +96,7 @@ describe "Content pages", type: :feature do
           find("*[type=submit]").click
         end
 
-        within ".flash" do
+        within ".callout-wrapper" do
           expect(page).to have_content("successfully")
         end
 
@@ -110,10 +112,10 @@ describe "Content pages", type: :feature do
 
       it "can destroy them" do
         within find("tr", text: translated(decidim_page.title)) do
-          click_link "Destroy"
+          page.find('.action-icon.action-icon--remove').click
         end
 
-        within ".flash" do
+        within ".callout-wrapper" do
           expect(page).to have_content("successfully")
         end
 
@@ -124,7 +126,7 @@ describe "Content pages", type: :feature do
 
       it "can visit them" do
         within find("tr", text: translated(decidim_page.title)) do
-          click_link "View public page"
+          page.find('.action-icon.action-icon--preview').click
         end
 
         expect(page).to have_content(translated(decidim_page.title))

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

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

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

@@ -5,13 +5,14 @@ describe Decidim::Admin::ProcessAdminRolesForProcess do
   let(:organization) { create :organization }
   let!(:process1) { create :participatory_process, organization: organization }
   let!(:process2) { create :participatory_process, organization: organization }
-  let!(:user_role1) { create :participatory_process_user_role, participatory_process: process1 }
+  let!(:user_role1) { create :participatory_process_user_role, participatory_process: process1, role: :admin }
   let!(:user_role2) { create :participatory_process_user_role, participatory_process: process2 }
+  let!(:user_role3) { create :participatory_process_user_role, participatory_process: process1, role: :collaborator }
 
   subject { described_class.new(process1) }
 
   it "returns only the user roles for the given process" do
-    expect(subject.query)
-      .to eq [user_role1]
+    expect(subject.query).to include user_role1
+    expect(subject.query).to include user_role3
   end
 end

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

@@ -5,8 +5,8 @@ RSpec.shared_examples "manage process admins examples" do
   before do
     switch_to_host(organization.host)
     login_as user, scope: :user
-    visit decidim_admin.participatory_process_path(participatory_process)
-    click_link "Process admins"
+    visit decidim_admin.edit_participatory_process_path(participatory_process)
+    click_link "Process users"
   end
 
   it "process admins" do
@@ -16,8 +16,9 @@ RSpec.shared_examples "manage process admins examples" do
   end
 
   it "creates a new process admin" do
+    find(".card-title a.new").click
 
-    within "#process_admins form" do
+    within ".new_participatory_process_user_role" do
       fill_in :participatory_process_user_role_email, with: other_user.email
       fill_in :participatory_process_user_role_name, with: "John Doe"
       select "admin", from: :participatory_process_user_role_role
@@ -25,7 +26,7 @@ RSpec.shared_examples "manage process admins examples" do
       find("*[type=submit]").click
     end
 
-    within ".flash" do
+    within ".callout-wrapper" do
       expect(page).to have_content("successfully")
     end
 
@@ -34,19 +35,41 @@ RSpec.shared_examples "manage process admins examples" do
     end
   end
 
-  context "deleting a participatory process step" do
+  describe "when managing different users" do
     let!(:user_role2) { create(:participatory_process_user_role, participatory_process: participatory_process, user: other_user) }
 
     before do
       visit current_path
     end
 
-    it "deletes a participatory_process_step" 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
+        end
+      end
+
+      within ".edit_participatory_process_user_roles" do
+        select "admin", from: :participatory_process_user_role_role
+
+        find("*[type=submit]").click
+      end
+
+      within ".callout-wrapper" do
+        expect(page).to have_content("successfully")
+      end
+
+      within "#process_admins table" do
+        expect(page).to have_content("Administrator")
+      end
+    end
+
+    it "deletes a participatory_process_user_role" do
       within find("#process_admins tr", text: other_user.email) 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
 

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

@@ -8,7 +8,7 @@ RSpec.shared_examples "manage process attachments examples" do
   before do
     switch_to_host(organization.host)
     login_as user, scope: :user
-    visit decidim_admin.participatory_process_path(participatory_process)
+    visit decidim_admin.edit_participatory_process_path(participatory_process)
     click_link "Attachments"
   end
 

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

@@ -4,29 +4,14 @@ RSpec.shared_examples "manage process categories examples" do
   before do
     switch_to_host(organization.host)
     login_as user, scope: :user
-    visit decidim_admin.participatory_process_path(participatory_process)
+    visit decidim_admin.edit_participatory_process_path(participatory_process)
     click_link "Categories"
   end
 
-  it "displays all fields from a single category" do
-    within "#categories table" do
-      click_link translated(category.name)
-    end
-
-    within "dl" do
-      expect(page).to have_i18n_content(category.name, locale: :en)
-      expect(page).to have_i18n_content(category.name, locale: :es)
-      expect(page).to have_i18n_content(category.name, locale: :ca)
-      expect(page).to have_i18n_content(category.description, locale: :en)
-      expect(page).to have_i18n_content(category.description, locale: :es)
-      expect(page).to have_i18n_content(category.description, locale: :ca)
-    end
-  end
-
   it "creates a new category" do
-    find("#categories .actions .new").click
+    find(".card-title a.new").click
 
-    within ".new_category" do
+    within ".new_participatory_process_category" do
       fill_in_i18n(
         :category_name,
         "#name-tabs",
@@ -45,7 +30,7 @@ RSpec.shared_examples "manage process categories examples" do
       find("*[type=submit]").click
     end
 
-    within ".flash" do
+    within ".callout-wrapper" do
       expect(page).to have_content("successfully")
     end
 
@@ -57,11 +42,11 @@ RSpec.shared_examples "manage process categories examples" do
   it "updates a category" do
     within "#categories" do
       within find("tr", text: translated(category.name)) do
-        click_link "Edit"
+        page.find('a.action-icon--edit').click
       end
     end
 
-    within ".edit_category" do
+    within ".edit_participatory_process_category" do
       fill_in_i18n(
         :category_name,
         "#name-tabs",
@@ -73,7 +58,7 @@ RSpec.shared_examples "manage process categories examples" do
       find("*[type=submit]").click
     end
 
-    within ".flash" do
+    within ".callout-wrapper" do
       expect(page).to have_content("successfully")
     end
 
@@ -92,10 +77,10 @@ RSpec.shared_examples "manage process categories examples" do
 
       it "deletes a category" do
         within find("tr", text: translated(category2.name)) 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
 
@@ -114,10 +99,10 @@ RSpec.shared_examples "manage process categories examples" do
 
       it "deletes a category" do
         within find("tr", text: translated(category2.name)) do
-          click_link "Destroy"
+          page.find('a.action-icon--remove').click
         end
 
-        within ".flash" do
+        within ".callout-wrapper" do
           expect(page).to have_content("error deleting")
         end