summaryrefslogtreecommitdiff
path: root/spec/requests
diff options
context:
space:
mode:
authorKamil Trzciński <ayufan@ayufan.eu>2017-10-03 18:16:54 +0000
committerKamil Trzciński <ayufan@ayufan.eu>2017-10-03 18:16:54 +0000
commitda9d42f2b31c6e8263365de8b326a082ab9506ac (patch)
tree89477176d589fed4e16a056255fcea259b9ffb64 /spec/requests
parentc3462235f30ab33bee41afd57ec3975917c42467 (diff)
parent79e1f33f13095e3781bc3fc07efd52921c4ed756 (diff)
downloadgitlab-ce-da9d42f2b31c6e8263365de8b326a082ab9506ac.tar.gz
Merge branch '37970-timestamped-ci' into 'master'
Hide CI section markers from job trace See merge request gitlab-org/gitlab-ce!14393
Diffstat (limited to 'spec/requests')
-rw-r--r--spec/requests/api/runner_spec.rb3
1 files changed, 3 insertions, 0 deletions
diff --git a/spec/requests/api/runner_spec.rb b/spec/requests/api/runner_spec.rb
index 12720355a6d..5068df5b43a 100644
--- a/spec/requests/api/runner_spec.rb
+++ b/spec/requests/api/runner_spec.rb
@@ -360,6 +360,8 @@ describe API::Runner do
'policy' => 'pull-push' }]
end
+ let(:expected_features) { { 'trace_sections' => true } }
+
it 'picks a job' do
request_job info: { platform: :darwin }
@@ -379,6 +381,7 @@ describe API::Runner do
expect(json_response['artifacts']).to eq(expected_artifacts)
expect(json_response['cache']).to eq(expected_cache)
expect(json_response['variables']).to include(*expected_variables)
+ expect(json_response['features']).to eq(expected_features)
end
context 'when job is made for tag' do