Commit 70c70aa7 authored by Jose Ivan Vargas's avatar Jose Ivan Vargas

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

Convert search tabs to Pajamas

See merge request gitlab-org/gitlab!73983
parents 76cf3501 c0d202b2
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
.scrolling-tabs-container.inner-page-scroll-tabs.is-smaller .scrolling-tabs-container.inner-page-scroll-tabs.is-smaller
.fade-left= sprite_icon('chevron-lg-left', size: 12) .fade-left= sprite_icon('chevron-lg-left', size: 12)
.fade-right= sprite_icon('chevron-lg-right', size: 12) .fade-right= sprite_icon('chevron-lg-right', size: 12)
%ul.nav-links.search-filter.scrolling-tabs.nav.nav-tabs = gl_tabs_nav({ class: 'search-filter scrolling-tabs nav-links'}) do
- if @project - if @project
- if project_search_tabs?(:blobs) - if project_search_tabs?(:blobs)
= search_filter_link 'blobs', _("Code"), data: { qa_selector: 'code_tab' } = search_filter_link 'blobs', _("Code"), data: { qa_selector: 'code_tab' }
......
...@@ -27,7 +27,7 @@ RSpec.describe 'search/_category' do ...@@ -27,7 +27,7 @@ RSpec.describe 'search/_category' do
render render
expect(rendered).to have_selector('.nav-tabs li', text: tab_name) expect(rendered).to have_selector('.search-filter li', text: tab_name)
end end
it 'hides the tab if FF is disabled' do it 'hides the tab if FF is disabled' do
...@@ -35,7 +35,7 @@ RSpec.describe 'search/_category' do ...@@ -35,7 +35,7 @@ RSpec.describe 'search/_category' do
render render
expect(rendered).not_to have_selector('.nav-tabs li', text: tab_name) expect(rendered).not_to have_selector('.search-filter li', text: tab_name)
end end
end end
...@@ -49,7 +49,7 @@ RSpec.describe 'search/_category' do ...@@ -49,7 +49,7 @@ RSpec.describe 'search/_category' do
render render
expect(rendered).to have_selector('.nav-tabs li', text: tab_name) expect(rendered).to have_selector('.search-filter li', text: tab_name)
end end
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