Commit 90315114 authored by Douwe Maan's avatar Douwe Maan

Tweak specs

parent 28351806
...@@ -43,7 +43,7 @@ feature 'Merge When Build Succeeds', feature: true, js: true do ...@@ -43,7 +43,7 @@ feature 'Merge When Build Succeeds', feature: true, js: true do
context 'When it is enabled' do context 'When it is enabled' do
let(:merge_request) do let(:merge_request) do
create(:merge_request_with_diffs, source_project: project, author: user, create(:merge_request_with_diffs, :simple, source_project: project, author: user,
merge_user: user, title: "MepMep", merge_when_build_succeeds: true) merge_user: user, title: "MepMep", merge_when_build_succeeds: true)
end end
...@@ -51,12 +51,6 @@ feature 'Merge When Build Succeeds', feature: true, js: true do ...@@ -51,12 +51,6 @@ feature 'Merge When Build Succeeds', feature: true, js: true do
let!(:ci_build) { create(:ci_build, commit: ci_commit) } let!(:ci_build) { create(:ci_build, commit: ci_commit) }
before do before do
merge_request.source_project.team << [user, :master]
merge_request.source_branch = "feature"
merge_request.target_branch = "master"
merge_request.save!
login_as user login_as user
visit_merge_request(merge_request) visit_merge_request(merge_request)
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment