summaryrefslogtreecommitdiff
path: root/spec/services/issues
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-01-10 09:07:49 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-01-10 09:07:49 +0000
commit0ba3a054d2190094ffda1ebe3aa53ffc5b92247d (patch)
tree8462503456eb030bb1042c6af73edc8f8af49fc6 /spec/services/issues
parentb24ae1cbc66e5b0f622393bcf2c59711750161ea (diff)
downloadgitlab-ce-0ba3a054d2190094ffda1ebe3aa53ffc5b92247d.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/services/issues')
-rw-r--r--spec/services/issues/referenced_merge_requests_service_spec.rb16
-rw-r--r--spec/services/issues/reorder_service_spec.rb6
-rw-r--r--spec/services/issues/zoom_link_service_spec.rb4
3 files changed, 13 insertions, 13 deletions
diff --git a/spec/services/issues/referenced_merge_requests_service_spec.rb b/spec/services/issues/referenced_merge_requests_service_spec.rb
index 61d1612829f..2c5af11d2e6 100644
--- a/spec/services/issues/referenced_merge_requests_service_spec.rb
+++ b/spec/services/issues/referenced_merge_requests_service_spec.rb
@@ -15,16 +15,16 @@ describe Issues::ReferencedMergeRequestsService do
end
end
- set(:user) { create(:user) }
- set(:project) { create(:project, :public, :repository) }
- set(:other_project) { create(:project, :public, :repository) }
- set(:issue) { create(:issue, author: user, project: project) }
+ let_it_be(:user) { create(:user) }
+ let_it_be(:project) { create(:project, :public, :repository) }
+ let_it_be(:other_project) { create(:project, :public, :repository) }
+ let_it_be(:issue) { create(:issue, author: user, project: project) }
- set(:closing_mr) { create_closing_mr(source_project: project) }
- set(:closing_mr_other_project) { create_closing_mr(source_project: other_project) }
+ let_it_be(:closing_mr) { create_closing_mr(source_project: project) }
+ let_it_be(:closing_mr_other_project) { create_closing_mr(source_project: other_project) }
- set(:referencing_mr) { create_referencing_mr(source_project: project, source_branch: 'csv') }
- set(:referencing_mr_other_project) { create_referencing_mr(source_project: other_project, source_branch: 'csv') }
+ let_it_be(:referencing_mr) { create_referencing_mr(source_project: project, source_branch: 'csv') }
+ let_it_be(:referencing_mr_other_project) { create_referencing_mr(source_project: other_project, source_branch: 'csv') }
let(:service) { described_class.new(project, user) }
diff --git a/spec/services/issues/reorder_service_spec.rb b/spec/services/issues/reorder_service_spec.rb
index b147cdf4e64..6d72d698b1d 100644
--- a/spec/services/issues/reorder_service_spec.rb
+++ b/spec/services/issues/reorder_service_spec.rb
@@ -3,9 +3,9 @@
require 'spec_helper'
describe Issues::ReorderService do
- set(:user) { create(:user) }
- set(:project) { create(:project) }
- set(:group) { create(:group) }
+ let_it_be(:user) { create(:user) }
+ let_it_be(:project) { create(:project) }
+ let_it_be(:group) { create(:group) }
shared_examples 'issues reorder service' do
context 'when reordering issues' do
diff --git a/spec/services/issues/zoom_link_service_spec.rb b/spec/services/issues/zoom_link_service_spec.rb
index f34d2a18552..3fb1eae361a 100644
--- a/spec/services/issues/zoom_link_service_spec.rb
+++ b/spec/services/issues/zoom_link_service_spec.rb
@@ -3,8 +3,8 @@
require 'spec_helper'
describe Issues::ZoomLinkService do
- set(:user) { create(:user) }
- set(:issue) { create(:issue) }
+ let_it_be(:user) { create(:user) }
+ let_it_be(:issue) { create(:issue) }
let(:project) { issue.project }
let(:service) { described_class.new(issue, user) }