add&fix test ci skip

Author: stbnrivas

app/presenters/gobierto_data/dataset_presenter.rb

@@ -58,7 +58,7 @@ def url_helpers
     end
 
     def site_locale
-      site.configuration_data["default_locale"]
+      site.configuration.default_locale
     end
 
     def description_custom_field_record(dataset)

app/views/gobierto_data/api/v1/datasets/catalog.xml.erb

@@ -6,7 +6,7 @@
  xmlns:foaf="http://xmlns.com/foaf/0.1/"
  xmlns:xsd="http://www.w3.org/2001/XMLSchema#"
  xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"><% cache @catalog do %>
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
  <dcat:Catalog rdf:about="https://data.some.org/catalog">
    <dct:identifier><%= @catalog[:identifier_uri] %></dct:identifier>
    <dct:title><%= @catalog[:title] %></dct:title>
@@ -43,5 +43,5 @@
        <% end %>
      </dcat:Dataset>
    </dcat:dataset><% end %>
- </dcat:Catalog><% end %>
+ </dcat:Catalog>
  </rdf:RDF>

config/locales/gobierto_data/presenters/ca.yml

@@ -4,5 +4,5 @@ ca:
     gobierto_data:
       catalog:
         description: Catàleg public de dades dels conjunts de dades publicades per%
-          {site}, a través de la URL% {publisher_url}
+          {site}, a través de la URL %{publisher_url}
         title: Catàleg DCAT de conjunts de dades de %{site} en format rdf/xml dcat

config/routes.rb

@@ -641,8 +641,7 @@
               resources :favorites, only: [:index]
               collection do
                 get :meta
-                # get :catalog
-                get "catalog" => "datasets#catalog"
+                get :catalog
               end
               member do
                 get "meta" => "datasets#dataset_meta"

test/controllers/gobierto_data/api/v1/datasets_controller_test.rb

@@ -67,6 +67,10 @@ def datasets_md_with_translations
           @datasets_md_with_translations ||= gobierto_common_custom_fields(:madrid_data_datasets_custom_field_md_with_translations)
         end
 
+        def datasets_descriptions
+          @datasets_descriptions ||= gobierto_common_custom_fields(:madrid_data_datasets_custom_field_description)
+        end
+
         def other_site_dataset
           @other_site_dataset ||= gobierto_data_datasets(:santander_dataset)
         end
@@ -93,7 +97,8 @@ def array_data(dataset)
             dataset.rails_model&.columns_hash&.transform_values(&:type)&.to_s,
             GobiertoCommon::CustomFieldRecord.find_by(item: dataset, custom_field: datasets_category)&.value_string,
             GobiertoCommon::CustomFieldRecord.find_by(item: dataset, custom_field: datasets_md_without_translations)&.value_string,
-            GobiertoCommon::CustomFieldRecord.find_by(item: dataset, custom_field: datasets_md_with_translations)&.value_string
+            GobiertoCommon::CustomFieldRecord.find_by(item: dataset, custom_field: datasets_md_with_translations)&.value_string || "",
+            GobiertoCommon::CustomFieldRecord.find_by(item: dataset, custom_field: datasets_descriptions)&.value_string
           ]
         end
 
@@ -168,8 +173,9 @@ def test_index_as_csv
             parsed_csv = CSV.parse(response_data).map { |row| row.map(&:to_s) }
 
             assert_equal active_datasets_count + 1, parsed_csv.count
-            assert_equal %w(id name slug table_name data_updated_at columns category md-without-translations md-with-translations), parsed_csv.first
-            assert_includes parsed_csv, array_data(dataset)
+            assert_equal %w(id name slug table_name data_updated_at columns category md-without-translations md-with-translations description), parsed_csv.first
+
+            assert_includes parsed_csv.drop(1).take(1), array_data(dataset)
             refute_includes parsed_csv, array_data(other_site_dataset)
           end
         end
@@ -202,7 +208,7 @@ def test_index_xlsx_format
             assert_equal 1, parsed_xlsx.worksheets.count
             sheet = parsed_xlsx.worksheets.first
             assert_nil sheet[active_datasets_count + 1]
-            assert_equal %w(id name slug table_name data_updated_at columns category md-without-translations md-with-translations), sheet[0].cells.map(&:value)
+            assert_equal %w(id name slug table_name data_updated_at columns category md-without-translations md-with-translations description), sheet[0].cells.map(&:value)
             values = (1..active_datasets_count).map do |row_number|
               sheet[row_number].cells.map { |cell| cell.value.to_s }
             end
@@ -315,12 +321,28 @@ def test_index_when_md_custom_field_changes_translations_availability
             parsed_csv = CSV.parse(response_data).map { |row| row.map(&:to_s) }
 
             assert_equal active_datasets_count + 1, parsed_csv.count
-            assert_equal %w(id name slug table_name data_updated_at columns category md-without-translations md-with-translations), parsed_csv.first
+            assert_equal %w(id name slug table_name data_updated_at columns category md-without-translations md-with-translations description), parsed_csv.first
             assert_includes parsed_csv, array_data(dataset)
             refute_includes parsed_csv, array_data(other_site_dataset)
           end
         end
 
+        def test_catalog
+          with(site: site) do
+            get catalog_gobierto_data_api_v1_datasets_path(format: :xml), as: :xml
+            assert_response :success
+
+            response_xml = response.parsed_body
+            assert_includes response_xml, '<?xml version="1.0" encoding="utf-8" ?>'
+            assert_includes response_xml, '<rdf:RDF'
+            assert_includes response_xml,   '<dcat:Catalog rdf:about="https://data.some.org/catalog">'
+            assert_includes response_xml,     '<dcat:dataset>'
+            assert_includes response_xml,     '</dcat:dataset>'
+            assert_includes response_xml,   '</dcat:Catalog>'
+            assert_includes response_xml, '</rdf:RDF>'
+          end
+        end
+
       end
     end
   end