summaryrefslogtreecommitdiff
path: root/spec/requests/api/v3
diff options
context:
space:
mode:
authorSean McGivern <sean@gitlab.com>2017-09-05 16:49:23 +0100
committerSean McGivern <sean@gitlab.com>2017-09-06 10:08:05 +0100
commit7f778b7a10ac75ff68bb18d0fe6506b7282a45f7 (patch)
treeb91dade504905d7c8e880d3a08a62cc04d43e874 /spec/requests/api/v3
parente8f29569bcb4a2d732a2c00b34958f58d5622836 (diff)
downloadgitlab-ce-7f778b7a10ac75ff68bb18d0fe6506b7282a45f7.tar.gz
Tidy up projects API specs
Diffstat (limited to 'spec/requests/api/v3')
-rw-r--r--spec/requests/api/v3/projects_spec.rb25
1 files changed, 0 insertions, 25 deletions
diff --git a/spec/requests/api/v3/projects_spec.rb b/spec/requests/api/v3/projects_spec.rb
index f8dd5f960e8..cae2c3118da 100644
--- a/spec/requests/api/v3/projects_spec.rb
+++ b/spec/requests/api/v3/projects_spec.rb
@@ -394,7 +394,6 @@ describe API::V3::Projects do
issues_enabled: false,
merge_requests_enabled: false,
wiki_enabled: false,
- resolve_outdated_diff_discussions: false,
only_allow_merge_if_build_succeeds: false,
request_access_enabled: true,
only_allow_merge_if_all_discussions_are_resolved: false
@@ -456,18 +455,6 @@ describe API::V3::Projects do
expect(json_response['visibility_level']).to eq(Gitlab::VisibilityLevel::PRIVATE)
end
- it 'sets a project as allowing outdated diff discussions to automatically resolve' do
- project = attributes_for(:project, { resolve_outdated_diff_discussions: false })
- post v3_api('/projects', user), project
- expect(json_response['resolve_outdated_diff_discussions']).to be_falsey
- end
-
- it 'sets a project as allowing outdated diff discussions to automatically resolve if resolve_outdated_diff_discussions' do
- project = attributes_for(:project, { resolve_outdated_diff_discussions: true })
- post v3_api('/projects', user), project
- expect(json_response['resolve_outdated_diff_discussions']).to be_truthy
- end
-
it 'sets a project as allowing merge even if build fails' do
project = attributes_for(:project, { only_allow_merge_if_build_succeeds: false })
post v3_api('/projects', user), project
@@ -612,18 +599,6 @@ describe API::V3::Projects do
expect(json_response['visibility_level']).to eq(Gitlab::VisibilityLevel::PRIVATE)
end
- it 'sets a project as allowing outdated diff discussions to automatically resolve' do
- project = attributes_for(:project, { resolve_outdated_diff_discussions: false })
- post v3_api("/projects/user/#{user.id}", admin), project
- expect(json_response['resolve_outdated_diff_discussions']).to be_falsey
- end
-
- it 'sets a project as allowing outdated diff discussions to automatically resolve only if resolve_outdated_diff_discussions' do
- project = attributes_for(:project, { resolve_outdated_diff_discussions: true })
- post v3_api("/projects/user/#{user.id}", admin), project
- expect(json_response['resolve_outdated_diff_discussions']).to be_truthy
- end
-
it 'sets a project as allowing merge even if build fails' do
project = attributes_for(:project, { only_allow_merge_if_build_succeeds: false })
post v3_api("/projects/user/#{user.id}", admin), project