Commit 595a092a authored by Thong Kuah's avatar Thong Kuah

Fix frozen string error

parent f0391c25
...@@ -13,7 +13,7 @@ describe 'User browses commits' do ...@@ -13,7 +13,7 @@ describe 'User browses commits' do
it 'renders commit' do it 'renders commit' do
visit project_commit_path(project, sample_commit.id) visit project_commit_path(project, sample_commit.id)
expect(page).to have_content(sample_commit.message.gsub!(/\s+/, ' ')) expect(page).to have_content(sample_commit.message.gsub(/\s+/, ' '))
.and have_content("Showing #{sample_commit.files_changed_count} changed files") .and have_content("Showing #{sample_commit.files_changed_count} changed files")
.and have_content('Side-by-side') .and have_content('Side-by-side')
end end
......
...@@ -32,12 +32,13 @@ module ApiHelpers ...@@ -32,12 +32,13 @@ module ApiHelpers
end end
if query_string if query_string
full_path << (path.index('?') ? '&' : '?') separator = path.index('?') ? '&' : '?'
full_path << query_string
end
full_path + separator + query_string
else
full_path full_path
end end
end
def expect_paginated_array_response(items) def expect_paginated_array_response(items)
expect(response).to have_gitlab_http_status(200) expect(response).to have_gitlab_http_status(200)
......
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