diff options
author | Lin Jen-Shin <godfat@godfat.org> | 2017-06-14 11:23:41 +0300 |
---|---|---|
committer | Lin Jen-Shin <godfat@godfat.org> | 2017-06-14 11:23:41 +0300 |
commit | 931ab01adba637f6c36a976a19250e93096bc552 (patch) | |
tree | 8c2e0de40b88abc7d2b92bb0705351e28c1ec425 /spec/requests | |
parent | f99cee8e9cfcc8eaf340e487503682bb5699591a (diff) | |
parent | b29bf62602b6e962ceb31dd7535743a7d8c4864c (diff) |
Merge remote-tracking branch 'upstream/master' into 33149-rename-more-builds
* upstream/master: (34 commits)
Revert "Merge branch 'karma-headless-chrome' into 'master'"
Make small pipeline schedules UI enhancements.
Remove js classes from vue component that are not needed in vue component
Update tests and application
Adds "Pipeline" to job's sidebar
Change border color of job's scroll controllers to $border-color
Add database helpers 'add_timestamps_with_timezone' and 'timestamps_with_timezone'
Added Tectonic to the page.
Always check read_issue permissions when loading issue
Handle legacy jobs without name
Do not expose internal artifacts hash in build entity
Use wait_for_requests instead of sleep 0.3
Limit wiki container width
Fix migrations testing support RSpec hooks order
Rename BuildEntity to JobEntity
Fix support for external_url for commit statuses
Allow to access pipelines even if they are disabled, but only present jobs and commit statuses without giving ability to access them
add CHANGELOG.md entry for !12036
remove phantomjs-specific test hacks
update karma job to use chrome build image created by gitlab-build-images!41
...
Diffstat (limited to 'spec/requests')
-rw-r--r-- | spec/requests/api/runner_spec.rb | 7 | ||||
-rw-r--r-- | spec/requests/ci/api/builds_spec.rb | 12 |
2 files changed, 17 insertions, 2 deletions
diff --git a/spec/requests/api/runner_spec.rb b/spec/requests/api/runner_spec.rb index 9556c99dea1..5a4f0513248 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) diff --git a/spec/requests/ci/api/builds_spec.rb b/spec/requests/ci/api/builds_spec.rb index 286de277ae7..04cc7708858 100644 --- a/spec/requests/ci/api/builds_spec.rb +++ b/spec/requests/ci/api/builds_spec.rb @@ -137,6 +137,18 @@ describe Ci::API::Builds do end end end + + context 'when docker configuration options are used' do + let!(:build) { create(:ci_build, :extended_options, pipeline: pipeline, name: 'spinach', stage: 'test', stage_idx: 0) } + + it 'starts a build' do + register_builds info: { platform: :darwin } + + expect(response).to have_http_status(201) + expect(json_response['options']['image']).to eq('ruby:2.1') + expect(json_response['options']['services']).to eq(['postgres', 'docker:dind']) + end + end end context 'when builds are finished' do |