Commit 867ac4d1 authored by Luke Duncalfe's avatar Luke Duncalfe

Change double quote strings to single quotes

parent aa352a95
...@@ -907,7 +907,7 @@ describe API::Internal do ...@@ -907,7 +907,7 @@ describe API::Internal do
expect(PostReceive).to receive(:perform_async) expect(PostReceive).to receive(:perform_async)
.with(gl_repository, identifier, changes, push_options) .with(gl_repository, identifier, changes, push_options)
post api("/internal/post_receive"), params: valid_params post api('/internal/post_receive'), params: valid_params
end end
it 'decreases the reference counter and returns the result' do it 'decreases the reference counter and returns the result' do
...@@ -915,13 +915,13 @@ describe API::Internal do ...@@ -915,13 +915,13 @@ describe API::Internal do
.and_return(reference_counter) .and_return(reference_counter)
expect(reference_counter).to receive(:decrease).and_return(true) expect(reference_counter).to receive(:decrease).and_return(true)
post api("/internal/post_receive"), params: valid_params post api('/internal/post_receive'), params: valid_params
expect(json_response['reference_counter_decreased']).to be(true) expect(json_response['reference_counter_decreased']).to be(true)
end end
it 'returns link to create new merge request' do it 'returns link to create new merge request' do
post api("/internal/post_receive"), params: valid_params post api('/internal/post_receive'), params: valid_params
expect(json_response['merge_request_urls']).to match [{ expect(json_response['merge_request_urls']).to match [{
"branch_name" => "new_branch", "branch_name" => "new_branch",
...@@ -933,7 +933,7 @@ describe API::Internal do ...@@ -933,7 +933,7 @@ describe API::Internal do
it 'returns empty array if printing_merge_request_link_enabled is false' do it 'returns empty array if printing_merge_request_link_enabled is false' do
project.update!(printing_merge_request_link_enabled: false) project.update!(printing_merge_request_link_enabled: false)
post api("/internal/post_receive"), params: valid_params post api('/internal/post_receive'), params: valid_params
expect(json_response['merge_request_urls']).to eq([]) expect(json_response['merge_request_urls']).to eq([])
end end
...@@ -941,7 +941,7 @@ describe API::Internal do ...@@ -941,7 +941,7 @@ describe API::Internal do
it 'does not invoke MergeRequests::PushOptionsHandlerService' do it 'does not invoke MergeRequests::PushOptionsHandlerService' do
expect(MergeRequests::PushOptionsHandlerService).not_to receive(:new) expect(MergeRequests::PushOptionsHandlerService).not_to receive(:new)
post api("/internal/post_receive"), params: valid_params post api('/internal/post_receive'), params: valid_params
end end
context 'when there are merge_request push options' do context 'when there are merge_request push options' do
...@@ -952,16 +952,16 @@ describe API::Internal do ...@@ -952,16 +952,16 @@ describe API::Internal do
it 'invokes MergeRequests::PushOptionsHandlerService' do it 'invokes MergeRequests::PushOptionsHandlerService' do
expect(MergeRequests::PushOptionsHandlerService).to receive(:new) expect(MergeRequests::PushOptionsHandlerService).to receive(:new)
post api("/internal/post_receive"), params: valid_params post api('/internal/post_receive'), params: valid_params
end end
it 'links to the newly created merge request' do it 'links to the newly created merge request' do
post api("/internal/post_receive"), params: valid_params post api('/internal/post_receive'), params: valid_params
expect(json_response['merge_request_urls']).to match [{ expect(json_response['merge_request_urls']).to match [{
"branch_name" => "new_branch", 'branch_name' => 'new_branch',
"url" => "http://#{Gitlab.config.gitlab.host}/#{project.namespace.name}/#{project.path}/merge_requests/1", 'url' => "http://#{Gitlab.config.gitlab.host}/#{project.namespace.name}/#{project.path}/merge_requests/1",
"new_merge_request" => false 'new_merge_request' => false
}] }]
end end
...@@ -970,7 +970,7 @@ describe API::Internal do ...@@ -970,7 +970,7 @@ describe API::Internal do
MergeRequests::PushOptionsHandlerService::Error, 'my warning' MergeRequests::PushOptionsHandlerService::Error, 'my warning'
) )
post api("/internal/post_receive"), params: valid_params post api('/internal/post_receive'), params: valid_params
expect(json_response['warnings']).to eq('Error encountered with push options \'merge_request.create\': my warning') expect(json_response['warnings']).to eq('Error encountered with push options \'merge_request.create\': my warning')
end end
...@@ -980,7 +980,7 @@ describe API::Internal do ...@@ -980,7 +980,7 @@ describe API::Internal do
MergeRequests::PushOptionsHandlerService MergeRequests::PushOptionsHandlerService
).to receive(:errors).at_least(:once).and_return(['my error']) ).to receive(:errors).at_least(:once).and_return(['my error'])
post api("/internal/post_receive"), params: valid_params post api('/internal/post_receive'), params: valid_params
expect(json_response['warnings']).to eq('Error encountered with push options \'merge_request.create\': my error') expect(json_response['warnings']).to eq('Error encountered with push options \'merge_request.create\': my error')
end end
...@@ -993,7 +993,7 @@ describe API::Internal do ...@@ -993,7 +993,7 @@ describe API::Internal do
MergeRequests::CreateService MergeRequests::CreateService
).to receive(:execute).and_return(invalid_merge_request) ).to receive(:execute).and_return(invalid_merge_request)
post api("/internal/post_receive"), params: valid_params post api('/internal/post_receive'), params: valid_params
expect(json_response['warnings']).to eq('Error encountered with push options \'merge_request.create\': my error') expect(json_response['warnings']).to eq('Error encountered with push options \'merge_request.create\': my error')
end end
...@@ -1003,7 +1003,7 @@ describe API::Internal do ...@@ -1003,7 +1003,7 @@ describe API::Internal do
let!(:broadcast_message) { create(:broadcast_message, starts_at: 1.day.ago, ends_at: 1.day.from_now ) } let!(:broadcast_message) { create(:broadcast_message, starts_at: 1.day.ago, ends_at: 1.day.from_now ) }
it 'returns one broadcast message' do it 'returns one broadcast message' do
post api("/internal/post_receive"), params: valid_params post api('/internal/post_receive'), params: valid_params
expect(response).to have_gitlab_http_status(200) expect(response).to have_gitlab_http_status(200)
expect(json_response['broadcast_message']).to eq(broadcast_message.message) expect(json_response['broadcast_message']).to eq(broadcast_message.message)
...@@ -1012,7 +1012,7 @@ describe API::Internal do ...@@ -1012,7 +1012,7 @@ describe API::Internal do
context 'broadcast message does not exist' do context 'broadcast message does not exist' do
it 'returns empty string' do it 'returns empty string' do
post api("/internal/post_receive"), params: valid_params post api('/internal/post_receive'), params: valid_params
expect(response).to have_gitlab_http_status(200) expect(response).to have_gitlab_http_status(200)
expect(json_response['broadcast_message']).to eq(nil) expect(json_response['broadcast_message']).to eq(nil)
...@@ -1023,7 +1023,7 @@ describe API::Internal do ...@@ -1023,7 +1023,7 @@ describe API::Internal do
it 'returns empty string' do it 'returns empty string' do
allow(BroadcastMessage).to receive(:current).and_return(nil) allow(BroadcastMessage).to receive(:current).and_return(nil)
post api("/internal/post_receive"), params: valid_params post api('/internal/post_receive'), params: valid_params
expect(response).to have_gitlab_http_status(200) expect(response).to have_gitlab_http_status(200)
expect(json_response['broadcast_message']).to eq(nil) expect(json_response['broadcast_message']).to eq(nil)
...@@ -1035,7 +1035,7 @@ describe API::Internal do ...@@ -1035,7 +1035,7 @@ describe API::Internal do
project_moved = Gitlab::Checks::ProjectMoved.new(project, user, 'http', 'foo/baz') project_moved = Gitlab::Checks::ProjectMoved.new(project, user, 'http', 'foo/baz')
project_moved.add_message project_moved.add_message
post api("/internal/post_receive"), params: valid_params post api('/internal/post_receive'), params: valid_params
expect(response).to have_gitlab_http_status(200) expect(response).to have_gitlab_http_status(200)
expect(json_response["redirected_message"]).to be_present expect(json_response["redirected_message"]).to be_present
...@@ -1048,7 +1048,7 @@ describe API::Internal do ...@@ -1048,7 +1048,7 @@ describe API::Internal do
project_created = Gitlab::Checks::ProjectCreated.new(project, user, 'http') project_created = Gitlab::Checks::ProjectCreated.new(project, user, 'http')
project_created.add_message project_created.add_message
post api("/internal/post_receive"), params: valid_params post api('/internal/post_receive'), params: valid_params
expect(response).to have_gitlab_http_status(200) expect(response).to have_gitlab_http_status(200)
expect(json_response["project_created_message"]).to be_present expect(json_response["project_created_message"]).to be_present
...@@ -1060,7 +1060,7 @@ describe API::Internal do ...@@ -1060,7 +1060,7 @@ describe API::Internal do
it 'does not try to notify that project moved' do it 'does not try to notify that project moved' do
allow_any_instance_of(Gitlab::Identifier).to receive(:identify).and_return(nil) allow_any_instance_of(Gitlab::Identifier).to receive(:identify).and_return(nil)
post api("/internal/post_receive"), params: valid_params post api('/internal/post_receive'), params: valid_params
expect(response).to have_gitlab_http_status(200) expect(response).to have_gitlab_http_status(200)
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