diff options
author | Sean McGivern <sean@mcgivern.me.uk> | 2016-12-28 12:03:38 +0000 |
---|---|---|
committer | Sean McGivern <sean@mcgivern.me.uk> | 2016-12-28 12:03:38 +0000 |
commit | 0dcbd4c7f6cfc69d3190c4622bbc73da718056c7 (patch) | |
tree | e9e70a2ce513ca5d627f5db374b35bf55130a032 /spec | |
parent | 465700ddc2fa43bf32bc2ed08d9c30e420aec5e2 (diff) | |
parent | 47689c16263586f09e42c83ef7a2445e6f5b50d4 (diff) | |
download | gitlab-ce-0dcbd4c7f6cfc69d3190c4622bbc73da718056c7.tar.gz |
Merge branch 'fix/mentioned-issue-text-grammar' into 'master'
Fix grammar error in text about mentioned issues
See merge request !8337
Diffstat (limited to 'spec')
-rw-r--r-- | spec/features/merge_requests/closes_issues_spec.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/features/merge_requests/closes_issues_spec.rb b/spec/features/merge_requests/closes_issues_spec.rb index dc32c8f7373..c73065cdce1 100644 --- a/spec/features/merge_requests/closes_issues_spec.rb +++ b/spec/features/merge_requests/closes_issues_spec.rb @@ -41,7 +41,7 @@ feature 'Merge Request closing issues message', feature: true do let(:merge_request_description) { "Description\n\nRefers to #{issue_1.to_reference} and #{issue_2.to_reference}" } it 'does not display closing issue message' do - expect(page).to have_content("Issues #{issue_1.to_reference} and #{issue_2.to_reference} are mentioned but will not closed.") + expect(page).to have_content("Issues #{issue_1.to_reference} and #{issue_2.to_reference} are mentioned but will not be closed.") end end @@ -49,7 +49,7 @@ feature 'Merge Request closing issues message', feature: true do let(:merge_request_description) { "Description\n\ncloses #{issue_1.to_reference}\n\n refers to #{issue_2.to_reference}" } it 'does not display closing issue message' do - expect(page).to have_content("Accepting this merge request will close issue #{issue_1.to_reference}. Issue #{issue_2.to_reference} is mentioned but will not closed.") + expect(page).to have_content("Accepting this merge request will close issue #{issue_1.to_reference}. Issue #{issue_2.to_reference} is mentioned but will not be closed.") end end end |