Commit 4361c92b authored by Jasper Maes's avatar Jasper Maes

Update gitlab-styles to 2.5.1

parent f5dd9107
...@@ -282,7 +282,7 @@ GEM ...@@ -282,7 +282,7 @@ GEM
gitlab-markup (1.6.5) gitlab-markup (1.6.5)
gitlab-sidekiq-fetcher (0.4.0) gitlab-sidekiq-fetcher (0.4.0)
sidekiq (~> 5) sidekiq (~> 5)
gitlab-styles (2.4.1) gitlab-styles (2.5.1)
rubocop (~> 0.54.0) rubocop (~> 0.54.0)
rubocop-gitlab-security (~> 0.1.0) rubocop-gitlab-security (~> 0.1.0)
rubocop-rspec (~> 1.19) rubocop-rspec (~> 1.19)
......
---
title: Update gitlab-styles to 2.5.1
merge_request: 24336
author: Jasper Maes
type: other
...@@ -55,7 +55,7 @@ describe OmniauthCallbacksController, type: :controller do ...@@ -55,7 +55,7 @@ describe OmniauthCallbacksController, type: :controller do
context 'when a redirect url is stored' do context 'when a redirect url is stored' do
it 'redirects with fragment' do it 'redirects with fragment' do
post provider, nil, { user_return_to: '/fake/url' } post provider, session: { user_return_to: '/fake/url' }
expect(response).to redirect_to('/fake/url#L101') expect(response).to redirect_to('/fake/url#L101')
end end
...@@ -63,7 +63,7 @@ describe OmniauthCallbacksController, type: :controller do ...@@ -63,7 +63,7 @@ describe OmniauthCallbacksController, type: :controller do
context 'when a redirect url with a fragment is stored' do context 'when a redirect url with a fragment is stored' do
it 'redirects with the new fragment' do it 'redirects with the new fragment' do
post provider, nil, { user_return_to: '/fake/url#replaceme' } post provider, session: { user_return_to: '/fake/url#replaceme' }
expect(response).to redirect_to('/fake/url#L101') expect(response).to redirect_to('/fake/url#L101')
end end
......
...@@ -1086,9 +1086,9 @@ describe Projects::IssuesController do ...@@ -1086,9 +1086,9 @@ describe Projects::IssuesController do
end end
def import_csv def import_csv
post :import_csv, namespace_id: project.namespace.to_param, post :import_csv, params: { namespace_id: project.namespace.to_param,
project_id: project.to_param, project_id: project.to_param,
file: file file: file }
end end
end end
......
...@@ -332,7 +332,7 @@ describe 'Dashboard Todos' do ...@@ -332,7 +332,7 @@ describe 'Dashboard Todos' do
it 'links to the pipelines for the merge request' do it 'links to the pipelines for the merge request' do
href = pipelines_project_merge_request_path(project, todo.target) href = pipelines_project_merge_request_path(project, todo.target)
expect(page).to have_link "merge request #{todo.target.to_reference(full: true)}", href expect(page).to have_link "merge request #{todo.target.to_reference(full: true)}", href: href
end end
end end
end end
...@@ -13,9 +13,9 @@ describe 'help/instance_configuration' do ...@@ -13,9 +13,9 @@ describe 'help/instance_configuration' do
it 'has links to several sections' do it 'has links to several sections' do
render render
expect(rendered).to have_link(nil, '#ssh-host-keys-fingerprints') if ssh_settings.any? expect(rendered).to have_link(nil, href: '#ssh-host-keys-fingerprints') if ssh_settings.any?
expect(rendered).to have_link(nil, '#gitlab-pages') expect(rendered).to have_link(nil, href: '#gitlab-pages')
expect(rendered).to have_link(nil, '#gitlab-ci') expect(rendered).to have_link(nil, href: '#gitlab-ci')
end end
it 'has several sections' do it 'has several sections' do
......
...@@ -54,9 +54,9 @@ describe 'projects/commit/show.html.haml' do ...@@ -54,9 +54,9 @@ describe 'projects/commit/show.html.haml' do
end end
it 'shows that it is in the context of a merge request' do it 'shows that it is in the context of a merge request' do
merge_request_url = diffs_project_merge_request_url(project, merge_request, commit_id: commit.id) merge_request_url = diffs_project_merge_request_path(project, merge_request, commit_id: commit.id)
expect(rendered).to have_content("This commit is part of merge request") expect(rendered).to have_content("This commit is part of merge request")
expect(rendered).to have_link(merge_request.to_reference, merge_request_url) expect(rendered).to have_link(merge_request.to_reference, href: merge_request_url)
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