Fix double-escaping

Author: alexrlpz

decidim-assemblies/app/helpers/decidim/assemblies/assemblies_helper.rb

@@ -30,7 +30,7 @@ def assembly_nav_items(participatory_space)
            )
         ] + components.map do |component|
           {
-            name: decidim_escape_translated(component.name),
+            name: component.name,
             url: main_component_path(component),
             active: is_active_link?(main_component_path(component), :inclusive)
           }

decidim-assemblies/spec/shared/manage_assembly_components_examples.rb

@@ -201,7 +201,8 @@
 
       it "hides the component from the menu" do
         visit decidim_assemblies.assembly_path(assembly, locale: I18n.locale)
-        expect(page).to have_content decidim_escape_translated(component.name)
+        expect(page).to have_content translated(component.name)
+        expect(page.html).to include decidim_escape_translated(component.name).gsub(""", "\"")
 
         visit decidim_admin_assemblies.components_path(assembly)
 
@@ -216,7 +217,7 @@
         end
 
         visit decidim_assemblies.assembly_path(assembly, locale: I18n.locale)
-        expect(page).to have_no_content decidim_escape_translated(component.name)
+        expect(page).to have_no_content translated(component.name)
       end
     end
 

decidim-assemblies/spec/system/assemblies_spec.rb

@@ -252,8 +252,9 @@
 
         it "shows the components" do
           within ".participatory-space__nav-container" do
-            expect(page).to have_content(decidim_escape_translated(proposals_component.name))
-            expect(page).to have_no_content(decidim_escape_translated(meetings_component.name))
+            expect(page).to have_content(translated(proposals_component.name))
+            expect(page.html).to include(decidim_escape_translated(proposals_component.name).gsub(""", "\""))
+            expect(page).to have_no_content(translated(meetings_component.name))
           end
         end
       end

decidim-core/app/cells/decidim/card_metadata_cell.rb

@@ -29,7 +29,7 @@ def space_item
       return unless show_space?
 
       {
-        text: decidim_escape_translated(participatory_space.title),
+        text: translated_attribute(participatory_space.title),
         icon: resource_type_icon_key(participatory_space.class),
         url: Decidim::ResourceLocatorPresenter.new(participatory_space).path
       }

decidim-initiatives/app/helpers/decidim/initiatives/initiatives_helper.rb

@@ -13,7 +13,7 @@ def initiative_nav_items(participatory_space)
 
         components.map do |component|
           {
-            name: decidim_escape_translated(component.name),
+            name: component.name,
             url: main_component_path(component),
             active: is_active_link?(main_component_path(component), :inclusive)
           }

decidim-initiatives/spec/system/admin/admin_manages_initiative_components_spec.rb

@@ -212,7 +212,8 @@
 
       it "hides the component from the menu" do
         visit decidim_initiatives.initiative_path(initiative, locale: I18n.locale)
-        expect(page).to have_content decidim_escape_translated(component.name)
+        expect(page).to have_content translated(component.name)
+        expect(page.html).to include decidim_escape_translated(component.name).gsub(""", "\"")
 
         visit decidim_admin_initiatives.components_path(initiative)
 
@@ -227,7 +228,7 @@
         end
 
         visit decidim_initiatives.initiative_path(initiative, locale: I18n.locale)
-        expect(page).to have_no_content decidim_escape_translated(component.name)
+        expect(page).to have_no_content translated(component.name)
       end
     end
 

decidim-initiatives/spec/system/initiative_spec.rb

@@ -247,15 +247,17 @@
 
       it "shows the components" do
         within ".participatory-space__nav-container" do
-          expect(page).to have_content(decidim_escape_translated(meetings_component.name))
-          expect(page).to have_no_content(decidim_escape_translated(unpublished_proposals_component.name))
-          expect(page).to have_content(decidim_escape_translated(blogs_component.name))
+          expect(page).to have_content(translated(meetings_component.name))
+          expect(page.html).to include(decidim_escape_translated(meetings_component.name).gsub(""", "\""))
+          expect(page).to have_no_content(translated(unpublished_proposals_component.name))
+          expect(page).to have_content(translated(blogs_component.name))
+          expect(page.html).to include(decidim_escape_translated(blogs_component.name).gsub(""", "\""))
         end
       end
 
       it "allows visiting the components" do
         within ".participatory-space__nav-container" do
-          click_on decidim_escape_translated(meetings_component.name)
+          click_on translated(meetings_component.name)
         end
 
         expect(page).to have_css('[id^="meetings__meeting"]', count: 3)
@@ -388,15 +390,15 @@
 
       it "has special permissions to create posts" do
         within ".participatory-space__nav-container" do
-          click_on decidim_escape_translated(blogs_component.name)
+          click_on translated(blogs_component.name)
         end
 
         expect(page).to have_content("New post")
       end
 
       it "has special permissions to create meetings" do
         within ".participatory-space__nav-container" do
-          click_on decidim_escape_translated(meetings_component.name)
+          click_on translated(meetings_component.name)
         end
 
         expect(page).to have_content("New meeting")

decidim-participatory_processes/app/helpers/decidim/participatory_processes/participatory_process_helper.rb

@@ -76,7 +76,7 @@ def process_nav_items(participatory_space)
         ] + components.map do |component|
           {
             id: component.id,
-            name: decidim_escape_translated(component.name),
+            name: component.name,
             url: main_component_path(component),
             active: is_active_link?(main_component_path(component), :inclusive)
           }

decidim-participatory_processes/spec/shared/manage_process_components_examples.rb

@@ -321,7 +321,8 @@
 
       it "hides the component from the menu" do
         visit decidim_participatory_processes.participatory_process_path(participatory_process, locale: I18n.locale)
-        expect(page).to have_content decidim_escape_translated(component.name)
+        expect(page).to have_content translated(component.name)
+        expect(page.html).to include decidim_escape_translated(component.name).gsub(""", "\"")
 
         visit decidim_admin_participatory_processes.components_path(participatory_process)
 
@@ -336,7 +337,7 @@
         end
 
         visit decidim_participatory_processes.participatory_process_path(participatory_process, locale: I18n.locale)
-        expect(page).to have_no_content decidim_escape_translated(component.name)
+        expect(page).to have_no_content translated(component.name)
       end
     end
 

decidim-participatory_processes/spec/system/participatory_processes_spec.rb

@@ -312,8 +312,26 @@
 
           it "shows the components" do
             within ".participatory-space__nav-container" do
-              expect(page).to have_content(decidim_escape_translated(proposals_component.name))
-              expect(page).to have_no_content(decidim_escape_translated(meetings_component.name))
+              expect(page).to have_content(translated(proposals_component.name))
+              expect(page).to have_no_content(translated(meetings_component.name))
+              expect(page.html).to include decidim_escape_translated(proposals_component.name).gsub(""", "\"")
+            end
+          end
+
+          it "displays component names with special characters (\", ', &) correctly in the nav links" do
+            create(
+              :component,
+              :published,
+              participatory_space: participatory_process,
+              manifest_name: :proposals,
+              name: { en: "Tracking \"pop\" & 'test'" }
+            )
+            visit decidim_participatory_processes.participatory_process_path(participatory_process, locale: I18n.locale)
+
+            within ".participatory-space__nav-container" do
+              expect(page).to have_content('Tracking "pop" & \'test\'')
+              expect(page).to have_no_content(""")
+              expect(page).to have_no_content("&")
             end
           end