From d5aff4dc8554a3fc99e5ccf3eb6309c86e885605 Mon Sep 17 00:00:00 2001
From: Arnaud Levy <contact@arnaudlevy.com>
Date: Wed, 31 Jan 2024 12:02:38 +0100
Subject: [PATCH] fix tests
---
...{research_hal_publication.rb => research_publication.rb} | 6 +++---
app/models/communication/website/page/with_type.rb | 2 +-
app/models/communication/website/permalink/publication.rb | 2 +-
app/models/communication/website/with_connected_objects.rb | 6 +++---
app/views/admin/research/publications/static.html.erb | 2 +-
test/fixtures/research/{hal => }/publications.yml | 2 +-
6 files changed, 10 insertions(+), 10 deletions(-)
rename app/models/communication/website/page/{research_hal_publication.rb => research_publication.rb} (64%)
rename test/fixtures/research/{hal => }/publications.yml (78%)
diff --git a/app/models/communication/website/page/research_hal_publication.rb b/app/models/communication/website/page/research_publication.rb
similarity index 64%
rename from app/models/communication/website/page/research_hal_publication.rb
rename to app/models/communication/website/page/research_publication.rb
index 9fc695c78..d64da7d63 100644
--- a/app/models/communication/website/page/research_hal_publication.rb
+++ b/app/models/communication/website/page/research_publication.rb
@@ -1,7 +1,7 @@
-class Communication::Website::Page::ResearchHalPublication < Communication::Website::Page
+class Communication::Website::Page::ResearchPublication < Communication::Website::Page
def is_necessary_for_website?
- website.connected_hal_publications.any?
+ website.connected_publications.any?
end
def editable_width?
@@ -15,7 +15,7 @@ class Communication::Website::Page::ResearchHalPublication < Communication::Webs
def dependencies
super +
[website.config_default_languages] +
- website.connected_hal_publications
+ website.connected_publications
end
protected
diff --git a/app/models/communication/website/page/with_type.rb b/app/models/communication/website/page/with_type.rb
index 2f9a6a534..a668dd3a4 100644
--- a/app/models/communication/website/page/with_type.rb
+++ b/app/models/communication/website/page/with_type.rb
@@ -19,7 +19,7 @@ module Communication::Website::Page::WithType
# Research
Communication::Website::Page::ResearchVolume,
Communication::Website::Page::ResearchPaper,
- Communication::Website::Page::ResearchHalPublication,
+ Communication::Website::Page::ResearchPublication,
# Administration
Communication::Website::Page::AdministrationLocation,
# People facets
diff --git a/app/models/communication/website/permalink/publication.rb b/app/models/communication/website/permalink/publication.rb
index 4b831579d..b4e4b193e 100644
--- a/app/models/communication/website/permalink/publication.rb
+++ b/app/models/communication/website/permalink/publication.rb
@@ -8,7 +8,7 @@ class Communication::Website::Permalink::Publication < Communication::Website::P
end
def self.pattern_in_website(website, language)
- "/#{website.special_page(Communication::Website::Page::ResearchHalPublication, language: language).slug_with_ancestors}/:year-:slug/"
+ "/#{website.special_page(Communication::Website::Page::ResearchPublication, language: language).slug_with_ancestors}/:year-:slug/"
end
protected
diff --git a/app/models/communication/website/with_connected_objects.rb b/app/models/communication/website/with_connected_objects.rb
index 497dc69b9..d04e87e18 100644
--- a/app/models/communication/website/with_connected_objects.rb
+++ b/app/models/communication/website/with_connected_objects.rb
@@ -88,9 +88,9 @@ module Communication::Website::WithConnectedObjects
University::Organization.where(id: ids)
end
- def connected_hal_publications
- ids = connections.where(indirect_object_type: 'Research::Hal::Publication').pluck(:indirect_object_id)
- Research::Hal::Publication.where(id: ids)
+ def connected_publications
+ ids = connections.where(indirect_object_type: 'Research::Publication').pluck(:indirect_object_id)
+ Research::Publication.where(id: ids)
end
# ensure the object "website" respond to both is_direct_object? and is_indirect_object? as website doesn't include neither as_direct_object nor as_indirect_object
diff --git a/app/views/admin/research/publications/static.html.erb b/app/views/admin/research/publications/static.html.erb
index 438b84b5a..e0cf8a3c6 100644
--- a/app/views/admin/research/publications/static.html.erb
+++ b/app/views/admin/research/publications/static.html.erb
@@ -3,7 +3,7 @@ title: >-
<%= @about.title %>
date: "<%= @about.publication_date&.iso8601 %>"
<%= render 'admin/application/static/breadcrumbs',
- pages: @website.special_page(Communication::Website::Page::ResearchHalPublication).ancestors_and_self,
+ pages: @website.special_page(Communication::Website::Page::ResearchPublication).ancestors_and_self,
current_title: @about.to_s %>
<%= render 'admin/application/static/permalink' %>
hal:
diff --git a/test/fixtures/research/hal/publications.yml b/test/fixtures/research/publications.yml
similarity index 78%
rename from test/fixtures/research/hal/publications.yml
rename to test/fixtures/research/publications.yml
index e7d35bb74..75e183820 100644
--- a/test/fixtures/research/hal/publications.yml
+++ b/test/fixtures/research/publications.yml
@@ -1,5 +1,5 @@
default_publication:
- docid: MyString
+ hal_docid: MyString
data:
title: MyString
url: MyString
--
GitLab