Expose commit author if author exists
This commit is contained in:
parent
f203ca5c93
commit
a2c1178c21
2 changed files with 8 additions and 5 deletions
|
@ -1,6 +1,8 @@
|
|||
class CommitEntity < API::Entities::RepoCommit
|
||||
include RequestAwareEntity
|
||||
|
||||
expose :author, using: API::Entities::UserBasic
|
||||
|
||||
expose :commit_url do |commit|
|
||||
@urls.namespace_project_tree_url(
|
||||
@request.project.namespace,
|
||||
|
|
|
@ -7,6 +7,7 @@ describe EnvironmentSerializer do
|
|||
.represent(resource)
|
||||
end
|
||||
|
||||
let(:json) { serializer.as_json }
|
||||
let(:user) { create(:user) }
|
||||
let(:project) { create(:project) }
|
||||
|
||||
|
@ -27,16 +28,16 @@ describe EnvironmentSerializer do
|
|||
let(:resource) { deployment.environment }
|
||||
|
||||
it 'it generates payload for single object' do
|
||||
expect(serializer.as_json).to be_an_instance_of Hash
|
||||
expect(json).to be_an_instance_of Hash
|
||||
end
|
||||
|
||||
it 'contains important elements of environment' do
|
||||
expect(serializer.as_json)
|
||||
expect(json)
|
||||
.to include(:name, :external_url, :environment_url, :last_deployment)
|
||||
end
|
||||
|
||||
it 'contains relevant information about last deployment' do
|
||||
last_deployment = serializer.as_json.fetch(:last_deployment)
|
||||
last_deployment = json.fetch(:last_deployment)
|
||||
|
||||
expect(last_deployment)
|
||||
.to include(:ref, :user, :commit, :deployable, :manual_actions)
|
||||
|
@ -48,12 +49,12 @@ describe EnvironmentSerializer do
|
|||
let(:resource) { create_list(:environment, 2) }
|
||||
|
||||
it 'contains important elements of environment' do
|
||||
expect(serializer.as_json.first)
|
||||
expect(json.first)
|
||||
.to include(:last_deployment, :name, :external_url)
|
||||
end
|
||||
|
||||
it 'generates payload for collection' do
|
||||
expect(serializer.as_json).to be_an_instance_of Array
|
||||
expect(json).to be_an_instance_of Array
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
Loading…
Reference in a new issue