decidim-admin 0.27.9 → 0.28.0.rc4

data/lib/decidim/admin/test/filters_participatory_space_user_roles_examples.rb

@@ -95,48 +95,28 @@ end
 shared_examples "filterable participatory space user roles" do
   context "when filtering by invite Accepted" do
     context "when filtering by null" do
-      it "returns participatory space users" do
-        apply_filter("Invite accepted", "Yes")
-
-        within ".stack tbody" do
-          expect(page).to have_content(invited_user2.name)
-          expect(page).to have_css("tr", count: 1)
-        end
+      include_examples "admin is filtering participatory space users", label: "Invite accepted", value: "Yes" do
+        let(:compare_with) { invited_user2.name }
       end
     end
 
     context "when filtering by not null" do
-      it "returns participatory space users" do
-        apply_filter("Invite accepted", "No")
-
-        within ".stack tbody" do
-          expect(page).to have_content(invited_user1.name)
-          expect(page).to have_css("tr", count: 1)
-        end
+      include_examples "admin is filtering participatory space users", label: "Invite accepted", value: "No" do
+        let(:compare_with) { invited_user1.name }
       end
     end
   end
 
   context "when filtering by logged in" do
     context "when filtering by null" do
-      it "returns participatory space users" do
-        apply_filter("Ever logged in", "Yes")
-
-        within ".stack tbody" do
-          expect(page).to have_content(invited_user2.name)
-          expect(page).to have_css("tr", count: 1)
-        end
+      include_examples "admin is filtering participatory space users", label: "Ever logged in", value: "Yes" do
+        let(:compare_with) { invited_user2.name }
       end
     end
 
     context "when filtering by not null" do
-      it "returns participatory space users" do
-        apply_filter("Ever logged in", "No")
-
-        within ".stack tbody" do
-          expect(page).to have_content(invited_user1.name)
-          expect(page).to have_css("tr", count: 1)
-        end
+      include_examples "admin is filtering participatory space users", label: "Ever logged in", value: "No" do
+        let(:compare_with) { invited_user1.name }
       end
     end
   end
@@ -144,22 +124,11 @@ end
 
 shared_examples "searchable participatory space user roles" do
   context "when searching by name or nickname or email" do
-    it "can be searched by name" do
-      search_by_text(name)
-
-      within ".stack tbody" do
-        expect(page).to have_content(name)
-        expect(page).to have_css("tr", count: 1)
-      end
+    include_examples "admin is searching participatory space users" do
+      let(:value) { name }
     end
-
-    it "can be searched by email" do
-      search_by_text(email)
-
-      within ".stack tbody" do
-        expect(page).to have_content(email)
-        expect(page).to have_css("tr", count: 1)
-      end
+    include_examples "admin is searching participatory space users" do
+      let(:value) { email }
     end
   end
 end

data/lib/decidim/admin/test/filters_participatory_space_users_examples.rb

@@ -1,50 +1,52 @@
 # frozen_string_literal: true
 
+shared_examples "admin is filtering participatory space users" do |label:, value:|
+  it "returns participatory space users" do
+    apply_filter(label, value)
+
+    within ".table-list tbody" do
+      expect(page).to have_content(compare_with)
+      expect(page).to have_css("tr", count: 1)
+    end
+  end
+end
+
+shared_examples "admin is searching participatory space users" do
+  it "returns participatory space users" do
+    search_by_text(value)
+
+    within ".table-list tbody" do
+      expect(page).to have_content(value)
+      expect(page).to have_css("tr", count: 1)
+    end
+  end
+end
+
 shared_examples "filterable participatory space users" do
   context "when filtering by invitation sent at" do
     context "when filtering by null" do
-      it "returns participatory space users" do
-        apply_filter("Invitation sent", "Not sent")
-
-        within ".stack tbody" do
-          expect(page).to have_content(invited_user2.name)
-          expect(page).to have_css("tr", count: 1)
-        end
+      include_examples "admin is filtering participatory space users", label: "Invitation sent", value: "Not sent" do
+        let(:compare_with) { invited_user2.name }
       end
     end
 
     context "when filtering by not null" do
-      it "returns participatory space users" do
-        apply_filter("Invitation sent", "Sent")
-
-        within ".stack tbody" do
-          expect(page).to have_content(invited_user1.name)
-          expect(page).to have_css("tr", count: 1)
-        end
+      include_examples "admin is filtering participatory space users", label: "Invitation sent", value: "Sent" do
+        let(:compare_with) { invited_user1.name }
       end
     end
   end
 
   context "when filtering by invitation accepted at" do
     context "when filtering by null" do
