diff options
author | Thong Kuah <tkuah@gitlab.com> | 2019-07-25 20:20:27 +1200 |
---|---|---|
committer | Thong Kuah <tkuah@gitlab.com> | 2019-07-25 21:33:18 +1200 |
commit | 595a092a083a9a16cad12dc663cad1a674551a51 (patch) | |
tree | 08fc36c7aad40429efafe62b273bd006165654a6 | |
parent | f0391c2517879bbb73702ccafd5e02bf25b40eec (diff) | |
download | gitlab-ce-595a092a083a9a16cad12dc663cad1a674551a51.tar.gz |
Fix frozen string error
-rw-r--r-- | spec/features/projects/commits/user_browses_commits_spec.rb | 2 | ||||
-rw-r--r-- | spec/support/helpers/api_helpers.rb | 9 |
2 files changed, 6 insertions, 5 deletions
diff --git a/spec/features/projects/commits/user_browses_commits_spec.rb b/spec/features/projects/commits/user_browses_commits_spec.rb index fc74a370e72..818939c1b96 100644 --- a/spec/features/projects/commits/user_browses_commits_spec.rb +++ b/spec/features/projects/commits/user_browses_commits_spec.rb @@ -13,7 +13,7 @@ describe 'User browses commits' do it 'renders commit' do 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('Side-by-side') end diff --git a/spec/support/helpers/api_helpers.rb b/spec/support/helpers/api_helpers.rb index e0e875186f0..aff0f87b6e4 100644 --- a/spec/support/helpers/api_helpers.rb +++ b/spec/support/helpers/api_helpers.rb @@ -32,11 +32,12 @@ module ApiHelpers end if query_string - full_path << (path.index('?') ? '&' : '?') - full_path << query_string - end + separator = path.index('?') ? '&' : '?' - full_path + full_path + separator + query_string + else + full_path + end end def expect_paginated_array_response(items) |