diff options
author | Stan Hu <stanhu@gmail.com> | 2018-11-21 10:51:01 -0800 |
---|---|---|
committer | Stan Hu <stanhu@gmail.com> | 2018-11-21 22:04:17 -0800 |
commit | b8bea09e88f7d2aa4d259de98f29a0b7aa2edefe (patch) | |
tree | 0b1d5bde833714a214dabec84ad97c2995d99d4a | |
parent | 62e0877d5a2290403975667eb679dc94a2340655 (diff) | |
download | gitlab-ce-sh-fix-issue-38317.tar.gz |
Remove needless auto-capitalization on Wiki page titlessh-fix-issue-38317
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/38317
-rw-r--r-- | app/views/projects/wikis/_sidebar_wiki_page.html.haml | 2 | ||||
-rw-r--r-- | app/views/projects/wikis/edit.html.haml | 8 | ||||
-rw-r--r-- | app/views/projects/wikis/history.html.haml | 4 | ||||
-rw-r--r-- | app/views/projects/wikis/show.html.haml | 6 | ||||
-rw-r--r-- | changelogs/unreleased/sh-fix-issue-38317.yml | 5 | ||||
-rw-r--r-- | spec/features/projects/wiki/user_creates_wiki_page_spec.rb | 26 | ||||
-rw-r--r-- | spec/features/projects/wiki/user_updates_wiki_page_spec.rb | 10 | ||||
-rw-r--r-- | spec/features/projects/wiki/user_views_wiki_page_spec.rb | 12 |
8 files changed, 39 insertions, 34 deletions
diff --git a/app/views/projects/wikis/_sidebar_wiki_page.html.haml b/app/views/projects/wikis/_sidebar_wiki_page.html.haml index 2423ac6abce..daf01634c42 100644 --- a/app/views/projects/wikis/_sidebar_wiki_page.html.haml +++ b/app/views/projects/wikis/_sidebar_wiki_page.html.haml @@ -1,3 +1,3 @@ %li{ class: active_when(params[:id] == wiki_page.slug) } = link_to project_wiki_path(@project, wiki_page) do - = wiki_page.title.capitalize + = wiki_page.title diff --git a/app/views/projects/wikis/edit.html.haml b/app/views/projects/wikis/edit.html.haml index 80aa1500d53..eaceb457420 100644 --- a/app/views/projects/wikis/edit.html.haml +++ b/app/views/projects/wikis/edit.html.haml @@ -1,5 +1,5 @@ - @content_class = "limit-container-width" unless fluid_layout -- page_title _("Edit"), @page.title.capitalize, _("Wiki") +- page_title _("Edit"), @page.title, _("Wiki") = wiki_page_errors(@error) @@ -10,9 +10,9 @@ .nav-text %h2.wiki-page-title - if @page.persisted? - = link_to @page.title.capitalize, project_wiki_path(@project, @page) + = link_to @page.title, project_wiki_path(@project, @page) - else - = @page.title.capitalize + = @page.title %span.light · - if @page.persisted? @@ -28,7 +28,7 @@ = link_to project_wiki_history_path(@project, @page), class: "btn" do = s_("Wiki|Page history") - if can?(current_user, :admin_wiki, @project) - #delete-wiki-modal-wrapper{ data: { delete_wiki_url: project_wiki_path(@project, @page), page_title: @page.title.capitalize } } + #delete-wiki-modal-wrapper{ data: { delete_wiki_url: project_wiki_path(@project, @page), page_title: @page.title } } = render 'form', uploads_path: wiki_attachment_upload_url diff --git a/app/views/projects/wikis/history.html.haml b/app/views/projects/wikis/history.html.haml index 969a1677d9a..622c644ccbd 100644 --- a/app/views/projects/wikis/history.html.haml +++ b/app/views/projects/wikis/history.html.haml @@ -1,4 +1,4 @@ -- page_title _("History"), @page.title.capitalize, _("Wiki") +- page_title _("History"), @page.title, _("Wiki") .wiki-page-header.has-sidebar-toggle %button.btn.btn-default.sidebar-toggle.js-sidebar-wiki-toggle{ role: "button", type: "button" } @@ -6,7 +6,7 @@ .nav-text %h2.wiki-page-title - = link_to @page.title.capitalize, project_wiki_path(@project, @page) + = link_to @page.title, project_wiki_path(@project, @page) %span.light · = _("History") diff --git a/app/views/projects/wikis/show.html.haml b/app/views/projects/wikis/show.html.haml index fbf248c2058..ca15dfb7f71 100644 --- a/app/views/projects/wikis/show.html.haml +++ b/app/views/projects/wikis/show.html.haml @@ -1,7 +1,7 @@ - @content_class = "limit-container-width" unless fluid_layout -- breadcrumb_title @page.title.capitalize +- breadcrumb_title @page.title - wiki_breadcrumb_dropdown_links(@page.slug) -- page_title @page.title.capitalize, _("Wiki") +- page_title @page.title, _("Wiki") - add_to_breadcrumbs _("Wiki"), get_project_wiki_path(@project) .wiki-page-header.has-sidebar-toggle @@ -9,7 +9,7 @@ = icon('angle-double-left') .nav-text - %h2.wiki-page-title= @page.title.capitalize + %h2.wiki-page-title= @page.title %span.wiki-last-edit-by - if @page.last_version = (_("Last edited by %{name}") % { name: "<strong>#{@page.last_version.author_name}</strong>" }).html_safe diff --git a/changelogs/unreleased/sh-fix-issue-38317.yml b/changelogs/unreleased/sh-fix-issue-38317.yml new file mode 100644 index 00000000000..13fcb5b8f96 --- /dev/null +++ b/changelogs/unreleased/sh-fix-issue-38317.yml @@ -0,0 +1,5 @@ +--- +title: Remove needless auto-capitalization on Wiki page titles +merge_request: 23288 +author: +type: fixed diff --git a/spec/features/projects/wiki/user_creates_wiki_page_spec.rb b/spec/features/projects/wiki/user_creates_wiki_page_spec.rb index 571104d3467..fa870df2b71 100644 --- a/spec/features/projects/wiki/user_creates_wiki_page_spec.rb +++ b/spec/features/projects/wiki/user_creates_wiki_page_spec.rb @@ -36,7 +36,7 @@ describe "User creates wiki page" do click_on("Create page") end - expect(page).to have_content("Home").and have_content("link test") + expect(page).to have_content("home").and have_content("link test") click_link("link test") @@ -76,7 +76,7 @@ describe "User creates wiki page" do expect(current_path).to eq(project_wiki_path(project, "home")) expect(page).to have_content("test GitLab API doc Rake tasks Wiki header") - .and have_content("Home") + .and have_content("home") .and have_content("Last edited by #{user.name}") .and have_header_with_correct_id_and_link(1, "Wiki header", "wiki-header") @@ -85,10 +85,10 @@ describe "User creates wiki page" do expect(current_path).to eq(project_wiki_path(project, "test")) page.within(:css, ".nav-text") do - expect(page).to have_content("Test").and have_content("Create Page") + expect(page).to have_content("test").and have_content("Create Page") end - click_link("Home") + click_link("home") expect(current_path).to eq(project_wiki_path(project, "home")) @@ -97,10 +97,10 @@ describe "User creates wiki page" do expect(current_path).to eq(project_wiki_path(project, "api")) page.within(:css, ".nav-text") do - expect(page).to have_content("Create").and have_content("Api") + expect(page).to have_content("Create").and have_content("api") end - click_link("Home") + click_link("home") expect(current_path).to eq(project_wiki_path(project, "home")) @@ -109,7 +109,7 @@ describe "User creates wiki page" do expect(current_path).to eq(project_wiki_path(project, "raketasks")) page.within(:css, ".nav-text") do - expect(page).to have_content("Create").and have_content("Rake") + expect(page).to have_content("Create").and have_content("rake") end end @@ -164,7 +164,7 @@ describe "User creates wiki page" do click_button("Create page") end - expect(page).to have_content("Home") + expect(page).to have_content("home") .and have_content("Last edited by #{user.name}") .and have_content("My awesome wiki!") end @@ -200,7 +200,7 @@ describe "User creates wiki page" do click_button("Create page") end - expect(page).to have_content("Foo") + expect(page).to have_content("foo") .and have_content("Last edited by #{user.name}") .and have_content("My awesome wiki!") end @@ -223,7 +223,7 @@ describe "User creates wiki page" do click_button("Create page") end - expect(page).to have_content("Spaces in the name") + expect(page).to have_content("spaces in the name") .and have_content("Last edited by #{user.name}") .and have_content("My awesome wiki!") end @@ -246,7 +246,7 @@ describe "User creates wiki page" do click_button("Create page") end - expect(page).to have_content("Hyphens in the name") + expect(page).to have_content("hyphens in the name") .and have_content("Last edited by #{user.name}") .and have_content("My awesome wiki!") end @@ -293,7 +293,7 @@ describe "User creates wiki page" do click_button("Create page") end - expect(page).to have_content("Foo") + expect(page).to have_content("foo") .and have_content("Last edited by #{user.name}") .and have_content("My awesome wiki!") end @@ -311,7 +311,7 @@ describe "User creates wiki page" do it 'renders a default sidebar when there is no customized sidebar' do visit(project_wikis_path(project)) - expect(page).to have_content('Another') + expect(page).to have_content('another') expect(page).to have_content('More Pages') end diff --git a/spec/features/projects/wiki/user_updates_wiki_page_spec.rb b/spec/features/projects/wiki/user_updates_wiki_page_spec.rb index 2ce5ee0e87d..582837a8b06 100644 --- a/spec/features/projects/wiki/user_updates_wiki_page_spec.rb +++ b/spec/features/projects/wiki/user_updates_wiki_page_spec.rb @@ -40,11 +40,11 @@ describe 'User updates wiki page' do end expect(current_path).to include('one/two/three-test') - expect(find('.wiki-pages')).to have_content('Three') + expect(find('.wiki-pages')).to have_content('three') - first(:link, text: 'Three').click + first(:link, text: 'three').click - expect(find('.nav-text')).to have_content('Three') + expect(find('.nav-text')).to have_content('three') click_on('Edit') @@ -81,7 +81,7 @@ describe 'User updates wiki page' do fill_in(:wiki_content, with: 'My awesome wiki!') click_button('Save changes') - expect(page).to have_content('Home') + expect(page).to have_content('home') expect(page).to have_content("Last edited by #{user.name}") expect(page).to have_content('My awesome wiki!') end @@ -141,7 +141,7 @@ describe 'User updates wiki page' do click_button('Save changes') - expect(page).to have_content('Home') + expect(page).to have_content('home') expect(page).to have_content("Last edited by #{user.name}") expect(page).to have_content('My awesome wiki!') end diff --git a/spec/features/projects/wiki/user_views_wiki_page_spec.rb b/spec/features/projects/wiki/user_views_wiki_page_spec.rb index 4b974a3ca10..7b9bc20f5a1 100644 --- a/spec/features/projects/wiki/user_views_wiki_page_spec.rb +++ b/spec/features/projects/wiki/user_views_wiki_page_spec.rb @@ -39,7 +39,7 @@ describe 'User views a wiki page' do it 'shows the history of a page that has a path', :js do expect(current_path).to include('one/two/three-test') - first(:link, text: 'Three').click + first(:link, text: 'three').click click_on('Page history') expect(current_path).to include('one/two/three-test') @@ -51,11 +51,11 @@ describe 'User views a wiki page' do it 'shows an old version of a page', :js do expect(current_path).to include('one/two/three-test') - expect(find('.wiki-pages')).to have_content('Three') + expect(find('.wiki-pages')).to have_content('three') - first(:link, text: 'Three').click + first(:link, text: 'three').click - expect(find('.nav-text')).to have_content('Three') + expect(find('.nav-text')).to have_content('three') click_on('Edit') @@ -82,7 +82,7 @@ describe 'User views a wiki page' do it 'shows all the pages' do expect(page).to have_content(user.name) - expect(find('.wiki-pages')).to have_content(wiki_page.title.capitalize) + expect(find('.wiki-pages')).to have_content(wiki_page.title) end context 'shows a file stored in a page' do @@ -160,7 +160,7 @@ describe 'User views a wiki page' do find('.shortcuts-wiki').click click_link "Create your first page" - expect(page).to have_content('Home · Create Page') + expect(page).to have_content('home · Create Page') end end |