From 5e89354fe605f8b6ed5b2db47935be76876dfd3e Mon Sep 17 00:00:00 2001 From: Marin Jankovski Date: Thu, 15 May 2014 13:39:27 +0200 Subject: [PATCH] Fix for test with new form of MR. --- features/project/merge_requests.feature | 1 + features/steps/project/merge_requests.rb | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/features/project/merge_requests.feature b/features/project/merge_requests.feature index 8a0f14751e..f16e8dc675 100644 --- a/features/project/merge_requests.feature +++ b/features/project/merge_requests.feature @@ -142,4 +142,5 @@ Feature: Project Merge Requests Scenario: I submit new unassigned merge request with template description Given I click link "New Merge Request" + And I select "notes_refactoring" as source Then I should see description field pre-filled diff --git a/features/steps/project/merge_requests.rb b/features/steps/project/merge_requests.rb index 738f32a529..756d0db21c 100644 --- a/features/steps/project/merge_requests.rb +++ b/features/steps/project/merge_requests.rb @@ -239,6 +239,12 @@ class ProjectMergeRequests < Spinach::FeatureSteps end end + step 'I select "notes_refactoring" as source' do + select "master", from: "merge_request_source_branch" + select "notes_refactoring", from: "merge_request_target_branch" + click_button "Compare branches" + end + step 'I should see description field pre-filled' do find_field('merge_request_description').value.should == 'This merge request should contain the following.' end