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

Update grape-entity to 0.6.0

See merge request !7491

7 files changed, 7 insertions, 19 deletions

diff --git a/Gemfile b/Gemfile
index e7f248ee766..1d686199557 100644
--- a/Gemfile
+++ b/Gemfile
@@ -68,7 +68,7 @@ gem 'github-linguist', '~> 4.7.0', require: 'linguist'
 
 # API
 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'
 
 # Pagination
diff --git a/Gemfile.lock b/Gemfile.lock
index 3684974a766..bf9702b2562 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -292,7 +292,7 @@ GEM
       rack-accept
       rack-mount
       virtus (>= 1.0.0)
-    grape-entity (0.4.8)
+    grape-entity (0.6.0)
       activesupport
       multi_json (>= 1.3.2)
     haml (4.0.7)
@@ -838,7 +838,7 @@ DEPENDENCIES
   gollum-rugged_adapter (~> 0.4.2)
   gon (~> 6.1.0)
   grape (~> 0.15.0)
-  grape-entity (~> 0.4.2)
+  grape-entity (~> 0.6.0)
   haml_lint (~> 0.18.2)
   hamlit (~> 2.6.1)
   health_check (~> 2.2.0)
diff --git a/changelogs/unreleased/zj-upgrade-grape.yml b/changelogs/unreleased/zj-upgrade-grape.yml
new file mode 100644
index 00000000000..1df42d98733
--- /dev/null
+++ b/changelogs/unreleased/zj-upgrade-grape.yml
@@ -0,0 +1,4 @@
+---
+title: Update grape entity to 0.6.0
+merge_request: 7491
+author: 
diff --git a/spec/serializers/analytics_build_serializer_spec.rb b/spec/serializers/analytics_build_serializer_spec.rb
index a0a9d9a5f12..f0551c78671 100644
--- a/spec/serializers/analytics_build_serializer_spec.rb
+++ b/spec/serializers/analytics_build_serializer_spec.rb
@@ -10,10 +10,6 @@ describe AnalyticsBuildSerializer do
   let(:resource) { create(:ci_build) }
 
   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
       expect(json)
         .to include(:name, :branch, :short_sha, :date, :total_time, :url, :author)
diff --git a/spec/serializers/analytics_issue_serializer_spec.rb b/spec/serializers/analytics_issue_serializer_spec.rb
index 2842e1ba52f..6afbb2df35c 100644
--- a/spec/serializers/analytics_issue_serializer_spec.rb
+++ b/spec/serializers/analytics_issue_serializer_spec.rb
@@ -22,10 +22,6 @@ describe AnalyticsIssueSerializer do
   end
 
   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
       expect(json).to include(:title, :iid, :created_at, :total_time, :url, :author)
     end
diff --git a/spec/serializers/analytics_merge_request_serializer_spec.rb b/spec/serializers/analytics_merge_request_serializer_spec.rb
index 564207984df..cdfae27193f 100644
--- a/spec/serializers/analytics_merge_request_serializer_spec.rb
+++ b/spec/serializers/analytics_merge_request_serializer_spec.rb
@@ -23,10 +23,6 @@ describe AnalyticsMergeRequestSerializer do
   end
 
   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
       expect(json).to include(:title, :iid, :created_at, :total_time, :url, :author, :state)
     end
diff --git a/spec/serializers/environment_serializer_spec.rb b/spec/serializers/environment_serializer_spec.rb
index 8f95c9250b0..b7ed4eb0239 100644
--- a/spec/serializers/environment_serializer_spec.rb
+++ b/spec/serializers/environment_serializer_spec.rb
@@ -27,10 +27,6 @@ describe EnvironmentSerializer do
     let(:deployable) { create(:ci_build) }
     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
       expect(json)
         .to include(:name, :external_url, :environment_path, :last_deployment)