summaryrefslogtreecommitdiff
path: root/spec/serializers
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2017-10-04 07:33:05 +0000
committerDouwe Maan <douwe@gitlab.com>2017-10-04 07:33:05 +0000
commit2ee93c486cfbdf5555677d570cc63d1542c159ba (patch)
tree269fb45d8daf58258be607fab36118ab73590e8e /spec/serializers
parentaaa57c9d35b1eb744fca970263220850db06639f (diff)
parent1f54c9216f178e96010b28a74f04bae5848ef15d (diff)
downloadgitlab-ce-2ee93c486cfbdf5555677d570cc63d1542c159ba.tar.gz
Merge branch '36876-mr-show-json-controller-perf-improvements' into 'master'
Reduce method calls while evaluating Projects::MergeRequestsController#show.json See merge request gitlab-org/gitlab-ce!14285
Diffstat (limited to 'spec/serializers')
-rw-r--r--spec/serializers/merge_request_entity_spec.rb10
1 files changed, 0 insertions, 10 deletions
diff --git a/spec/serializers/merge_request_entity_spec.rb b/spec/serializers/merge_request_entity_spec.rb
index 4288955ddbc..4aeb593da44 100644
--- a/spec/serializers/merge_request_entity_spec.rb
+++ b/spec/serializers/merge_request_entity_spec.rb
@@ -11,16 +11,6 @@ describe MergeRequestEntity do
described_class.new(resource, request: request).as_json
end
- it 'includes author' do
- req = double('request')
-
- author_payload = UserEntity
- .represent(resource.author, request: req)
- .as_json
-
- expect(subject[:author]).to eq(author_payload)
- end
-
it 'includes pipeline' do
req = double('request', current_user: user)
pipeline = build_stubbed(:ci_pipeline)