diff options
author | Shinya Maeda <shinya@gitlab.com> | 2018-04-17 06:07:56 +0300 |
---|---|---|
committer | Shinya Maeda <shinya@gitlab.com> | 2018-04-17 06:07:56 +0300 |
commit | 23634e45678b13954fc00fd4e57425ff5cb559aa (patch) | |
tree | 636a39d3306c664d25df413f8e6c329fcf3a8fea /spec/requests/api/runner_spec.rb | |
parent | 76485cbf8ba555c929fd2f54ca2051a382760f20 (diff) | |
parent | c39ad568e469b288a510c03b1aebefd78d8a9ee5 (diff) |
Merge branch 'master' into live-trace-v2
Diffstat (limited to 'spec/requests/api/runner_spec.rb')
-rw-r--r-- | spec/requests/api/runner_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/requests/api/runner_spec.rb b/spec/requests/api/runner_spec.rb index d130b58fb1c..d9c33a7b8ab 100644 --- a/spec/requests/api/runner_spec.rb +++ b/spec/requests/api/runner_spec.rb @@ -408,7 +408,7 @@ describe API::Runner, :clean_gitlab_redis_shared_state do 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', + { 'name' => 'docker:stable-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) |