diff --git a/features/project/merge_requests.feature b/features/project/merge_requests.feature index 3ca099b95726fd03b3a61fb760537318bbc35a70..556b96338d6de044a6cf912079cf4c50118902f8 100644 --- a/features/project/merge_requests.feature +++ b/features/project/merge_requests.feature @@ -29,7 +29,6 @@ Feature: Project Merge Requests And I click link "Close" Then I should see closed merge request "Bug NS-04" - @javascript Scenario: I submit new unassigned merge request Given I click link "New Merge Request" And I submit new merge request "Wiki Feature" diff --git a/features/steps/project/project_merge_requests.rb b/features/steps/project/project_merge_requests.rb index fcbae8b8fb0dcc7452c19fee57b8f3656496c73e..cc2648c62043b3abefc581d796f1c91675a19f64 100644 --- a/features/steps/project/project_merge_requests.rb +++ b/features/steps/project/project_merge_requests.rb @@ -60,20 +60,8 @@ class ProjectMergeRequests < Spinach::FeatureSteps step 'I submit new merge request "Wiki Feature"' do fill_in "merge_request_title", with: "Wiki Feature" - - # this must come first, so that the target branch is set - # by the time the "select" for "notes_refactoring" is executed - select project.path_with_namespace, from: "merge_request_target_project_id" select "master", from: "merge_request_source_branch" - - find(:select, "merge_request_target_project_id", {}).value.should == project.id.to_s - find(:select, "merge_request_source_project_id", {}).value.should == project.id.to_s - - # using "notes_refactoring" because "Bug NS-04" uses master/stable, - # this will fail merge_request validation if the branches are the same - find(:select, "merge_request_target_branch", {}).find(:option, "notes_refactoring", {}).value.should == "notes_refactoring" select "notes_refactoring", from: "merge_request_target_branch" - click_button "Submit merge request" end