Commit 35cb9087 authored by Martin Wortschack's avatar Martin Wortschack

Merge branch 'mk/fix-geo-replication-nav' into 'master'

Geo: Fix Replication Details nav links for enabled replicables

See merge request gitlab-org/gitlab!49731
parents e207ec98 945940fd
......@@ -18,9 +18,8 @@
= link_to admin_geo_designs_path, title: _('Designs') do
%span
= _('Designs')
- if Feature.enabled?(:geo_self_service_framework)
- Gitlab::Geo.enabled_replicator_classes.each do |replicator_class|
= nav_link(page: [{ controller: 'admin/geo/replicables', action: 'index', replicable_name_plural: replicator_class.replicable_name_plural }], html_options: { class: 'gl-pr-2' }) do
= link_to admin_geo_replicables_path(replicable_name_plural: replicator_class.replicable_name_plural), title: replicator_class.replicable_title_plural do
%span
= replicator_class.replicable_title_plural
- Gitlab::Geo.enabled_replicator_classes.each do |replicator_class|
= nav_link(page: [{ controller: 'admin/geo/replicables', action: 'index', replicable_name_plural: replicator_class.replicable_name_plural }], html_options: { class: 'gl-pr-2' }) do
= link_to admin_geo_replicables_path(replicable_name_plural: replicator_class.replicable_name_plural), title: replicator_class.replicable_title_plural do
%span
= replicator_class.replicable_title_plural
---
title: 'Geo: Fix replication details nav links to show any that are enabled'
merge_request: 49731
author:
type: fixed
---
name: geo_self_service_framework
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/24498
rollout_issue_url:
milestone: '12.8'
type: development
group: group::geo
default_enabled: false
......@@ -51,5 +51,15 @@ RSpec.describe 'admin Geo Replication Nav', :js, :geo do
let(:path) { admin_geo_replicables_path(replicable_name_plural: replicator_class.replicable_name_plural) }
end
end
it 'displays enable replicator replication details nav links' do
visit admin_geo_replicables_path(replicable_name_plural: 'projects')
Gitlab::Geo.enabled_replicator_classes.each do |replicator_class|
navbar = page.find(".nav-links.nav.nav-tabs")
expect(navbar).to have_link replicator_class.replicable_title_plural
end
end
end
end
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment