Commit 42fe0cac authored by Z.J. van de Weg's avatar Z.J. van de Weg

Upgrade grape-entity to 0.6.0

parent 2282a3bd
...@@ -68,7 +68,7 @@ gem 'github-linguist', '~> 4.7.0', require: 'linguist' ...@@ -68,7 +68,7 @@ gem 'github-linguist', '~> 4.7.0', require: 'linguist'
# API # API
gem 'grape', '~> 0.15.0' gem 'grape', '~> 0.15.0'
gem 'grape-entity', '~> 0.5.2' gem 'grape-entity', '~> 0.6.0'
gem 'rack-cors', '~> 0.4.0', require: 'rack/cors' gem 'rack-cors', '~> 0.4.0', require: 'rack/cors'
# Pagination # Pagination
......
...@@ -316,7 +316,8 @@ GEM ...@@ -316,7 +316,8 @@ GEM
rack-accept rack-accept
rack-mount rack-mount
virtus (>= 1.0.0) virtus (>= 1.0.0)
grape-entity (0.5.2) grape-entity (0.6.0)
activesupport
multi_json (>= 1.3.2) multi_json (>= 1.3.2)
haml (4.0.7) haml (4.0.7)
tilt tilt
...@@ -868,7 +869,7 @@ DEPENDENCIES ...@@ -868,7 +869,7 @@ DEPENDENCIES
gollum-rugged_adapter (~> 0.4.2) gollum-rugged_adapter (~> 0.4.2)
gon (~> 6.1.0) gon (~> 6.1.0)
grape (~> 0.15.0) grape (~> 0.15.0)
grape-entity (~> 0.5.2) grape-entity (~> 0.6.0)
haml_lint (~> 0.18.2) haml_lint (~> 0.18.2)
hamlit (~> 2.6.1) hamlit (~> 2.6.1)
health_check (~> 2.2.0) health_check (~> 2.2.0)
......
--- ---
title: Update grape entity to 0.5.2 title: Update grape entity to 0.6.0
merge_request: 7491 merge_request: 7491
author: author:
...@@ -27,10 +27,6 @@ describe EnvironmentSerializer do ...@@ -27,10 +27,6 @@ describe EnvironmentSerializer do
let(:deployable) { create(:ci_build) } let(:deployable) { create(:ci_build) }
let(:resource) { deployment.environment } let(:resource) { deployment.environment }
it 'it generates payload for single object' do
expect(json).to be_an_instance_of Hash
end
it 'contains important elements of environment' do it 'contains important elements of environment' do
expect(json) expect(json)
.to include(:name, :external_url, :environment_path, :last_deployment) .to include(:name, :external_url, :environment_path, :last_deployment)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment