1 files changed, 47 insertions, 24 deletions

diff --git a/features/steps/project/project_merge_requests.rb b/features/steps/project/project_merge_requests.rb
index 7b0f8cc7ad2..8ef952cf3d1 100644
--- a/features/steps/project/project_merge_requests.rb
+++ b/features/steps/project/project_merge_requests.rb
@@ -4,60 +4,60 @@ class ProjectMergeRequests < Spinach::FeatureSteps
   include SharedNote
   include SharedPaths
 
-  Given 'I click link "New Merge Request"' do
+  step 'I click link "New Merge Request"' do
     click_link "New Merge Request"
   end
 
-  Given 'I click link "Bug NS-04"' do
+  step 'I click link "Bug NS-04"' do
     click_link "Bug NS-04"
   end
 
-  Given 'I click link "All"' do
+  step 'I click link "All"' do
     click_link "All"
   end
 
-  Given 'I click link "Closed"' do
+  step 'I click link "Closed"' do
     click_link "Closed"
   end
 
-  Then 'I should see merge request "Wiki Feature"' do
+  step 'I should see merge request "Wiki Feature"' do
     within '.merge-request' do
       page.should have_content "Wiki Feature"
     end
   end
 
-  Then 'I should see closed merge request "Bug NS-04"' do
+  step 'I should see closed merge request "Bug NS-04"' do
     merge_request = MergeRequest.find_by_title!("Bug NS-04")
     merge_request.closed?.should be_true
     page.should have_content "Closed by"
   end
 
-  Then 'I should see merge request "Bug NS-04"' do
+  step 'I should see merge request "Bug NS-04"' do
     page.should have_content "Bug NS-04"
   end
 
-  Then 'I should see "Bug NS-04" in merge requests' do
+  step 'I should see "Bug NS-04" in merge requests' do
     page.should have_content "Bug NS-04"
   end
 
-  Then 'I should see "Feature NS-03" in merge requests' do
+  step 'I should see "Feature NS-03" in merge requests' do
     page.should have_content "Feature NS-03"
   end
 
-  And 'I should not see "Feature NS-03" in merge requests' do
+  step 'I should not see "Feature NS-03" in merge requests' do
     page.should_not have_content "Feature NS-03"
   end
 
 
-  And 'I should not see "Bug NS-04" in merge requests' do
+  step 'I should not see "Bug NS-04" in merge requests' do
     page.should_not have_content "Bug NS-04"
   end
 
-  And 'I click link "Close"' do
+  step 'I click link "Close"' do
     click_link "Close"
   end
 
-  And 'I submit new merge request "Wiki Feature"' do
+  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
@@ -76,7 +76,7 @@ class ProjectMergeRequests < Spinach::FeatureSteps
     click_button "Submit merge request"
   end
 
-  And 'project "Shop" have "Bug NS-04" open merge request' do
+  step 'project "Shop" have "Bug NS-04" open merge request' do
     create(:merge_request,
            title: "Bug NS-04",
            source_project: project,
@@ -84,7 +84,7 @@ class ProjectMergeRequests < Spinach::FeatureSteps
            author: project.users.first)
   end
 
-  And 'project "Shop" have "Bug NS-05" open merge request with diffs inside' do
+  step 'project "Shop" have "Bug NS-05" open merge request with diffs inside' do
     create(:merge_request_with_diffs,
            title: "Bug NS-05",
            source_project: project,
@@ -92,7 +92,7 @@ class ProjectMergeRequests < Spinach::FeatureSteps
            author: project.users.first)
   end
 
-  And 'project "Shop" have "Feature NS-03" closed merge request' do
+  step 'project "Shop" have "Feature NS-03" closed merge request' do
     create(:closed_merge_request,
            title: "Feature NS-03",
            source_project: project,
@@ -100,19 +100,19 @@ class ProjectMergeRequests < Spinach::FeatureSteps
            author: project.users.first)
   end
 
-  And 'I switch to the diff tab' do
+  step 'I switch to the diff tab' do
     visit diffs_project_merge_request_path(project, merge_request)
   end
 
-  And 'I switch to the merge request\'s comments tab' do
+  step 'I switch to the merge request\'s comments tab' do
     visit project_merge_request_path(project, merge_request)
   end
 
-  And 'I click on the first commit in the merge request' do
+  step 'I click on the first commit in the merge request' do
     click_link merge_request.commits.first.short_id(8)
   end
 
-  And 'I leave a comment on the diff page' do
+  step 'I leave a comment on the diff page' do
     init_diff_note
 
     within('.js-discussion-note-form') do
@@ -125,7 +125,7 @@ class ProjectMergeRequests < Spinach::FeatureSteps
     end
   end
 
-  And 'I leave a comment like "Line is wrong" on line 185 of the first file' do
+  step 'I leave a comment like "Line is wrong" on line 185 of the first file' do
     init_diff_note
 
     within(".js-discussion-note-form") do
@@ -138,24 +138,47 @@ class ProjectMergeRequests < Spinach::FeatureSteps
     end
   end
 
-  Then 'I should see a discussion has started on line 185' do
+  step 'I should see a discussion has started on line 185' do
     page.should have_content "#{current_user.name} started a discussion on this merge request diff"
     page.should have_content "app/assets/stylesheets/tree.scss:L185"
     page.should have_content "Line is wrong"
   end
 
-  Then 'I should see a discussion has started on commit bcf03b5de6c:L185' do
+  step 'I should see a discussion has started on commit bcf03b5de6c:L185' do
     page.should have_content "#{current_user.name} started a discussion on commit"
     page.should have_content "app/assets/stylesheets/tree.scss:L185"
     page.should have_content "Line is wrong"
   end
 
-  Then 'I should see a discussion has started on commit bcf03b5de6c' do
+  step 'I should see a discussion has started on commit bcf03b5de6c' do
     page.should have_content "#{current_user.name} started a discussion on commit bcf03b5de6c"
     page.should have_content "One comment to rule them all"
     page.should have_content "app/assets/stylesheets/tree.scss:L185"
   end
 
+  step 'merge request is mergeable' do
+    page.should have_content 'You can accept this request automatically'
+  end
+
+  step 'I modify merge commit message' do
+    find('.modify-merge-commit-link').click
+    fill_in 'merge_commit_message', with: "wow such merge"
+  end
+
+  step 'merge request "Bug NS-05" is mergeable' do
+    merge_request.mark_as_mergeable
+  end
+
+  step 'I accept this merge request' do
+    click_button "Accept Merge Request"
+  end
+
+  step 'I should see merged request' do
+    within '.page-title' do
+      page.should have_content "Merged"
+    end
+  end
+
   def project
     @project ||= Project.find_by_name!("Shop")
   end