Download as
Browse Code »

Commit 555c25e601fb32f23e652ee301c02f4d5ee8e59f

Authored by Dmitriy Zaporozhets
1 parent d169ae13
Exists in spb-stable and in 3 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb

Fix random failing test 

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Showing 2 changed files with 0 additions and 13 deletions   Show diff stats
features/project/merge_requests.feature
  Diff comments   View file @555c25e
@@ -29,7 +29,6 @@ Feature: Project Merge Requests @@ -29,7 +29,6 @@ Feature: Project Merge Requests
29 And I click link "Close" 29 And I click link "Close"
30 Then I should see closed merge request "Bug NS-04" 30 Then I should see closed merge request "Bug NS-04"
31 31
32 - @javascript  
33 Scenario: I submit new unassigned merge request 32 Scenario: I submit new unassigned merge request
34 Given I click link "New Merge Request" 33 Given I click link "New Merge Request"
35 And I submit new merge request "Wiki Feature" 34 And I submit new merge request "Wiki Feature"
features/steps/project/project_merge_requests.rb
  Diff comments   View file @555c25e
@@ -60,20 +60,8 @@ class ProjectMergeRequests &lt; Spinach::FeatureSteps @@ -60,20 +60,8 @@ class ProjectMergeRequests &lt; Spinach::FeatureSteps
60 60
61 step 'I submit new merge request "Wiki Feature"' do 61 step 'I submit new merge request "Wiki Feature"' do
62 fill_in "merge_request_title", with: "Wiki Feature" 62 fill_in "merge_request_title", with: "Wiki Feature"
63 -  
64 - # this must come first, so that the target branch is set  
65 - # by the time the "select" for "notes_refactoring" is executed  
66 - select project.path_with_namespace, from: "merge_request_target_project_id"  
67 select "master", from: "merge_request_source_branch" 63 select "master", from: "merge_request_source_branch"
68 -  
69 - find(:select, "merge_request_target_project_id", {}).value.should == project.id.to_s  
70 - find(:select, "merge_request_source_project_id", {}).value.should == project.id.to_s  
71 -  
72 - # using "notes_refactoring" because "Bug NS-04" uses master/stable,  
73 - # this will fail merge_request validation if the branches are the same  
74 - find(:select, "merge_request_target_branch", {}).find(:option, "notes_refactoring", {}).value.should == "notes_refactoring"  
75 select "notes_refactoring", from: "merge_request_target_branch" 64 select "notes_refactoring", from: "merge_request_target_branch"
76 -  
77 click_button "Submit merge request" 65 click_button "Submit merge request"
78 end 66 end
79 67