diff options
author | Douwe Maan <douwe@selenight.nl> | 2016-11-23 14:55:23 +0800 |
---|---|---|
committer | Douwe Maan <douwe@selenight.nl> | 2016-11-24 18:26:29 +0800 |
commit | 6df22f72c6c312199c547e017ce1f947cf88e34c (patch) | |
tree | c91130ad2d0bca231dd38d359c061a4227c778c0 /spec/features/issues | |
parent | d0c0c75ca9568bc3ec00c341a6053623d85e6201 (diff) | |
download | gitlab-ce-rephrase-system-notes.tar.gz |
Rephrase some system notes to be compatible with new system note stylerephrase-system-notes
Diffstat (limited to 'spec/features/issues')
-rw-r--r-- | spec/features/issues/move_spec.rb | 6 | ||||
-rw-r--r-- | spec/features/issues/new_branch_button_spec.rb | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/spec/features/issues/move_spec.rb b/spec/features/issues/move_spec.rb index 055210399a7..c9bec05a9da 100644 --- a/spec/features/issues/move_spec.rb +++ b/spec/features/issues/move_spec.rb @@ -27,7 +27,7 @@ feature 'issue move to another project' do let!(:mr) { create(:merge_request, source_project: old_project) } let(:new_project) { create(:project) } let(:new_project_search) { create(:project) } - let(:text) { 'Text with !1' } + let(:text) { "Text with #{mr.to_reference}" } let(:cross_reference) { old_project.to_reference } background do @@ -43,8 +43,8 @@ feature 'issue move to another project' do expect(current_url).to include project_path(new_project) - expect(page).to have_content("Text with #{cross_reference}!1") - expect(page).to have_content("Moved from #{cross_reference}#1") + expect(page).to have_content("Text with #{cross_reference}#{mr.to_reference}") + expect(page).to have_content("moved from #{cross_reference}#{issue.to_reference}") expect(page).to have_content(issue.title) end diff --git a/spec/features/issues/new_branch_button_spec.rb b/spec/features/issues/new_branch_button_spec.rb index ab901e74617..a4d3053d10c 100644 --- a/spec/features/issues/new_branch_button_spec.rb +++ b/spec/features/issues/new_branch_button_spec.rb @@ -20,12 +20,12 @@ feature 'Start new branch from an issue', feature: true do context "when there is a referenced merge request" do let!(:note) do create(:note, :on_issue, :system, project: project, noteable: issue, - note: "Mentioned in !#{referenced_mr.iid}") + note: "mentioned in #{referenced_mr.to_reference}") end let(:referenced_mr) do create(:merge_request, :simple, source_project: project, target_project: project, - description: "Fixes ##{issue.iid}", author: user) + description: "Fixes #{issue.to_reference}", author: user) end before do |