Add *_access_level to project API

- issues_access_level
- repository_access_level
- merge_requests_access_level
- builds_access_level
- wiki_access_level
- snippets_access_level

2 files changed, 29 insertions, 5 deletions

diff --git a/spec/models/concerns/project_features_compatibility_spec.rb b/spec/models/concerns/project_features_compatibility_spec.rb
index 5aa43b58217..1fe176ab5af 100644
--- a/spec/models/concerns/project_features_compatibility_spec.rb
+++ b/spec/models/concerns/project_features_compatibility_spec.rb
@@ -4,7 +4,8 @@ require 'spec_helper'
 
 describe ProjectFeaturesCompatibility do
   let(:project) { create(:project) }
-  let(:features) { %w(issues wiki builds merge_requests snippets) }
+  let(:features_except_repository) { %w(issues wiki builds merge_requests snippets) }
+  let(:features) { features_except_repository + ['repository'] }
 
   # We had issues_enabled, snippets_enabled, builds_enabled, merge_requests_enabled and issues_enabled fields on projects table
   # All those fields got moved to a new table called project_feature and are now integers instead of booleans
@@ -12,30 +13,37 @@ describe ProjectFeaturesCompatibility do
   # So we can keep it compatible
 
   it "converts fields from 'true' to ProjectFeature::ENABLED" do
-    features.each do |feature|
+    features_except_repository.each do |feature|
       project.update_attribute("#{feature}_enabled".to_sym, "true")
       expect(project.project_feature.public_send("#{feature}_access_level")).to eq(ProjectFeature::ENABLED)
     end
   end
 
   it "converts fields from 'false' to ProjectFeature::DISABLED" do
-    features.each do |feature|
+    features_except_repository.each do |feature|
       project.update_attribute("#{feature}_enabled".to_sym, "false")
       expect(project.project_feature.public_send("#{feature}_access_level")).to eq(ProjectFeature::DISABLED)
     end
   end
 
   it "converts fields from true to ProjectFeature::ENABLED" do
-    features.each do |feature|
+    features_except_repository.each do |feature|
       project.update_attribute("#{feature}_enabled".to_sym, true)
       expect(project.project_feature.public_send("#{feature}_access_level")).to eq(ProjectFeature::ENABLED)
     end
   end
 
   it "converts fields from false to ProjectFeature::DISABLED" do
-    features.each do |feature|
+    features_except_repository.each do |feature|
       project.update_attribute("#{feature}_enabled".to_sym, false)
       expect(project.project_feature.public_send("#{feature}_access_level")).to eq(ProjectFeature::DISABLED)
     end
   end
+
+  it "accepts private as ProjectFeature::PRIVATE" do
+    features.each do |feature|
+      project.update!("#{feature}_access_level".to_sym => 'private')
+      expect(project.project_feature.public_send("#{feature}_access_level")).to eq(ProjectFeature::PRIVATE)
+    end
+  end
 end
diff --git a/spec/requests/api/projects_spec.rb b/spec/requests/api/projects_spec.rb
index 5f7d2fa6d9c..978e5fffc73 100644
--- a/spec/requests/api/projects_spec.rb
+++ b/spec/requests/api/projects_spec.rb
@@ -1102,6 +1102,12 @@ describe API::Projects do
         expect(json_response['wiki_enabled']).to be_present
         expect(json_response['jobs_enabled']).to be_present
         expect(json_response['snippets_enabled']).to be_present
+        expect(json_response['snippets_access_level']).to be_present
+        expect(json_response['repository_access_level']).to be_present
+        expect(json_response['issues_access_level']).to be_present
+        expect(json_response['merge_requests_access_level']).to be_present
+        expect(json_response['wiki_access_level']).to be_present
+        expect(json_response['builds_access_level']).to be_present
         expect(json_response['resolve_outdated_diff_discussions']).to eq(project.resolve_outdated_diff_discussions)
         expect(json_response['container_registry_enabled']).to be_present
         expect(json_response['created_at']).to be_present
@@ -1913,6 +1919,16 @@ describe API::Projects do
         end
       end
 
+      it 'updates builds_access_level' do
+        project_param = { builds_access_level: 'private' }
+
+        put api("/projects/#{project3.id}", user), params: project_param
+
+        expect(response).to have_gitlab_http_status(200)
+
+        expect(json_response['builds_access_level']).to eq('private')
+      end
+
       it 'updates merge_method' do
         project_param = { merge_method: 'ff' }