diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-25 06:08:49 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-25 06:08:49 +0300 |
commit | a8c82a6395ed62380b9061a26d92e41d46c2877e (patch) | |
tree | bd8ab49ac11104ad9ae953afd4c5e0036fdddaa2 /spec/serializers/merge_request_serializer_spec.rb | |
parent | 0b881f91159cc97ccb7328a2e52977a60ea83fbe (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/serializers/merge_request_serializer_spec.rb')
-rw-r--r-- | spec/serializers/merge_request_serializer_spec.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/serializers/merge_request_serializer_spec.rb b/spec/serializers/merge_request_serializer_spec.rb index 9297df31842..871a47b0a02 100644 --- a/spec/serializers/merge_request_serializer_spec.rb +++ b/spec/serializers/merge_request_serializer_spec.rb @@ -3,8 +3,8 @@ require 'spec_helper' describe MergeRequestSerializer do - set(:user) { create(:user) } - set(:resource) { create(:merge_request, description: "Description") } + let_it_be(:user) { create(:user) } + let_it_be(:resource) { create(:merge_request, description: "Description") } let(:json_entity) do described_class.new(current_user: user) |