diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-20 21:08:51 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-20 21:08:51 +0300 |
commit | df2eda3f14dccb703bd7054d4ddde7803cb1fe7e (patch) | |
tree | 0200bb0def01cde22da3bc4c9ed0a7b0f91d6b50 /spec/lib/gitlab/slash_commands | |
parent | b9bac6dbf78a5a7976fba14aaeef96bdeb0da612 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/lib/gitlab/slash_commands')
-rw-r--r-- | spec/lib/gitlab/slash_commands/issue_move_spec.rb | 10 | ||||
-rw-r--r-- | spec/lib/gitlab/slash_commands/presenters/issue_move_spec.rb | 10 |
2 files changed, 10 insertions, 10 deletions
diff --git a/spec/lib/gitlab/slash_commands/issue_move_spec.rb b/spec/lib/gitlab/slash_commands/issue_move_spec.rb index 962ac3668bc..1a45b0e06ba 100644 --- a/spec/lib/gitlab/slash_commands/issue_move_spec.rb +++ b/spec/lib/gitlab/slash_commands/issue_move_spec.rb @@ -22,11 +22,11 @@ describe Gitlab::SlashCommands::IssueMove, service: true do end describe '#execute' do - set(:user) { create(:user) } - set(:issue) { create(:issue) } - set(:chat_name) { create(:chat_name, user: user) } - set(:project) { issue.project } - set(:other_project) { create(:project, namespace: project.namespace) } + let_it_be(:user) { create(:user) } + let_it_be(:issue) { create(:issue) } + let_it_be(:chat_name) { create(:chat_name, user: user) } + let_it_be(:project) { issue.project } + let_it_be(:other_project) { create(:project, namespace: project.namespace) } before do [project, other_project].each { |prj| prj.add_maintainer(user) } diff --git a/spec/lib/gitlab/slash_commands/presenters/issue_move_spec.rb b/spec/lib/gitlab/slash_commands/presenters/issue_move_spec.rb index 56b64d32192..7726c3b6a87 100644 --- a/spec/lib/gitlab/slash_commands/presenters/issue_move_spec.rb +++ b/spec/lib/gitlab/slash_commands/presenters/issue_move_spec.rb @@ -3,11 +3,11 @@ require 'spec_helper' describe Gitlab::SlashCommands::Presenters::IssueMove do - set(:admin) { create(:admin) } - set(:project) { create(:project) } - set(:other_project) { create(:project) } - set(:old_issue) { create(:issue, project: project) } - set(:new_issue) { Issues::MoveService.new(project, admin).execute(old_issue, other_project) } + let_it_be(:admin) { create(:admin) } + let_it_be(:project, reload: true) { create(:project) } + let_it_be(:other_project) { create(:project) } + let_it_be(:old_issue, reload: true) { create(:issue, project: project) } + let(:new_issue) { Issues::MoveService.new(project, admin).execute(old_issue, other_project) } let(:attachment) { subject[:attachments].first } subject { described_class.new(new_issue).present(old_issue) } |