diff options
| -rw-r--r-- | app/models/ci/build.rb | 4 | ||||
| -rw-r--r-- | spec/requests/api/runner_spec.rb | 16 |
2 files changed, 13 insertions, 7 deletions
diff --git a/app/models/ci/build.rb b/app/models/ci/build.rb index 5ef089c87c5..77c82a0edf9 100644 --- a/app/models/ci/build.rb +++ b/app/models/ci/build.rb @@ -524,11 +524,11 @@ module Ci end def artifacts - options[:artifacts] + [options[:artifacts]] end def cache - options[:cache] + [options[:cache]] end def credentials diff --git a/spec/requests/api/runner_spec.rb b/spec/requests/api/runner_spec.rb index 9086094d121..a1819c4d5d3 100644 --- a/spec/requests/api/runner_spec.rb +++ b/spec/requests/api/runner_spec.rb @@ -308,11 +308,16 @@ describe API::Runner do { 'key' => 'DB_NAME', 'value' => 'postgres', 'public' => true }] end let(:expected_artifacts) do - { 'name' => 'artifacts_file', - 'untracked' => false, - 'paths' => %w(out/), - 'when' => 'always', - 'expire_in' => '7d' } + [{ 'name' => 'artifacts_file', + 'untracked' => false, + 'paths' => %w(out/), + 'when' => 'always', + 'expire_in' => '7d' }] + end + let(:expected_cache) do + [{ 'key' => 'cache_key', + 'untracked' => false, + 'paths' => ['vendor/*'] }] end it 'starts a job' do @@ -329,6 +334,7 @@ describe API::Runner do expect(json_response['services']).to eq([{ 'name' => 'postgres' }]) expect(json_response['steps']).to eq(expected_steps) expect(json_response['artifacts']).to eq(expected_artifacts) + expect(json_response['cache']).to eq(expected_cache) expect(json_response['variables']).to include(*expected_variables) end |