diff options
author | Sean McGivern <sean@mcgivern.me.uk> | 2018-02-02 14:00:21 +0000 |
---|---|---|
committer | Sean McGivern <sean@mcgivern.me.uk> | 2018-02-02 14:00:21 +0000 |
commit | 54a575f1bbba44573ab92dc58a4242f1ee734c5d (patch) | |
tree | 0ee2afe8228f184f7ad28e74d86bff2c5965c4ae /spec/services/issues | |
parent | c63af942e5baf7849a94fa99da8494bcba28e3f8 (diff) | |
parent | 36838a843e99f551c971ec7062327e114c8f0188 (diff) | |
download | gitlab-ce-54a575f1bbba44573ab92dc58a4242f1ee734c5d.tar.gz |
Merge branch '3867-port-to-ce' into 'master'
Port of gitlab-ee!3867 to CE
See merge request gitlab-org/gitlab-ce!16775
Diffstat (limited to 'spec/services/issues')
-rw-r--r-- | spec/services/issues/move_service_spec.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/services/issues/move_service_spec.rb b/spec/services/issues/move_service_spec.rb index 388c9d63c7b..322c91065e7 100644 --- a/spec/services/issues/move_service_spec.rb +++ b/spec/services/issues/move_service_spec.rb @@ -6,7 +6,7 @@ describe Issues::MoveService do let(:title) { 'Some issue' } let(:description) { 'Some issue description' } let(:old_project) { create(:project) } - let(:new_project) { create(:project) } + let(:new_project) { create(:project, group: create(:group)) } let(:milestone1) { create(:milestone, project_id: old_project.id, title: 'v9.0') } let(:old_issue) do @@ -250,7 +250,7 @@ describe Issues::MoveService do context 'issue description with uploads' do let(:uploader) { build(:file_uploader, project: old_project) } - let(:description) { "Text and #{uploader.to_markdown}" } + let(:description) { "Text and #{uploader.markdown_link}" } include_context 'issue move executed' |