Commit 7f368753741a9998c1cbde06c44c5b53677a47d9
1 parent
9fddd5b4
Exists in
master
and in
4 other branches
Fixed mr filter tests
Showing
1 changed file
with
5 additions
and
5 deletions
Show diff stats
features/steps/dashboard/dashboard_event_filters.rb
| 1 | class EventFilters < Spinach::FeatureSteps | 1 | class EventFilters < Spinach::FeatureSteps |
| 2 | include SharedAuthentication | 2 | include SharedAuthentication |
| 3 | - include SharedPaths | 3 | + include SharedPaths |
| 4 | include SharedProject | 4 | include SharedProject |
| 5 | 5 | ||
| 6 | Then 'I should see push event' do | 6 | Then 'I should see push event' do |
| 7 | page.should have_selector('span.pushed') | 7 | page.should have_selector('span.pushed') |
| 8 | end | 8 | end |
| 9 | - | 9 | + |
| 10 | Then 'I should not see push event' do | 10 | Then 'I should not see push event' do |
| 11 | page.should_not have_selector('span.pushed') | 11 | page.should_not have_selector('span.pushed') |
| 12 | end | 12 | end |
| @@ -20,11 +20,11 @@ class EventFilters < Spinach::FeatureSteps | @@ -20,11 +20,11 @@ class EventFilters < Spinach::FeatureSteps | ||
| 20 | end | 20 | end |
| 21 | 21 | ||
| 22 | Then 'I should see merge request event' do | 22 | Then 'I should see merge request event' do |
| 23 | - page.should have_selector('span.merged') | 23 | + page.should have_selector('span.accepted') |
| 24 | end | 24 | end |
| 25 | 25 | ||
| 26 | And 'I should not see merge request event' do | 26 | And 'I should not see merge request event' do |
| 27 | - page.should_not have_selector('span.merged') | 27 | + page.should_not have_selector('span.accepted') |
| 28 | end | 28 | end |
| 29 | 29 | ||
| 30 | And 'this project has push event' do | 30 | And 'this project has push event' do |
| @@ -68,7 +68,7 @@ class EventFilters < Spinach::FeatureSteps | @@ -68,7 +68,7 @@ class EventFilters < Spinach::FeatureSteps | ||
| 68 | target_id: merge_request.id, | 68 | target_id: merge_request.id, |
| 69 | target_type: "MergeRequest", | 69 | target_type: "MergeRequest", |
| 70 | author_id: @user.id | 70 | author_id: @user.id |
| 71 | - ) | 71 | + ) |
| 72 | end | 72 | end |
| 73 | 73 | ||
| 74 | When 'I click "push" event filter' do | 74 | When 'I click "push" event filter' do |