-      it "returns participatory space users" do
-        apply_filter("Invitation accepted", "Not accepted")
-
-        within ".stack tbody" do
-          expect(page).to have_content(invited_user2.name)
-          expect(page).to have_css("tr", count: 1)
-        end
+      include_examples "admin is filtering participatory space users", label: "Invitation accepted", value: "Not accepted" do
+        let(:compare_with) { invited_user2.name }
       end
     end
 
     context "when filtering by not null" do
-      it "returns participatory space users" do
-        apply_filter("Invitation accepted", "Accepted")
-
-        within ".stack tbody" do
-          expect(page).to have_content(invited_user1.name)
-          expect(page).to have_css("tr", count: 1)
-        end
+      include_examples "admin is filtering participatory space users", label: "Invitation accepted", value: "Accepted" do
+        let(:compare_with) { invited_user1.name }
       end
     end
   end
@@ -52,22 +54,11 @@ end
 
 shared_examples "searchable participatory space users" do
   context "when searching by name or nickname or email" do
-    it "can be searched by name" do
-      search_by_text(name)
-
-      within ".stack tbody" do
-        expect(page).to have_content(name)
-        expect(page).to have_css("tr", count: 1)
-      end
+    include_examples "admin is searching participatory space users" do
+      let(:value) { name }
     end
-
-    it "can be searched by email" do
-      search_by_text(email)
-
-      within ".stack tbody" do
-        expect(page).to have_content(email)
-        expect(page).to have_css("tr", count: 1)
-      end
+    include_examples "admin is searching participatory space users" do
+      let(:value) { email }
     end
   end
 end

data/lib/decidim/admin/test/forms/attachment_collection_form_examples.rb

@@ -9,7 +9,7 @@ module Decidim
         described_class.from_params(
           attributes
         ).with_context(
-          collection_for: collection_for,
+          collection_for:,
           current_organization: organization
         )
       end

data/lib/decidim/admin/test/forms/attachment_form_examples.rb

@@ -9,7 +9,7 @@ module Decidim
         described_class.from_params(
           attributes
         ).with_context(
-          attached_to: attached_to,
+          attached_to:,
           current_organization: organization
         )
       end

data/lib/decidim/admin/test/forms/category_form_examples.rb

@@ -50,7 +50,7 @@ module Decidim
       end
 
       context "when the parent_id is set" do
-        let!(:category) { create :category, participatory_space: participatory_space }
+        let!(:category) { create :category, participatory_space: }
 
         context "and it is set to a first-class category" do
           let(:parent_id) { category.id }

data/lib/decidim/admin/test/manage_attachment_collections_examples.rb

@@ -1,8 +1,7 @@
 # frozen_string_literal: true
 
 shared_examples "manage attachment collections examples" do
-  let!(:attachment_collection) { create(:attachment_collection, collection_for: collection_for) }
-  let(:attributes) { attributes_for(:attachment_collection) }
+  let!(:attachment_collection) { create(:attachment_collection, collection_for:) }
 
   before do
     visit current_path
@@ -16,28 +15,32 @@ shared_examples "manage attachment collections examples" do
 
   it "can view an attachment collection details" do
     within "#attachment_collections table" do
-      click_link translated(attachment_collection.name, locale: :en)
+      click_link "Edit"
     end
 
