kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Update specs.

Browse source
This commit is contained in:
Douwe Maan 2015-05-25 17:36:17 +02:00
parent d25026a512
commit 7df45882a9
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
features/project/merge_requests.feature
View file

@ -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

8
features/steps/project/merge_requests.rb
View file

@ -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