diff options
author | Douwe Maan <douwe@gitlab.com> | 2015-05-25 17:36:17 +0200 |
---|---|---|
committer | Douwe Maan <douwe@gitlab.com> | 2015-05-25 18:37:38 +0200 |
commit | 7df45882a93220c6250294fb653f5e64464ebb64 (patch) | |
tree | 389d863ab41e5220b69923c4ac91b3d0c946b7a2 | |
parent | d25026a512cd0f8137ef6685a23a1d2ce898ffa7 (diff) | |
download | gitlab-ce-accepted-rejected-mrs.tar.gz |
Update specs.accepted-rejected-mrs
-rw-r--r-- | features/project/merge_requests.feature | 4 | ||||
-rw-r--r-- | features/steps/project/merge_requests.rb | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/features/project/merge_requests.feature b/features/project/merge_requests.feature index 60caf783fe4..7a831901607 100644 --- a/features/project/merge_requests.feature +++ b/features/project/merge_requests.feature @@ -10,8 +10,8 @@ Feature: Project Merge Requests Then I should see "Bug NS-04" in merge requests And I should not see "Feature NS-03" in merge requests - Scenario: I should see closed merge requests - Given I click link "Closed" + Scenario: I should see rejected merge requests + Given I click link "Rejected" 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 f67e6e3d8ca..92de94a75d3 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 "Closed"' do - click_link "Closed" + step 'I click link "Rejected"' do + click_link "Rejected" 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") merge_request.closed?.should be_true - page.should have_content "Closed by" + page.should have_content "Rejected by" end step 'I should see merge request "Bug NS-04"' do @@ -202,7 +202,7 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps step 'I should see merged request' do within '.issue-box' do - page.should have_content "Merged" + page.should have_content "Accepted" end end |