summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMałgorzata Ksionek <mksionek@gitlab.com>2019-06-24 17:38:44 +0200
committerMałgorzata Ksionek <mksionek@gitlab.com>2019-07-03 16:45:52 +0200
commitd7aa23a6dd64119cead4622c1dadfcba5f42bdc6 (patch)
treeba1f5aa56023910c426936d3fdcb969e784f7183
parentc35e3b3a5019516acfcdfc43ec41a0d1714b62ed (diff)
downloadgitlab-ce-d7aa23a6dd64119cead4622c1dadfcba5f42bdc6.tar.gz
Update specs to accomodate project level changes
-rw-r--r--app/serializers/analytics_issue_entity.rb2
-rw-r--r--spec/serializers/analytics_issue_entity_spec.rb5
-rw-r--r--spec/serializers/analytics_stage_serializer_spec.rb2
3 files changed, 4 insertions, 5 deletions
diff --git a/app/serializers/analytics_issue_entity.rb b/app/serializers/analytics_issue_entity.rb
index 7593318b5d6..ae8037fad2c 100644
--- a/app/serializers/analytics_issue_entity.rb
+++ b/app/serializers/analytics_issue_entity.rb
@@ -26,8 +26,6 @@ class AnalyticsIssueEntity < Grape::Entity
private
def url_to(route, object)
- puts request.inspect
- puts object.inspect
public_send("#{route}_url", request.namespace, object[:name], object[:iid].to_s) # rubocop:disable GitlabSecurity/PublicSend
end
end
diff --git a/spec/serializers/analytics_issue_entity_spec.rb b/spec/serializers/analytics_issue_entity_spec.rb
index 89588b4df2b..c34d48c0a4f 100644
--- a/spec/serializers/analytics_issue_entity_spec.rb
+++ b/spec/serializers/analytics_issue_entity_spec.rb
@@ -9,12 +9,13 @@ describe AnalyticsIssueEntity do
iid: "1",
id: "1",
created_at: "2016-11-12 15:04:02.948604",
- author: user
+ author: user,
+ name: project.name
}
end
let(:project) { create(:project) }
- let(:request) { EntityRequest.new(project: project, entity: :merge_request) }
+ let(:request) { EntityRequest.new(namespace: project.namespace, entity: :merge_request) }
let(:entity) do
described_class.new(entity_hash, request: request, project: project)
diff --git a/spec/serializers/analytics_stage_serializer_spec.rb b/spec/serializers/analytics_stage_serializer_spec.rb
index 5b05c2f2ef3..a1a3391d336 100644
--- a/spec/serializers/analytics_stage_serializer_spec.rb
+++ b/spec/serializers/analytics_stage_serializer_spec.rb
@@ -6,7 +6,7 @@ describe AnalyticsStageSerializer do
end
let(:resource) do
- Gitlab::CycleAnalytics::CodeStage.new(project: double, options: {})
+ Gitlab::CycleAnalytics::CodeStage.new(projects: [double], options: {})
end
before do