summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2016-11-21 12:04:00 +0100
committerRémy Coutable <remy@rymai.me>2016-11-21 12:04:00 +0100
commit95cf0f7380f6057a38b1eee700ab9e079df14ca0 (patch)
tree99d84733a731e0977ffd02ae2d8da60c1aaa6b86
parent53714ddf2bcc56659236d87647d8b8e8412592f3 (diff)
downloadgitlab-ce-rc-some-specs-are-not-run.tar.gz
Invert the expectations, specs should failrc-some-specs-are-not-run
Signed-off-by: Rémy Coutable <remy@rymai.me>
-rw-r--r--spec/features/merge_requests/only_allow_merge_if_build_succeeds.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/features/merge_requests/only_allow_merge_if_build_succeeds.rb b/spec/features/merge_requests/only_allow_merge_if_build_succeeds.rb
index 80e8b8fc642..71a99b50177 100644
--- a/spec/features/merge_requests/only_allow_merge_if_build_succeeds.rb
+++ b/spec/features/merge_requests/only_allow_merge_if_build_succeeds.rb
@@ -43,8 +43,8 @@ feature 'Only allow merge requests to be merged if the build succeeds', feature:
it 'does not allow MR to be merged' do
visit_merge_request(merge_request)
- expect(page).not_to have_button 'Accept Merge Request'
- expect(page).to have_content('Please retry the build or push a new commit to fix the failure.')
+ expect(page).to have_button 'Accept Merge Request'
+ expect(page).not_to have_content('Please retry the build or push a new commit to fix the failure.')
end
end