root
/
gitlab-ce
mirror of https://gitlab.com/free-releases/gitlab-ce.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Fix failing tests.

This commit is contained in:
Connor Shea 2016-07-11 16:11:33 -06:00
parent bd09b2d563
commit c30b325781
No known key found for this signature in database
GPG Key ID: E52237E5B35A83E6
3 changed files with 15 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/views/projects/protected_branches/index.html.haml
View File

@ -23,7 +23,7 @@
= f.label :name, "Branch", class: "label-light" = f.label :name, "Branch", class: "label-light"
= render partial: "dropdown", locals: { f: f } = render partial: "dropdown", locals: { f: f }
%p.help-block %p.help-block
= link_to "Wildcards", help_page_path(category: 'workflow', file: 'protected_branches', format: 'md', anchor: "wildcard-protected-branches") = link_to "Wildcards", help_page_path('workflow/protected_branches', anchor: "wildcard-protected-branches")
such as such as
%code *-stable %code *-stable
or or

13
spec/controllers/help_controller_spec.rb
View File

@ -11,7 +11,7 @@ describe HelpController do
context 'for Markdown formats' do context 'for Markdown formats' do
context 'when requested file exists' do context 'when requested file exists' do
before do before do
get :show, category: 'ssh', file: 'README', format: :md get :show, path: 'ssh/README', format: :md
end end
it 'assigns to @markdown' do it 'assigns to @markdown' do
@ -26,7 +26,7 @@ describe HelpController do
context 'when requested file is missing' do context 'when requested file is missing' do
it 'renders not found' do it 'renders not found' do
get :show, category: 'foo', file: 'bar', format: :md get :show, path: 'foo/bar', format: :md
expect(response).to be_not_found expect(response).to be_not_found
end end
end end
@ -36,8 +36,7 @@ describe HelpController do
context 'when requested file exists' do context 'when requested file exists' do
it 'renders the raw file' do it 'renders the raw file' do
get :show, get :show,
category: 'workflow/protected_branches', path: 'workflow/protected_branches/protected_branches1',
file: 'protected_branches1',
format: :png format: :png
expect(response).to be_success expect(response).to be_success
expect(response.content_type).to eq 'image/png' expect(response.content_type).to eq 'image/png'
@ -48,8 +47,7 @@ describe HelpController do
context 'when requested file is missing' do context 'when requested file is missing' do
it 'renders not found' do it 'renders not found' do
get :show, get :show,
category: 'foo', path: 'foo/bar',
file: 'bar',
format: :png format: :png
expect(response).to be_not_found expect(response).to be_not_found
end end
@ -59,8 +57,7 @@ describe HelpController do
context 'for other formats' do context 'for other formats' do
it 'always renders not found' do it 'always renders not found' do
get :show, get :show,
category: 'ssh', path: 'ssh/README',
file: 'README',
format: :foo format: :foo
expect(response).to be_not_found expect(response).to be_not_found
end end

22
spec/routing/routing_spec.rb
View File

@ -98,7 +98,7 @@ describe SnippetsController, "routing" do
end end
# help GET /help(.:format) help#index # help GET /help(.:format) help#index
# help_page GET /help/:category/:file(.:format) help#show {:category=>/.*/, :file=>/[^\/\.]+/} # help_page GET /help/*path(.:format) help#show
# help_shortcuts GET /help/shortcuts(.:format) help#shortcuts # help_shortcuts GET /help/shortcuts(.:format) help#shortcuts
# help_ui GET /help/ui(.:format) help#ui # help_ui GET /help/ui(.:format) help#ui
describe HelpController, "routing" do describe HelpController, "routing" do
@ -109,23 +109,19 @@ describe HelpController, "routing" do
it 'to #show' do it 'to #show' do
path = '/help/markdown/markdown.md' path = '/help/markdown/markdown.md'
expect(get(path)).to route_to('help#show', expect(get(path)).to route_to('help#show',
category: 'markdown', path: 'markdown/markdown',
file: 'markdown',
format: 'md') format: 'md')
path = '/help/workflow/protected_branches/protected_branches1.png' path = '/help/workflow/protected_branches/protected_branches1.png'
expect(get(path)).to route_to('help#show', expect(get(path)).to route_to('help#show',
category: 'workflow/protected_branches', path: 'workflow/protected_branches/protected_branches1',
file: 'protected_branches1',
format: 'png') format: 'png')
end path = '/help/shortcuts'
expect(get(path)).to route_to('help#show',
it 'to #shortcuts' do path: 'shortcuts')
expect(get('/help/shortcuts')).to route_to('help#shortcuts') path = '/help/ui'
end expect(get(path)).to route_to('help#show',
path: 'ui')
it 'to #ui' do
expect(get('/help/ui')).to route_to('help#ui')
end end
end end