Merge branch 'revert-mr-state-names'

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	features/steps/project/merge_requests.rb

2 files changed, 5 insertions, 5 deletions

diff --git a/features/project/merge_requests.feature b/features/project/merge_requests.feature
index eb091c291e9..d043badbc46 100644
--- a/features/project/merge_requests.feature
+++ b/features/project/merge_requests.feature
@@ -11,7 +11,7 @@ Feature: Project Merge Requests
     And I should not see "Feature NS-03" in merge requests
 
   Scenario: I should see rejected merge requests
-    Given I click link "Rejected"
+    Given I click link "Closed"
     Then I should see "Feature NS-03" in merge requests
     And I should not see "Bug NS-04" in merge requests
 
diff --git a/features/steps/project/merge_requests.rb b/features/steps/project/merge_requests.rb
index b072fef235e..5684d661527 100644
--- a/features/steps/project/merge_requests.rb
+++ b/features/steps/project/merge_requests.rb
@@ -19,8 +19,8 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps
     click_link "All"
   end
 
-  step 'I click link "Rejected"' do
-    click_link "Rejected"
+  step 'I click link "Closed"' do
+    click_link "Closed"
   end
 
   step 'I should see merge request "Wiki Feature"' do
@@ -32,7 +32,7 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps
   step 'I should see closed merge request "Bug NS-04"' do
     merge_request = MergeRequest.find_by!(title: "Bug NS-04")
     expect(merge_request).to be_closed
-    expect(page).to have_content 'Rejected by'
+    expect(page).to have_content "Closed by"
   end
 
   step 'I should see merge request "Bug NS-04"' do
@@ -212,7 +212,7 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps
 
   step 'I should see merged request' do
     page.within '.issue-box' do
-      expect(page).to have_content "Accepted"
+      expect(page).to have_content "Merged"
     end
   end