Commit 5522b9dc authored by Robert Speicher's avatar Robert Speicher

Merge branch 'zj-upgrade-grape' into 'master'

Update grape-entity to 0.6.0

See merge request !7491
parents d9eb2f2c 0dc10850
...@@ -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.4.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
......
...@@ -292,7 +292,7 @@ GEM ...@@ -292,7 +292,7 @@ GEM
rack-accept rack-accept
rack-mount rack-mount
virtus (>= 1.0.0) virtus (>= 1.0.0)
grape-entity (0.4.8) grape-entity (0.6.0)
activesupport activesupport
multi_json (>= 1.3.2) multi_json (>= 1.3.2)
haml (4.0.7) haml (4.0.7)
...@@ -838,7 +838,7 @@ DEPENDENCIES ...@@ -838,7 +838,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.4.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.6.0
merge_request: 7491
author:
...@@ -10,10 +10,6 @@ describe AnalyticsBuildSerializer do ...@@ -10,10 +10,6 @@ describe AnalyticsBuildSerializer do
let(:resource) { create(:ci_build) } let(:resource) { create(:ci_build) }
context 'when there is a single object provided' do context 'when there is a single object provided' do
it 'it generates payload for single object' do
expect(json).to be_an_instance_of Hash
end
it 'contains important elements of analyticsBuild' do it 'contains important elements of analyticsBuild' do
expect(json) expect(json)
.to include(:name, :branch, :short_sha, :date, :total_time, :url, :author) .to include(:name, :branch, :short_sha, :date, :total_time, :url, :author)
......
...@@ -22,10 +22,6 @@ describe AnalyticsIssueSerializer do ...@@ -22,10 +22,6 @@ describe AnalyticsIssueSerializer do
end end
context 'when there is a single object provided' do context 'when there is a single object provided' do
it 'it generates payload for single object' do
expect(json).to be_an_instance_of Hash
end
it 'contains important elements of the issue' do it 'contains important elements of the issue' do
expect(json).to include(:title, :iid, :created_at, :total_time, :url, :author) expect(json).to include(:title, :iid, :created_at, :total_time, :url, :author)
end end
......
...@@ -23,10 +23,6 @@ describe AnalyticsMergeRequestSerializer do ...@@ -23,10 +23,6 @@ describe AnalyticsMergeRequestSerializer do
end end
context 'when there is a single object provided' do context 'when there is a single object provided' do
it 'it generates payload for single object' do
expect(json).to be_an_instance_of Hash
end
it 'contains important elements of the merge request' do it 'contains important elements of the merge request' do
expect(json).to include(:title, :iid, :created_at, :total_time, :url, :author, :state) expect(json).to include(:title, :iid, :created_at, :total_time, :url, :author, :state)
end end
......
...@@ -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