diff options
| author | ZJ van de Weg <zegerjan@gitlab.com> | 2016-05-30 14:46:23 +0200 |
|---|---|---|
| committer | Z.J. van de Weg <zegerjan@gitlab.com> | 2016-05-30 18:54:08 +0200 |
| commit | cbd7801b3d1d435a95ec70032c5acc9df33b0337 (patch) | |
| tree | 7bd367bf31690e4a6b0115d238cf2c312c9fb2ab /features/steps/project/merge_requests.rb | |
| parent | f99b38c9d5dab11677b2680a671c1a66fb69283b (diff) | |
| parent | 2485bd7bbf9686f993d2a417943feff5c7d5b6f3 (diff) | |
| download | gitlab-ce-cbd7801b3d1d435a95ec70032c5acc9df33b0337.tar.gz | |
Merge branch 'master' into awardables
Diffstat (limited to 'features/steps/project/merge_requests.rb')
| -rw-r--r-- | features/steps/project/merge_requests.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/features/steps/project/merge_requests.rb b/features/steps/project/merge_requests.rb index 692a01c7f74..f6fafe81194 100644 --- a/features/steps/project/merge_requests.rb +++ b/features/steps/project/merge_requests.rb @@ -203,7 +203,7 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps page.within 'li.merge-request:nth-child(3)' do expect(page).to have_content 'Bug NS-05' - expect(page).to_not have_content '0 0' + expect(page).not_to have_content '0 0' end end end @@ -222,7 +222,7 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps page.within 'li.merge-request:nth-child(3)' do expect(page).to have_content 'Bug NS-05' - expect(page).to_not have_content '0 0' + expect(page).not_to have_content '0 0' end end end @@ -273,7 +273,7 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps step 'user "John Doe" leaves a comment like "Line is wrong" on diff' do mr = MergeRequest.find_by(title: "Bug NS-05") create(:note_on_merge_request_diff, project: project, - noteable_id: mr.id, + noteable: mr, author: user_exists("John Doe"), line_code: sample_commit.line_code, note: 'Line is wrong') |