From 0ddf825ddf7bc480004919762b187390d0b900e9 Mon Sep 17 00:00:00 2001
From: James Lopez <james@jameslopez.es>
Date: Mon, 14 Nov 2016 18:05:13 +0100
Subject: WIP - adding a generic entity serializer that should accept a Hash
 coming from Arel

---
 spec/serializers/analytics_generic_entity_spec.rb | 39 +++++++++++++++++++++++
 1 file changed, 39 insertions(+)
 create mode 100644 spec/serializers/analytics_generic_entity_spec.rb

(limited to 'spec/serializers/analytics_generic_entity_spec.rb')

diff --git a/spec/serializers/analytics_generic_entity_spec.rb b/spec/serializers/analytics_generic_entity_spec.rb
new file mode 100644
index 00000000000..a09dae4520c
--- /dev/null
+++ b/spec/serializers/analytics_generic_entity_spec.rb
@@ -0,0 +1,39 @@
+require 'spec_helper'
+
+describe AnalyticsGenericEntity do
+  let(:user) { create(:user) }
+  let(:entity_hash) {
+    {
+      total_time: "172802.724419",
+      title: "Eos voluptatem inventore in sed.",
+      iid: "1",
+      id: "1",
+      created_at: "2016-11-12 15:04:02.948604",
+      author: user,
+      entity: :merge_request
+    }
+  }
+
+  let(:project) { create(:empty_project) }
+
+  let(:entity) do
+    described_class.new(entity_hash, request: double, project: project)
+  end
+
+  context 'generic entity' do
+    subject { entity.as_json }
+
+    it 'contains the entity URL' do
+      expect(subject).to include(:url)
+    end
+
+    it 'contains the author' do
+      expect(subject).to include(:author)
+    end
+
+    it 'does not contain sensitive information' do
+      expect(subject).not_to include(/token/)
+      expect(subject).not_to include(/variables/)
+    end
+  end
+end
-- 
cgit v1.2.1


From 747e5c3b6fb6e744bc1fce04f94930fdbb5f9121 Mon Sep 17 00:00:00 2001
From: James Lopez <james@jameslopez.es>
Date: Tue, 15 Nov 2016 09:59:35 +0100
Subject: use request to pass extra parameters

---
 spec/serializers/analytics_generic_entity_spec.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'spec/serializers/analytics_generic_entity_spec.rb')

diff --git a/spec/serializers/analytics_generic_entity_spec.rb b/spec/serializers/analytics_generic_entity_spec.rb
index a09dae4520c..7c731da1dd1 100644
--- a/spec/serializers/analytics_generic_entity_spec.rb
+++ b/spec/serializers/analytics_generic_entity_spec.rb
@@ -10,14 +10,14 @@ describe AnalyticsGenericEntity do
       id: "1",
       created_at: "2016-11-12 15:04:02.948604",
       author: user,
-      entity: :merge_request
     }
   }
 
   let(:project) { create(:empty_project) }
+  let(:request) { EntityRequest.new(project: project, entity: :merge_request) }
 
   let(:entity) do
-    described_class.new(entity_hash, request: double, project: project)
+    described_class.new(entity_hash, request: request, project: project)
   end
 
   context 'generic entity' do
-- 
cgit v1.2.1


From cf2dcf043c0054785bc0258ab6393104499b8d70 Mon Sep 17 00:00:00 2001
From: James Lopez <james@jameslopez.es>
Date: Wed, 16 Nov 2016 12:01:10 +0100
Subject: Refactor all query config stuff into separate classes and added specs

---
 spec/serializers/analytics_generic_entity_spec.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'spec/serializers/analytics_generic_entity_spec.rb')

diff --git a/spec/serializers/analytics_generic_entity_spec.rb b/spec/serializers/analytics_generic_entity_spec.rb
index 7c731da1dd1..3bb15cb9475 100644
--- a/spec/serializers/analytics_generic_entity_spec.rb
+++ b/spec/serializers/analytics_generic_entity_spec.rb
@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe AnalyticsGenericEntity do
   let(:user) { create(:user) }
-  let(:entity_hash) {
+  let(:entity_hash) do
     {
       total_time: "172802.724419",
       title: "Eos voluptatem inventore in sed.",
@@ -11,7 +11,7 @@ describe AnalyticsGenericEntity do
       created_at: "2016-11-12 15:04:02.948604",
       author: user,
     }
-  }
+  end
 
   let(:project) { create(:empty_project) }
   let(:request) { EntityRequest.new(project: project, entity: :merge_request) }
-- 
cgit v1.2.1


From ed39d61d746925e49d952bd8169499d3200ae68b Mon Sep 17 00:00:00 2001
From: James Lopez <james@jameslopez.es>
Date: Thu, 17 Nov 2016 13:22:27 +0100
Subject: refactor events facade so it uses separate classes and refactor query
 stuff

---
 spec/serializers/analytics_generic_entity_spec.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'spec/serializers/analytics_generic_entity_spec.rb')

diff --git a/spec/serializers/analytics_generic_entity_spec.rb b/spec/serializers/analytics_generic_entity_spec.rb
index 3bb15cb9475..68086216ba9 100644
--- a/spec/serializers/analytics_generic_entity_spec.rb
+++ b/spec/serializers/analytics_generic_entity_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe AnalyticsGenericEntity do
+describe AnalyticsIssueEntity do
   let(:user) { create(:user) }
   let(:entity_hash) do
     {
-- 
cgit v1.2.1