Commit 8c55672c authored by Mark Florian's avatar Mark Florian

Merge branch '230788-migrate-haml-nav-to-gltabs' into 'master'

Convert labels page tabs to Pajamas

See merge request gitlab-org/gitlab!74006
parents ef845d5a dabe2bc2
- subscribed = params[:subscribed]
.top-area.adjust
%ul.nav-links.nav.nav-tabs
%li{ class: active_when(subscribed != 'true') }>
= link_to labels_filter_path do
= _('All')
= gl_tabs_nav({ class: 'gl-flex-grow-1 gl-border-0' }) do
= gl_tab_link_to _('All'), labels_filter_path, { item_active: subscribed != 'true' }
- if current_user
%li{ class: active_when(subscribed == 'true') }>
= link_to labels_filter_path(subscribed: 'true') do
= _('Subscribed')
= gl_tab_link_to _('Subscribed'), labels_filter_path(subscribed: 'true'), { item_active: subscribed == 'true' }
.nav-controls
= form_tag labels_filter_path, method: :get do
= hidden_field_tag :subscribed, params[:subscribed]
......
......@@ -71,7 +71,7 @@ RSpec.describe 'Labels subscription' do
end
it 'does not show subscribed tab' do
page.within('.nav-tabs') do
page.within('.gl-tabs-nav') do
expect(page).not_to have_link 'Subscribed'
end
end
......@@ -86,7 +86,7 @@ RSpec.describe 'Labels subscription' do
end
def click_subscribed_tab
page.within('.nav-tabs') do
page.within('.gl-tabs-nav') do
click_link 'Subscribed'
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