fix tests

decidim · Sep 20, 2023 · 88bfb87 · 88bfb87
1 parent adc9acc
commit 88bfb87
Show file tree

Hide file tree

Showing 13 changed files with 73 additions and 66 deletions.
diff --git a/decidim-admin/app/views/decidim/admin/imports/new.html.erb b/decidim-admin/app/views/decidim/admin/imports/new.html.erb
@@ -1,51 +1,59 @@
-<%= decidim_form_for(@form, url: component_imports_path(name: import_manifest.name), class: "form grid-container") do |form| %>
-  <div class="card">
-    <div class="card-divider">
-      <div class="card-title flex--sbc">
-        <div>
-          <%= import_manifest.message(:title, self) %>
-        </div>
-        <div class="flex--cc flex-gap--1">
-          <div id="js-other-actions-wrapper">
-            <% if import_manifest.has_example? %>
-              <span class="imports-example dropdown tiny button button__sm button__secondary button--simple" data-toggle="example-dropdown"><%= t(".download_example") %></span>
-              <div class="dropdown-pane" id="example-dropdown" data-dropdown data-position=bottom data-alignment=right data-auto-focus="true" data-close-on-click="true">
-                <ul class="vertical menu add-components">
-                  <% mime_types.each do |format, name| %>
-                    <li class="examples--format--<%= format.downcase %> examples--<%= import_manifest.name %>">
-                      <%= link_to t(".download_example_format", name:),
-                        admin_imports_example_path(@current_component, name: import_manifest.name, format:) %>
-                    </li>
-                  <% end %>
-                </ul>
-              </div>
-            <% end %>
+<% add_decidim_page_title(t("impersonate_new_managed_user", scope: "decidim.admin.impersonations.new")) %>
+<div class="item_show__header">
+  <h2 class="item_show__header-title">
+    <%= import_manifest.message(:title, self) %>
 
-            <%= link_to t(".actions.back"), manage_component_path(@current_component), class: "button button__sm button__secondary hollow tiny button--simple" %>
-          </div>
+    <div id="js-other-actions-wrapper">
+      <% if import_manifest.has_example? %>
+        <span class="imports-example dropdown tiny button button__sm button__secondary button--simple" data-toggle="example-dropdown"><%= t(".download_example") %></span>
+        <div class="dropdown-pane" id="example-dropdown" data-dropdown data-position=bottom data-alignment=right data-auto-focus="true" data-close-on-click="true">
+          <ul class="vertical menu add-components">
+            <% mime_types.each do |format, name| %>
+              <li class="examples--format--<%= format.downcase %> examples--<%= import_manifest.name %>">
+                <%= link_to t(".download_example_format", name:),
+                  admin_imports_example_path(@current_component, name: import_manifest.name, format:) %>
+              </li>
+            <% end %>
+          </ul>
         </div>
-      </div>
+      <% end %>
+
+      <%= link_to t(".actions.back"), manage_component_path(@current_component), class: "button button__sm button__secondary hollow tiny button--simple" %>
     </div>
-    <div class="card-section">
-      <%= render partial: import_manifest.form_view, locals: { form: } if import_manifest.form_view %>
-      <div class="grid-x">
-        <div class="cell">
-          <fieldset>
-            <legend>
-              <%= t(".file_legend", valid_mime_types: mime_types.values.join(", ")).html_safe %>
-              <div class="guidance">
-                <%= import_manifest.message(:help, self).html_safe %>
-              </div>
-            </legend>
+  </h2>
+</div>
+
+<div class="item__edit item__edit-1col">
+  <div class="item__edit-form">
+    <%= decidim_form_for(@form, url: component_imports_path(name: import_manifest.name), html: { class: "form form-defaults grid-container" }) do |form| %>
+      <div class="form__wrapper">
+        <div class="card">
+          <div class="card-divider"></div>
+          <div class="card-section">
+            <div class="row column">
+              <%= render partial: import_manifest.form_view, locals: { form: } if import_manifest.form_view %>
+            </div>
+
             <div class="row column">
-              <%= form.upload :file, required: true, help_i18n_scope: "decidim.admin.forms.file_help.import", button_class: "button button__sm button__transparent-secondary" %>
+              <fieldset>
+                <legend>
+                  <%= t(".file_legend", valid_mime_types: mime_types.values.join(", ")).html_safe %>
+                  <div class="guidance">
+                    <%= import_manifest.message(:help, self).html_safe %>
+                  </div>
+                </legend>
+
+                <%= form.upload :file, required: true, help_i18n_scope: "decidim.admin.forms.file_help.import", button_class: "button button__sm button__transparent-secondary" %>
+              </fieldset>
             </div>
-          </fieldset>
+          </div>
         </div>
       </div>
-    </div>
-  </div>
-  <div class="grid-x align-center mt-sm">
-    <%= form.submit t(".import"), class: "button button__sm button__secondary" %>
+      <div class="item__edit-sticky">
+        <div class="item__edit-sticky-container">
+          <%= form.submit t(".import"), class: "button button__sm button__secondary" %>
+        </div>
+      </div>
+    <% end -%>
   </div>
-<% end -%>
+</div>
diff --git a/decidim-admin/spec/system/admin_access_spec.rb b/decidim-admin/spec/system/admin_access_spec.rb
@@ -59,7 +59,7 @@
         visit decidim_admin_participatory_processes.components_path(participatory_process)
       end
 
-      it_behaves_like "accessing the participatory space", participatory_process
+      it_behaves_like "accessing the participatory space"
     end
 
     context "and does not have permission" do

diff --git a/decidim-admin/spec/system/admin_checks_logs_spec.rb b/decidim-admin/spec/system/admin_checks_logs_spec.rb
@@ -18,7 +18,7 @@
   it "lists all recent logs" do
     expect(page).to have_content("Admin log")
 
-    within ".content .logs.table" do
+    within ".logs.table" do
       expect(page).to have_selector("div.logs__log", count: 3)
     end
   end
@@ -59,7 +59,7 @@
           find("*[type=submit]").click
         end
 
-        within ".content .logs.table" do
+        within ".logs.table" do
           expect(page).to have_selector("div.logs__log", count: 1)
         end
       end
@@ -80,7 +80,7 @@
           find("*[type=submit]").click
         end
 
-        within ".content .logs.table" do
+        within ".logs.table" do
           expect(page).to have_selector("div.logs__log", count: 2)
         end
       end
@@ -91,7 +91,7 @@
           find("*[type=submit]").click
         end
 
-        within ".content .logs.table" do
+        within ".logs.table" do
           expect(page).to have_selector("div.logs__log", count: 2)
         end
       end
@@ -103,7 +103,7 @@
           find("*[type=submit]").click
         end
 
-        within ".content .logs.table" do
+        within ".logs.table" do
           expect(page).to have_selector("div.logs__log", count: 2)
         end
       end
@@ -127,7 +127,7 @@
           find("*[type=submit]").click
         end
 
-        within ".content .logs.table" do
+        within ".logs.table" do
           expect(page).to have_selector("div.logs__log", count: 1)
         end
 
@@ -136,7 +136,7 @@
           find("*[type=submit]").click
         end
 
-        within ".content .logs.table" do
+        within ".logs.table" do
           expect(page).to have_selector("div.logs__log", count: 1)
         end
       end
@@ -147,7 +147,7 @@
           find("*[type=submit]").click
         end
 
-        within ".content .logs.table" do
+        within ".logs.table" do
           expect(page).to have_selector("div.logs__log", count: 1)
         end
       end
@@ -158,7 +158,7 @@
           find("*[type=submit]").click
         end
 
-        within ".content .logs.table" do
+        within ".logs.table" do
           expect(page).to have_selector("div.logs__log", count: 1)
         end
       end

diff --git a/decidim-admin/spec/system/admin_manages_global_moderations_spec.rb b/decidim-admin/spec/system/admin_manages_global_moderations_spec.rb
@@ -43,7 +43,7 @@
       visit decidim_admin.moderations_path
 
       within ".process-title" do
-        find("#global-moderations-dropdown-menu-trigger").click
+        find("#global-moderations-menu-trigger").click
         expect(page).to have_css("span.component-counter", visible: :visible)
         expect(page).to have_css("span", text: (reportables.size - hidden_moderations.size))
       end
@@ -60,7 +60,7 @@
         visit decidim_admin.moderations_path
 
         within ".process-title" do
-          find("#global-moderations-dropdown-menu-trigger").click
+          find("#global-moderations-menu-trigger").click
           expect(page).to have_css("span.component-counter--off", visible: :visible)
           expect(page).to have_css("span", text: "0")
         end
@@ -70,7 +70,7 @@
         visit decidim_admin.moderations_path
 
         within ".process-title" do
-          find("#global-moderations-dropdown-menu-trigger").click
+          find("#global-moderations-menu-trigger").click
           expect(page).to have_css("span.component-counter", visible: :visible, count: 2)
           expect(page).to have_css("span", text: "1")
         end
@@ -82,7 +82,7 @@
     visit decidim_admin.moderations_path
 
     within ".process-title" do
-      find("#global-moderations-dropdown-menu-trigger").click
+      find("#global-moderations-menu-trigger").click
       expect(page).to have_css("span.component-counter", visible: :visible)
     end
   end

