diff options
Diffstat (limited to 'spec/features/merge_request/user_creates_merge_request_spec.rb')
-rw-r--r-- | spec/features/merge_request/user_creates_merge_request_spec.rb | 38 |
1 files changed, 13 insertions, 25 deletions
diff --git a/spec/features/merge_request/user_creates_merge_request_spec.rb b/spec/features/merge_request/user_creates_merge_request_spec.rb index 2bf8e9ba6a4..c8b22bb3125 100644 --- a/spec/features/merge_request/user_creates_merge_request_spec.rb +++ b/spec/features/merge_request/user_creates_merge_request_spec.rb @@ -15,39 +15,27 @@ RSpec.describe "User creates a merge request", :js do sign_in(user) end - context 'when completed the compare branches form' do - before do - visit(project_new_merge_request_path(project)) + it "creates a merge request" do + visit(project_new_merge_request_path(project)) - find(".js-source-branch").click - click_link("fix") + find(".js-source-branch").click + click_link("fix") - find(".js-target-branch").click - click_link("feature") + find(".js-target-branch").click + click_link("feature") - click_button("Compare branches") - end + click_button("Compare branches") - it "shows merge request form" do - page.within('.merge-request-form') do - expect(page.find('#merge_request_description')['placeholder']).to eq 'Describe the goal of the changes and what reviewers should be aware of.' - end + page.within('.merge-request-form') do + expect(page.find('#merge_request_description')['placeholder']).to eq 'Describe the goal of the changes and what reviewers should be aware of.' end - context "when completed the merge request form" do - before do - fill_in("Title", with: title) - click_button("Create merge request") - end + fill_in("Title", with: title) + click_button("Create merge request") - it "creates a merge request" do - page.within(".merge-request") do - expect(page).to have_content(title) - end - end + page.within(".merge-request") do + expect(page).to have_content(title) end - - it_behaves_like 'merge request author auto assign' end context "XSS branch name exists" do |