summaryrefslogtreecommitdiff
path: root/spec/requests
diff options
context:
space:
mode:
authorGrzegorz Bizon <grzegorz@gitlab.com>2017-07-06 07:20:36 +0000
committerGrzegorz Bizon <grzegorz@gitlab.com>2017-07-06 07:20:36 +0000
commit6afe25ef336aca40b87cede499f8b8f5928129f6 (patch)
tree493201a50520e6b9c1f6f861aaeb8859a4b6f19f /spec/requests
parent6c15905c3bd11209858eac8870ffa9211f08f157 (diff)
parentcca9242085d73dff66a946af8a740a4f7419f84c (diff)
downloadgitlab-ce-6afe25ef336aca40b87cede499f8b8f5928129f6.tar.gz
Merge branch '32815--Add-Custom-CI-Config-Path' into 'master'
Resolve "Project option to allow customizing CI/CD config path" Closes #32815 and #33130 See merge request !12509
Diffstat (limited to 'spec/requests')
-rw-r--r--spec/requests/api/projects_spec.rb4
1 files changed, 3 insertions, 1 deletions
diff --git a/spec/requests/api/projects_spec.rb b/spec/requests/api/projects_spec.rb
index 14dec3d45b1..8ac65ecccab 100644
--- a/spec/requests/api/projects_spec.rb
+++ b/spec/requests/api/projects_spec.rb
@@ -347,7 +347,8 @@ describe API::Projects do
wiki_enabled: false,
only_allow_merge_if_pipeline_succeeds: false,
request_access_enabled: true,
- only_allow_merge_if_all_discussions_are_resolved: false
+ only_allow_merge_if_all_discussions_are_resolved: false,
+ ci_config_path: 'a/custom/path'
})
post api('/projects', user), project
@@ -653,6 +654,7 @@ describe API::Projects do
expect(json_response['star_count']).to be_present
expect(json_response['forks_count']).to be_present
expect(json_response['public_jobs']).to be_present
+ expect(json_response['ci_config_path']).to be_nil
expect(json_response['shared_with_groups']).to be_an Array
expect(json_response['shared_with_groups'].length).to eq(1)
expect(json_response['shared_with_groups'][0]['group_id']).to eq(group.id)