Commit b026a885 authored by Kushal Pandya's avatar Kushal Pandya

Merge branch '263175-wiki-dropdown' into 'master'

Make wiki sort dropdown pajamas compliant

See merge request gitlab-org/gitlab!80801
parents bd1792dd 864d0cf8
- add_to_breadcrumbs _('Wiki'), wiki_path(@wiki) - add_to_breadcrumbs _('Wiki'), wiki_path(@wiki)
- breadcrumb_title s_("Wiki|Pages") - breadcrumb_title s_("Wiki|Pages")
- page_title s_("Wiki|Pages"), _("Wiki") - page_title s_("Wiki|Pages"), _("Wiki")
- sort_title = wiki_sort_title(params[:sort])
- add_page_specific_style 'page_bundles/wiki' - add_page_specific_style 'page_bundles/wiki'
- wiki_sort_options = [{ text: s_("Wiki|Title"), value: 'title', href: wiki_path(@wiki, action: :pages, sort: Wiki::TITLE_ORDER)}, { text: s_("Wiki|Created date"), value: 'created_at', href: wiki_path(@wiki, action: :pages, sort: Wiki::CREATED_AT_ORDER) }]
.wiki-page-header.top-area.flex-column.flex-lg-row .wiki-page-header.top-area.flex-column.flex-lg-row
%h3.page-title.gl-flex-grow-1 %h3.page-title.gl-flex-grow-1
...@@ -15,14 +15,7 @@ ...@@ -15,14 +15,7 @@
.dropdown.inline.wiki-sort-dropdown .dropdown.inline.wiki-sort-dropdown
.btn-group{ role: 'group' } .btn-group{ role: 'group' }
.btn-group{ role: 'group' } = gl_redirect_listbox_tag wiki_sort_options, params[:sort], data: { right: true }
%button.dropdown-toggle{ type: 'button', data: { toggle: 'dropdown', display: 'static' }, class: 'btn gl-button btn-default' }
= sort_title
= sprite_icon('chevron-down')
%ul.dropdown-menu.dropdown-menu-right.dropdown-menu-selectable.dropdown-menu-sort
%li
= sortable_item(s_("Wiki|Title"), wiki_path(@wiki, action: :pages, sort: Wiki::TITLE_ORDER), sort_title)
= sortable_item(s_("Wiki|Created date"), wiki_path(@wiki, action: :pages, sort: Wiki::CREATED_AT_ORDER), sort_title)
= wiki_sort_controls(@wiki, params[:sort], params[:direction]) = wiki_sort_controls(@wiki, params[:sort], params[:direction])
%ul.wiki-pages-list.content-list %ul.wiki-pages-list.content-list
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
require "spec_helper" require "spec_helper"
RSpec.describe 'Group wikis' do RSpec.describe 'Group wikis', :js do
include WikiHelpers include WikiHelpers
let_it_be(:user) { create(:user) } let_it_be(:user) { create(:user) }
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
require "spec_helper" require "spec_helper"
RSpec.describe 'Project wikis' do RSpec.describe 'Project wikis', :js do
let_it_be(:user) { create(:user) } let_it_be(:user) { create(:user) }
let(:wiki) { create(:project_wiki, user: user, project: project) } let(:wiki) { create(:project_wiki, user: user, project: project) }
......
...@@ -93,13 +93,12 @@ RSpec.shared_examples 'User views a wiki page' do ...@@ -93,13 +93,12 @@ RSpec.shared_examples 'User views a wiki page' do
let(:path) { upload_file_to_wiki(wiki, user, 'dk.png') } let(:path) { upload_file_to_wiki(wiki, user, 'dk.png') }
it do it do
expect(page).to have_xpath("//img[@data-src='#{wiki.wiki_base_path}/#{path}']") expect(page).to have_xpath("//img[@src='#{wiki.wiki_base_path}/#{path}']")
expect(page).to have_link('image', href: "#{wiki.wiki_base_path}/#{path}") expect(page).to have_link('image', href: "#{wiki.wiki_base_path}/#{path}")
click_on('image') click_on('image')
expect(current_path).to match("wikis/#{path}") expect(current_path).to match("wikis/#{path}")
expect(page).not_to have_xpath('/html') # Page should render the image which means there is no html involved
end end
end end
......
...@@ -60,7 +60,7 @@ RSpec.shared_examples 'User views wiki pages' do ...@@ -60,7 +60,7 @@ RSpec.shared_examples 'User views wiki pages' do
before do before do
page.within('.wiki-sort-dropdown') do page.within('.wiki-sort-dropdown') do
click_button('Title') click_button('Title')
click_link('Created date') click_button('Created date')
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