Cleanup duplicates in deploymentEntityDetailed and add small spec tests26914-deploy_history_data_source

3 files changed, 31 insertions, 24 deletions

diff --git a/app/serializers/deployment_entity_detailed.rb b/app/serializers/deployment_entity_detailed.rb
index a0de0f9666b..63df61dd51b 100644
--- a/app/serializers/deployment_entity_detailed.rb
+++ b/app/serializers/deployment_entity_detailed.rb
@@ -1,15 +1,5 @@
-class DeploymentEntityDetailed < Grape::Entity
-  include RequestAwareEntity
-
-  expose :id
-  expose :iid
-  expose :sha
-
+class DeploymentEntityDetailed < DeploymentEntity
   expose :ref do
-    expose :name do |deployment|
-      deployment.ref
-    end
-
     expose :ref_path do |deployment|
       namespace_project_tree_path(
         deployment.project.namespace,
@@ -18,9 +8,6 @@ class DeploymentEntityDetailed < Grape::Entity
     end
   end
 
-  expose :created_at
-  expose :tag
-  expose :last?
   expose :user, using: UserEntity
   expose :commit, using: CommitEntity
   expose :deployable, using: BuildEntity
diff --git a/spec/serializers/deployment_entity_detailed_spec.rb b/spec/serializers/deployment_entity_detailed_spec.rb
new file mode 100644
index 00000000000..d28e3fa0665
--- /dev/null
+++ b/spec/serializers/deployment_entity_detailed_spec.rb
@@ -0,0 +1,26 @@
+require 'spec_helper'
+
+describe DeploymentEntityDetailed do
+  let(:user) { create(:user) }
+  let(:request) { double('request') }
+  let(:deployment) { create(:deployment) }
+  let(:entity) { described_class.new(deployment, request: request) }
+  subject { entity.as_json }
+
+  before do
+    allow(request).to receive(:user).and_return(user)
+  end
+
+  it 'exposes internal deployment id'  do
+    expect(subject).to include(:iid)
+  end
+
+  it 'exposes nested information about branch' do
+    expect(subject[:ref][:name]).to eq 'master'
+    expect(subject[:ref][:ref_path]).not_to be_empty
+  end
+
+  it 'exposes creation date' do
+    expect(subject).to include(:created_at)
+  end
+end
diff --git a/spec/serializers/deployment_entity_spec.rb b/spec/serializers/deployment_entity_spec.rb
index 815837c13b0..69355bcde42 100644
--- a/spec/serializers/deployment_entity_spec.rb
+++ b/spec/serializers/deployment_entity_spec.rb
@@ -1,28 +1,22 @@
 require 'spec_helper'
 
-describe DeploymentEntityDetailed do
+describe DeploymentEntity do
   let(:user) { create(:user) }
   let(:request) { double('request') }
+  let(:deployment) { create(:deployment) }
+  let(:entity) { described_class.new(deployment, request: request) }
+  subject { entity.as_json }
 
   before do
     allow(request).to receive(:user).and_return(user)
   end
 
-  let(:entity) do
-    described_class.new(deployment, request: request)
-  end
-
-  let(:deployment) { create(:deployment) }
-
-  subject { entity.as_json }
-
   it 'exposes internal deployment id'  do
     expect(subject).to include(:iid)
   end
 
   it 'exposes nested information about branch' do
     expect(subject[:ref][:name]).to eq 'master'
-    expect(subject[:ref][:ref_path]).not_to be_empty
   end
 
   it 'exposes creation date' do