diff options
| author | Tomasz Maczukin <tomasz@maczukin.pl> | 2017-06-05 16:15:09 +0200 |
|---|---|---|
| committer | Tomasz Maczukin <tomasz@maczukin.pl> | 2017-06-12 12:58:35 +0200 |
| commit | c70e9f2ed107ac3d0189a803eae6e7e7917f6224 (patch) | |
| tree | 5006c53ceee82297827a0c18285f728d8e1cdc6f /spec/requests | |
| parent | 8c6e2bada222745c9994da42f21bad2ab43b9351 (diff) | |
| download | gitlab-ce-c70e9f2ed107ac3d0189a803eae6e7e7917f6224.tar.gz | |
Send new configuration options with job's payload
Diffstat (limited to 'spec/requests')
| -rw-r--r-- | spec/requests/api/runner_spec.rb | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/spec/requests/api/runner_spec.rb b/spec/requests/api/runner_spec.rb index be83514ed9c..73ef58bcc42 100644 --- a/spec/requests/api/runner_spec.rb +++ b/spec/requests/api/runner_spec.rb @@ -356,8 +356,11 @@ describe API::Runner do expect(json_response['token']).to eq(job.token) expect(json_response['job_info']).to eq(expected_job_info) expect(json_response['git_info']).to eq(expected_git_info) - expect(json_response['image']).to eq({ 'name' => 'ruby:2.1' }) - expect(json_response['services']).to eq([{ 'name' => 'postgres' }]) + expect(json_response['image']).to eq({ 'name' => 'ruby:2.1', 'entrypoint' => '/bin/sh' }) + expect(json_response['services']).to eq([{ 'name' => 'postgres', 'entrypoint' => nil, + 'alias' => nil, 'command' => nil }, + { 'name' => 'docker:dind', 'entrypoint' => '/bin/sh', + 'alias' => 'docker', 'command' => 'sleep 30' }]) expect(json_response['steps']).to eq(expected_steps) expect(json_response['artifacts']).to eq(expected_artifacts) expect(json_response['cache']).to eq(expected_cache) |