summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2015-12-09 09:59:39 +0100
committerDouwe Maan <douwe@gitlab.com>2015-12-09 09:59:39 +0100
commit903151141da36ed9b8c2333a9b66f5c611e4efb6 (patch)
treef65f6e33732d81cd586d4f58b12fea4a42c9903f
parent28351806aa1f89f584d6905365fd34f5f0e8bbc7 (diff)
downloadgitlab-ce-merge-if-green.tar.gz
Tweak specsmerge-if-green
-rw-r--r--spec/features/merge_requests/merge_when_build_succeeds_spec.rb10
1 files changed, 2 insertions, 8 deletions
diff --git a/spec/features/merge_requests/merge_when_build_succeeds_spec.rb b/spec/features/merge_requests/merge_when_build_succeeds_spec.rb
index ee2fb25e9e5..a674124aab7 100644
--- a/spec/features/merge_requests/merge_when_build_succeeds_spec.rb
+++ b/spec/features/merge_requests/merge_when_build_succeeds_spec.rb
@@ -43,20 +43,14 @@ feature 'Merge When Build Succeeds', feature: true, js: true do
context 'When it is enabled' do
let(:merge_request) do
- create(:merge_request_with_diffs, source_project: project, author: user,
- merge_user: user, title: "MepMep", merge_when_build_succeeds: true)
+ create(:merge_request_with_diffs, :simple, source_project: project, author: user,
+ merge_user: user, title: "MepMep", merge_when_build_succeeds: true)
end
let!(:ci_commit) { create(:ci_commit, gl_project: project, sha: merge_request.last_commit.id, ref: merge_request.source_branch) }
let!(:ci_build) { create(:ci_build, commit: ci_commit) }
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
visit_merge_request(merge_request)
end