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

Fix spinach test

This commit is contained in:
Clement Ho 2017-06-06 16:58:44 -05:00
parent b6bded14be
commit f1dc6b57d7
4 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
features/project/issues/issues.feature
View File

@ -12,11 +12,13 @@ Feature: Project Issues
Given I should see "Release 0.4" in issues Given I should see "Release 0.4" in issues
And I should not see "Release 0.3" in issues And I should not see "Release 0.3" in issues
@javascript
Scenario: I should see closed issues Scenario: I should see closed issues
Given I click link "Closed" Given I click link "Closed"
Then I should see "Release 0.3" in issues Then I should see "Release 0.3" in issues
And I should not see "Release 0.4" in issues And I should not see "Release 0.4" in issues
@javascript
Scenario: I should see all issues Scenario: I should see all issues
Given I click link "All" Given I click link "All"
Then I should see "Release 0.3" in issues Then I should see "Release 0.3" in issues

2
features/project/merge_requests.feature
View File

@ -38,11 +38,13 @@ Feature: Project Merge Requests
When I visit merge request page "Bug NS-08" When I visit merge request page "Bug NS-08"
Then I should see the diverged commits count Then I should see the diverged commits count
@javascript
Scenario: I should see rejected merge requests Scenario: I should see rejected merge requests
Given I click link "Closed" Given I click link "Closed"
Then I should see "Feature NS-03" in merge requests Then I should see "Feature NS-03" in merge requests
And I should not see "Bug NS-04" in merge requests And I should not see "Bug NS-04" in merge requests
@javascript
Scenario: I should see all merge requests Scenario: I should see all merge requests
Given I click link "All" Given I click link "All"
Then I should see "Feature NS-03" in merge requests Then I should see "Feature NS-03" in merge requests

4
features/steps/project/issues/issues.rb
View File

@ -28,7 +28,7 @@ class Spinach::Features::ProjectIssues < Spinach::FeatureSteps
end end
step 'I click link "Closed"' do step 'I click link "Closed"' do
find('.issues-state-filters a', text: "Closed").click find('.issues-state-filters .state-closed span', text: 'Closed').click
end end
step 'I click button "Unsubscribe"' do step 'I click button "Unsubscribe"' do
@ -44,7 +44,7 @@ class Spinach::Features::ProjectIssues < Spinach::FeatureSteps
end end
step 'I click link "All"' do step 'I click link "All"' do
click_link "All" find('.issues-state-filters .state-all span', text: 'All').click
# Waits for load # Waits for load
expect(find('.issues-state-filters > .active')).to have_content 'All' expect(find('.issues-state-filters > .active')).to have_content 'All'
end end

6
features/steps/project/merge_requests.rb
View File

@ -26,7 +26,7 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps
end end
step 'I click link "All"' do step 'I click link "All"' do
click_link "All" find('.issues-state-filters .state-all span', text: 'All').click
# Waits for load # Waits for load
expect(find('.issues-state-filters > .active')).to have_content 'All' expect(find('.issues-state-filters > .active')).to have_content 'All'
end end
@ -36,9 +36,7 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps
end end
step 'I click link "Closed"' do step 'I click link "Closed"' do
page.within('.issues-state-filters') do find('.issues-state-filters .state-closed span', text: 'Closed').click
click_link "Closed"
end
end end
step 'I should see merge request "Wiki Feature"' do step 'I should see merge request "Wiki Feature"' do