-    expect(page).to have_selector(%(input#attachment_collection_name_en[value="#{translated(attachment_collection.name, locale: :en)}"]))
-    expect(page).to have_selector(%(input#attachment_collection_weight[value="#{attachment_collection.weight}"]))
-    expect(page).to have_selector(%(input#attachment_collection_description_en[value="#{translated(attachment_collection.description, locale: :en)}"]))
+    expect(page).to have_selector("input#attachment_collection_name_en[value='#{translated(attachment_collection.name, locale: :en)}']")
+    expect(page).to have_selector("input#attachment_collection_weight[value='#{attachment_collection.weight}']")
+    expect(page).to have_selector("input#attachment_collection_description_en[value='#{translated(attachment_collection.description, locale: :en)}']")
   end
 
   it "can add attachment collections to a process" do
-    find(".card-title a.new").click
+    click_link "New attachment folder"
 
     within ".new_attachment_collection" do
       fill_in_i18n(
         :attachment_collection_name,
         "#attachment_collection-name-tabs",
-        **attributes[:name].except("machine_translations")
+        en: "Application forms",
+        es: "Formularios de solicitud",
+        ca: "Formularis de sol·licitud"
       )
 
       fill_in_i18n(
         :attachment_collection_description,
         "#attachment_collection-description-tabs",
-        **attributes[:description].except("machine_translations")
+        en: "Contains the application forms",
+        es: "Contiene los formularios de solicitud",
+        ca: "Conté els formularis de sol·licitud"
       )
 
       find("*[type=submit]").click
@@ -46,11 +49,8 @@ shared_examples "manage attachment collections examples" do
     expect(page).to have_admin_callout("successfully")
 
     within "#attachment_collections table" do
-      expect(page).to have_content(translated(attributes[:name]))
+      expect(page).to have_text("Application forms")
     end
-
-    visit decidim_admin.root_path
-    expect(page).to have_content("created the #{translated(attributes[:name])} attachment collection")
   end
 
   it "can update an attachment collection" do
@@ -64,7 +64,9 @@ shared_examples "manage attachment collections examples" do
       fill_in_i18n(
         :attachment_collection_name,
         "#attachment_collection-name-tabs",
-        **attributes[:name].except("machine_translations")
+        en: "Latest application forms",
+        es: "Últimos formularios de solicitud",
+        ca: "Últims formularis de sol·licitud"
       )
 
       find("*[type=submit]").click
@@ -73,15 +75,12 @@ shared_examples "manage attachment collections examples" do
     expect(page).to have_admin_callout("successfully")
 
     within "#attachment_collections table" do
-      expect(page).to have_content(translated(attributes[:name]))
+      expect(page).to have_text("Latest application forms")
     end
-
-    visit decidim_admin.root_path
-    expect(page).to have_content("updated the #{translated(attributes[:name])} attachment collection")
   end
 
   context "when deleting a attachment collection" do
-    let!(:attachment_collection2) { create(:attachment_collection, collection_for: collection_for) }
+    let!(:attachment_collection2) { create(:attachment_collection, collection_for:) }
 
     context "when the attachment collection has no associated content", :slow do
       before do
@@ -96,13 +95,13 @@ shared_examples "manage attachment collections examples" do
         expect(page).to have_admin_callout("successfully")
 
         within "#attachment_collections table" do
-          expect(page).to have_no_content(translated(attachment_collection2.name))
+          expect(page).not_to have_content(translated(attachment_collection2.name))
         end
       end
     end
 
     context "when the attachment collection has associated content" do
-      let!(:attachment) { create(:attachment, attached_to: collection_for, attachment_collection: attachment_collection) }
+      let!(:attachment) { create(:attachment, attached_to: collection_for, attachment_collection:) }
 
       before do
         visit current_path
@@ -110,7 +109,7 @@ shared_examples "manage attachment collections examples" do
 
       it "cannot delete it" do
         within find("tr", text: translated(attachment_collection.name)) do
-          expect(page).to have_no_selector("a.action-icon--remove")
+          expect(page).not_to have_selector("a.action-icon--remove")
         end
       end
     end

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

@@ -2,7 +2,7 @@
 
 shared_examples "manage attachments examples" do
   context "when processing attachments" do
-    let!(:attachment) { create(:attachment, attached_to: attached_to, attachment_collection: attachment_collection) }
+    let!(:attachment) { create(:attachment, attached_to:, attachment_collection:) }
 
     before do
       visit current_path
@@ -19,18 +19,18 @@ shared_examples "manage attachments examples" do
 
     it "can view an attachment details" do
       within "#attachments table" do
-        click_link translated(attachment.title, locale: :en)
+        click_link "Edit"
       end
 
-      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_selector(%(input#attachment_weight[value="#{attachment.weight}"]))
+      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_selector("input#attachment_weight[value='#{attachment.weight}']")
       expect(page).to have_select("attachment_attachment_collection_id", selected: translated(attachment_collection.name, locale: :en))
       expect(page).to have_css("img[src~='#{attachment.url}']")
     end
 
     it "can add attachments without a collection to a process" do
-      find(".card-title a.new").click
+      click_link "New attachment"
 
       within ".new_attachment" do
         fill_in_i18n(
@@ -59,12 +59,12 @@ shared_examples "manage attachments examples" do
       expect(page).to have_admin_callout("successfully")
 
       within "#attachments table" do
-        expect(page).to have_link("Very Important Document")
+        expect(page).to have_text("Very Important Document")
       end
     end
 
     it "can add attachments within a collection to a process" do
-      find(".card-title a.new").click
+      click_link "New attachment"
 
       within ".new_attachment" do
         fill_in_i18n(
@@ -95,7 +95,7 @@ shared_examples "manage attachments examples" do
       expect(page).to have_admin_callout("successfully")
 
       within "#attachments table" do
-        expect(page).to have_link("Document inside a collection")
+        expect(page).to have_text("Document inside a collection")
         expect(page).to have_text(translated(attachment_collection.name, locale: :en))
       end
     end
@@ -116,7 +116,7 @@ shared_examples "manage attachments examples" do
 
       within "#attachments" do
         within find("tr", text: translated(attachment.title)) do
-          expect(page).to have_no_text(translated(attachment_collection.name, locale: :en))
+          expect(page).not_to have_text(translated(attachment_collection.name, locale: :en))
         end
       end
     end
@@ -128,7 +128,7 @@ shared_examples "manage attachments examples" do
 
       expect(page).to have_admin_callout("successfully")
 
-      expect(page).to have_no_content(translated(attachment.title, locale: :en))
+      expect(page).not_to have_content(translated(attachment.title, locale: :en))
     end
 
     it "can update an attachment" do
@@ -153,7 +153,7 @@ shared_examples "manage attachments examples" do
       expect(page).to have_admin_callout("successfully")
 
       within "#attachments table" do
-        expect(page).to have_link("This is a nice photo")
+        expect(page).to have_text("This is a nice photo")
       end
     end
   end

data/lib/decidim/admin/test/manage_categories_examples.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 shared_examples "manage categories examples" do
-  let(:attributes) { attributes_for(:category) }
   it "lists all the categories for the process" do
     within "#categories table" do
       expect(page).to have_content(translated(category.name, locale: :en))
@@ -13,20 +12,22 @@ shared_examples "manage categories examples" do
       click_link translated(category.name, locale: :en)
     end
 
-    expect(page).to have_selector(%(input#category_name_en[value="#{translated(category.name, locale: :en)}"]))
+    expect(page).to have_selector("input#category_name_en[value='#{translated(category.name, locale: :en)}']")
     expect(page).to have_selector("input#category_weight[value='#{category.weight}']")
 
-    expect(page).to have_selector("select#category_parent_id")
+    expect(page).to have_select(id: "category_parent_id")
   end
 
   it "creates a new category" do
-    find(".card-title a.new").click
+    click_link "New category"
 
     within ".new_category" do
       fill_in_i18n(
         :category_name,
         "#category-name-tabs",
-        **attributes[:name].except("machine_translations")
+        en: "My category",
+        es: "Mi categoría",
+        ca: "La meva categoria"
       )
 
       find("*[type=submit]").click
@@ -35,11 +36,8 @@ shared_examples "manage categories examples" do
     expect(page).to have_admin_callout("successfully")
 
     within "#categories table" do
-      expect(page).to have_content(translated(attributes[:name]))
+      expect(page).to have_content("My category")
     end
-
-    visit decidim_admin.root_path
-    expect(page).to have_content("added the #{translated(attributes[:name])} category to the")
   end
 
   it "updates a category" do
@@ -53,7 +51,9 @@ shared_examples "manage categories examples" do
       fill_in_i18n(
         :category_name,
         "#category-name-tabs",
-        **attributes[:name].except("machine_translations")
+        en: "My new name",
+        es: "Mi nuevo nombre",
+        ca: "El meu nou nom"
       )
 
       find("*[type=submit]").click
@@ -62,15 +62,12 @@ shared_examples "manage categories examples" do
     expect(page).to have_admin_callout("successfully")
 
     within "#categories table" do
-      expect(page).to have_content(translated(attributes[:name]))
+      expect(page).to have_content("My new name")
     end
-
-    visit decidim_admin.root_path
-    expect(page).to have_content("updated the #{translated(attributes[:name])} category in the")
   end
 
   context "when deleting a category" do
-    let!(:category2) { create(:category, participatory_space: participatory_space) }
+    let!(:category2) { create(:category, participatory_space:) }
 
     context "when the category has no associated content" do
       context "when the category has no subcategories" do
@@ -86,7 +83,7 @@ shared_examples "manage categories examples" do
           expect(page).to have_admin_callout("successfully")
 
           within "#categories table" do
-            expect(page).to have_no_content(translated(category2.name))
+            expect(page).not_to have_content(translated(category2.name))
           end
         end
       end
@@ -113,14 +110,14 @@ shared_examples "manage categories examples" do
     end
 
     context "when the category has associated content" do
-      let!(:component) { create(:component, participatory_space: participatory_space) }
-      let!(:dummy_resource) { create(:dummy_resource, component: component, category: category) }
+      let!(:component) { create(:component, participatory_space:) }
+      let!(:dummy_resource) { create(:dummy_resource, component:, category:) }
 
       it "cannot delete it" do
         visit current_path
 
         within find("tr", text: translated(category.name)) do
-          expect(page).to have_no_selector("a.action-icon--remove")
+          expect(page).not_to have_selector("a.action-icon--remove")
         end
       end
     end