diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-02-18 17:34:22 +0200 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-02-18 17:34:22 +0200 |
| commit | 555c25e601fb32f23e652ee301c02f4d5ee8e59f (patch) | |
| tree | 3c03602ec10b24aa2d6bcdaa5b9d0c2aa9e42b01 | |
| parent | d169ae132b814425f4e66473848aa5220a3d6545 (diff) | |
| download | gitlab-ce-555c25e601fb32f23e652ee301c02f4d5ee8e59f.tar.gz | |
Fix random failing test
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| -rw-r--r-- | features/project/merge_requests.feature | 1 | ||||
| -rw-r--r-- | features/steps/project/project_merge_requests.rb | 12 |
2 files changed, 0 insertions, 13 deletions
diff --git a/features/project/merge_requests.feature b/features/project/merge_requests.feature index 3ca099b9572..556b96338d6 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 fcbae8b8fb0..cc2648c6204 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 |