diff --git a/decidim-admin/spec/system/admin_manages_impersonatable_users_list_spec.rb b/decidim-admin/spec/system/admin_manages_impersonatable_users_list_spec.rb
@@ -12,7 +12,7 @@
     login_as admin, scope: :user
     visit decidim_admin.root_path
     click_link "Participants"
-    click_button(id: "user-dropdown-menu-trigger")
+    click_button(id: "user-menu-trigger")
   end
 
   describe "listing impersonatable users" do

diff --git a/decidim-admin/spec/system/participatory_space_private_user_import_via_csv_spec.rb b/decidim-admin/spec/system/participatory_space_private_user_import_via_csv_spec.rb
@@ -12,7 +12,7 @@
     switch_to_host(organization.host)
     login_as user, scope: :user
     visit decidim_admin_assemblies.edit_assembly_path(assembly)
-    click_button(id: "assembly-dropdown-menu-trigger")
+    click_button(id: "assembly-menu-trigger")
     find("a[href*='participatory_space_private_users']").click
     find("a[href*='csv_import'").click
   end

diff --git a/decidim-assemblies/config/locales/en.yml b/decidim-assemblies/config/locales/en.yml
@@ -310,7 +310,6 @@ en:
             slug_help_html: 'URL slugs are used to generate the URLs that point to this assembly. Only accepts letters, numbers and dashes, and must start with a letter. Example: %{url}'
         assembly_imports:
           form:
-            document_legend: Add a document
             slug_help_html: 'URL slugs are used to generate the URLs that point to this assembly. Only accepts letters, numbers and dashes, and must start with a letter. Example: %{url}'
         assembly_members:
           form:

diff --git a/decidim-conferences/spec/shared/copy_conferences_examples.rb b/decidim-conferences/spec/shared/copy_conferences_examples.rb
@@ -83,7 +83,7 @@
       within find("tr", text: "Copy conference") do
         click_link "Configure"
       end
-      click_button(id: "conference-dropdown-menu-trigger")
+      click_button(id: "conference-menu-trigger")
       click_link "Components"
 
       within ".table-list" do

diff --git a/decidim-conferences/spec/shared/manage_conference_categories_examples.rb b/decidim-conferences/spec/shared/manage_conference_categories_examples.rb
@@ -7,7 +7,7 @@
     switch_to_host(organization.host)
     login_as user, scope: :user
     visit decidim_admin_conferences.edit_conference_path(conference)
-    click_button(id: "conference-dropdown-menu-trigger")
+    click_button(id: "conference-menu-trigger")
     click_link "Categories"
   end
 

diff --git a/decidim-conferences/spec/shared/manage_diplomas_examples.rb b/decidim-conferences/spec/shared/manage_diplomas_examples.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 def visit_edit_diplomas_page
-  click_button(id: "conference-dropdown-menu-trigger")
+  click_button(id: "conference-menu-trigger")
   page.click_link "Certificate of Attendance"
 end
 

diff --git a/decidim-conferences/spec/shared/manage_partners_examples.rb b/decidim-conferences/spec/shared/manage_partners_examples.rb
@@ -7,7 +7,7 @@
     switch_to_host(organization.host)
     login_as user, scope: :user
     visit decidim_admin_conferences.edit_conference_path(conference)
-    click_button(id: "conference-dropdown-menu-trigger")
+    click_button(id: "conference-menu-trigger")
     click_link "Partners"
   end
 

diff --git a/decidim-conferences/spec/shared/manage_registration_types_examples.rb b/decidim-conferences/spec/shared/manage_registration_types_examples.rb
@@ -7,7 +7,7 @@
     switch_to_host(organization.host)
     login_as user, scope: :user
     visit decidim_admin_conferences.edit_conference_path(conference)
-    click_button(id: "conference-dropdown-menu-trigger")
+    click_button(id: "conference-menu-trigger")
     click_link "Registration Types"
   end
 

diff --git a/decidim-dev/lib/decidim/dev/test/rspec_support/helpers.rb b/decidim-dev/lib/decidim/dev/test/rspec_support/helpers.rb
@@ -28,7 +28,7 @@ def within_admin_menu
 
     def within_language_menu(options = {})
       within(options.fetch(:admin, !Decidim.redesign_active) ? ".topbar__dropmenu.language-choose" : "footer") do
-        find(options.fetch(:admin, !Decidim.redesign_active) ? "#admin-dropdown-menu-trigger" : "#trigger-dropdown-language-chooser").click
+        find(options.fetch(:admin, !Decidim.redesign_active) ? "#admin-menu-trigger" : "#trigger-dropdown-language-chooser").click
         yield
       end
     end