summaryrefslogtreecommitdiff
path: root/spec/requests
diff options
context:
space:
mode:
authorKeith Pope <mute.pop3+gitlab@gmail.com>2016-08-05 10:29:09 +0100
committerKeith Pope <mute.pop3+gitlab@gmail.com>2016-10-08 12:30:47 +0100
commit07365e518330289149dd2135424c49fad19f401d (patch)
tree3a163231f4caa8f62c3fc5f4c0ca606c8ff92749 /spec/requests
parent28ca8502c254d5c3edfb7ece36fc365e7a715df0 (diff)
downloadgitlab-ce-07365e518330289149dd2135424c49fad19f401d.tar.gz
Add config option to project to allow custom .gitlab-ci.yml location
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 5f19638b460..80e5deb7f92 100644
--- a/spec/requests/api/projects_spec.rb
+++ b/spec/requests/api/projects_spec.rb
@@ -256,7 +256,8 @@ describe API::API, api: true do
merge_requests_enabled: false,
wiki_enabled: false,
only_allow_merge_if_build_succeeds: false,
- request_access_enabled: true
+ request_access_enabled: true,
+ ci_config_file: 'a/custom/path'
})
post api('/projects', user), project
@@ -503,6 +504,7 @@ describe API::API, api: true do
expect(json_response['star_count']).to be_present
expect(json_response['forks_count']).to be_present
expect(json_response['public_builds']).to be_present
+ expect(json_response['ci_config_file']).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)