Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature: Add federation tests #918

Merged
merged 14 commits into from
Feb 6, 2025
Merged

Feature: Add federation tests #918

Show file tree
Hide file tree
Changes from 11 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
5b03474
update test config file
Bilelkihal Jan 16, 2025
03f4ade
add system federation tests to test basic browse and search pages fed…
Bilelkihal Jan 16, 2025
79e7b0b
peforme federated search in search page and make sure federation is w…
Bilelkihal Jan 30, 2025
e42ab74
perform federated browse and make sure federation is working
Bilelkihal Jan 30, 2025
d0e2b98
make sure federated categories are working on browse page
Bilelkihal Jan 30, 2025
11360ee
federate only with one portal to make requests faster
Bilelkihal Jan 30, 2025
798119b
add comments to explain federation tests
Bilelkihal Jan 30, 2025
031e1b9
test federated search and browse pages when a portal is down
Bilelkihal Jan 31, 2025
7cbc379
Merge branch 'development' into feature/add-federation-tests
Bilelkihal Jan 31, 2025
b68d3a8
fix a merging issue in display_in_multiple_languages
syphax-bouazzouni Jan 31, 2025
4a91241
fix annotator url in test config to make tests pass
Bilelkihal Feb 3, 2025
c1c8470
update test configs to minimize changes to play safe
Bilelkihal Feb 4, 2025
6855486
use development branch for client gem
Bilelkihal Feb 4, 2025
d547bfd
Merge branch 'development' into feature/add-federation-tests
Bilelkihal Feb 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ gem 'iso-639', '~> 0.3.6'
gem 'countries', '~> 5.7'

# Custom API client
gem 'ontologies_api_client', git: 'https://github.com/ontoportal-lirmm/ontologies_api_ruby_client.git', branch: 'development'
gem 'ontologies_api_client', git: 'https://github.com/ontoportal-lirmm/ontologies_api_ruby_client.git', branch: 'fix/federation-requests-timeout'
Bilelkihal marked this conversation as resolved.
Show resolved Hide resolved
# Ruby 2.7.8 pinned gems (to remove when migrating to Ruby >= 3.0)

gem 'ffi', '~> 1.16.3'
Expand Down
6 changes: 3 additions & 3 deletions Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
GIT
remote: https://github.com/ontoportal-lirmm/ontologies_api_ruby_client.git
revision: 7423b46ff6fa7e5ef0f1d36548f7c04466939f71
branch: development
revision: ba4e729462c8887d744ca1cbccfdd96da5947328
branch: fix/federation-requests-timeout
specs:
ontologies_api_client (2.2.0)
activesupport (~> 7.0.4)
excon
excon (= 0.112.0)
faraday
faraday-excon (~> 2.0.0)
faraday-multipart
Expand Down
2 changes: 1 addition & 1 deletion app/helpers/multi_languages_helper.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ def main_language_label(label)
end

# @param label String | Array | OpenStruct
def display_in_multiple_languages(label)
def display_in_multiple_languages(label, show_max: 5, style_as_badge: false)
Bilelkihal marked this conversation as resolved.
Show resolved Hide resolved
if label.blank?
return render Display::AlertComponent.new(message: t('ontology_details.concept.no_preferred_name_for_selected_language'),
type: "warning",
Expand Down
Loading
Loading