Merge branch '32300__expose_more_attributes' into 'master'

lib/api/entities.rb

@@ -66,13 +66,6 @@ module API
       expose :job_events
     end
 
-    class BasicProjectDetails < Grape::Entity
-      expose :id
-      expose :http_url_to_repo, :web_url
-      expose :name, :name_with_namespace
-      expose :path, :path_with_namespace
-    end
-
     class SharedGroup < Grape::Entity
       expose :group_id
       expose :group_name do |group_link, options|
@@ -81,7 +74,16 @@ module API
       expose :group_access, as: :group_access_level
     end
 
-    class Project < Grape::Entity
+    class BasicProjectDetails < Grape::Entity
+      expose :id, :description, :default_branch, :tag_list
+      expose :ssh_url_to_repo, :http_url_to_repo, :web_url
+      expose :name, :name_with_namespace
+      expose :path, :path_with_namespace
+      expose :star_count, :forks_count
+      expose :created_at, :last_activity_at
+    end
+
+    class Project < BasicProjectDetails 
       include ::API::Helpers::RelatedResourcesHelpers
 
       expose :_links do
@@ -114,12 +116,9 @@ module API
         end
       end
 
-      expose :id, :description, :default_branch, :tag_list
       expose :archived?, as: :archived
-      expose :visibility, :ssh_url_to_repo, :http_url_to_repo, :web_url
+      expose :visibility
       expose :owner, using: Entities::UserBasic, unless: ->(project, options) { project.group }
-      expose :name, :name_with_namespace
-      expose :path, :path_with_namespace
       expose :container_registry_enabled
 
       # Expose old field names with the new permissions methods to keep API compatible
@@ -129,7 +128,6 @@ module API
       expose(:jobs_enabled) { |project, options| project.feature_available?(:builds, options[:current_user]) }
       expose(:snippets_enabled) { |project, options| project.feature_available?(:snippets, options[:current_user]) }
 
-      expose :created_at, :last_activity_at
       expose :shared_runners_enabled
       expose :lfs_enabled?, as: :lfs_enabled
       expose :creator_id
@@ -140,7 +138,6 @@ module API
       expose :avatar_url do |user, options|
         user.avatar_url(only_path: false)
       end
-      expose :star_count, :forks_count
       expose :open_issues_count, if: lambda { |project, options| project.feature_available?(:issues, options[:current_user]) }
       expose :runners_token, if: lambda { |_project, options| options[:user_can_admin_project] }
       expose :public_builds, as: :public_jobs

spec/requests/api/environments_spec.rb

@@ -13,7 +13,14 @@ describe API::Environments do
   describe 'GET /projects/:id/environments' do
     context 'as member of the project' do
       it 'returns project environments' do
-        project_data_keys = %w(id http_url_to_repo web_url name name_with_namespace path path_with_namespace)
+        project_data_keys = %w(
+          id description default_branch tag_list
+          ssh_url_to_repo http_url_to_repo web_url
+          name name_with_namespace
+          path path_with_namespace
+          star_count forks_count
+          created_at last_activity_at
+        )
 
         get api("/projects/#{project.id}/environments", user)
 

spec/requests/api/projects_spec.rb

@@ -186,7 +186,14 @@ describe API::Projects do
 
       context 'and with simple=true' do
         it 'returns a simplified version of all the projects' do
-          expected_keys = %w(id http_url_to_repo web_url name name_with_namespace path path_with_namespace)
+          expected_keys = %w(
+            id description default_branch tag_list
+            ssh_url_to_repo http_url_to_repo web_url
+            name name_with_namespace
+            path path_with_namespace
+            star_count forks_count
+            created_at last_activity_at
+          )
 
           get api('/projects?simple=true', user)
 
@@ -689,6 +696,7 @@ describe API::Projects do
         expect(response).to have_http_status(200)
         expect(json_response['id']).to eq(public_project.id)
         expect(json_response['description']).to eq(public_project.description)
+        expect(json_response['default_branch']).to eq(public_project.default_branch)
         expect(json_response.keys).not_to include('permissions')
       end
     end

spec/requests/api/v3/projects_spec.rb

@@ -82,7 +82,14 @@ describe API::V3::Projects do
 
       context 'GET /projects?simple=true' do
         it 'returns a simplified version of all the projects' do
-          expected_keys = %w(id http_url_to_repo web_url name name_with_namespace path path_with_namespace)
+          expected_keys = %w(
+            id description default_branch tag_list
+            ssh_url_to_repo http_url_to_repo web_url
+            name name_with_namespace
+            path path_with_namespace
+            star_count forks_count
+            created_at last_activity_at
+          )
 
           get v3_api('/projects?simple=true', user)
 
@@ -644,6 +651,7 @@ describe API::V3::Projects do
         expect(response).to have_http_status(200)
         expect(json_response['id']).to eq(public_project.id)
         expect(json_response['description']).to eq(public_project.description)
+        expect(json_response['default_branch']).to eq(public_project.default_branch)
         expect(json_response.keys).not_to include('permissions')
       end
     end