summaryrefslogtreecommitdiff
path: root/features
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-08-25 16:36:54 +0200
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-08-25 16:36:54 +0200
commit7569010bc3918af0098e00eb56fce1a18d8ca72e (patch)
tree785eb885d032bacf5d397b7f4bdd78a44a10e673 /features
parentc11e43145f87436062f3840d16a9fcf97286265a (diff)
downloadgitlab-ce-7569010bc3918af0098e00eb56fce1a18d8ca72e.tar.gz
Fix tests and last push widgetseparate-activity
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'features')
-rw-r--r--features/dashboard/dashboard.feature8
-rw-r--r--features/dashboard/event_filters.feature8
-rw-r--r--features/steps/shared/paths.rb4
3 files changed, 14 insertions, 6 deletions
diff --git a/features/dashboard/dashboard.feature b/features/dashboard/dashboard.feature
index 1959d327082..392d4235eff 100644
--- a/features/dashboard/dashboard.feature
+++ b/features/dashboard/dashboard.feature
@@ -10,6 +10,10 @@ Feature: Dashboard
Scenario: I should see projects list
Then I should see "New Project" link
Then I should see "Shop" project link
+
+ @javascript
+ Scenario: I should see activity list
+ And I visit dashboard activity page
Then I should see project "Shop" activity feed
Scenario: I should see groups list
@@ -26,12 +30,12 @@ Feature: Dashboard
@javascript
Scenario: I should see User joined Project event
Given user with name "John Doe" joined project "Shop"
- When I visit dashboard page
+ When I visit dashboard activity page
Then I should see "John Doe joined project Shop" event
@javascript
Scenario: I should see User left Project event
Given user with name "John Doe" joined project "Shop"
And user with name "John Doe" left project "Shop"
- When I visit dashboard page
+ When I visit dashboard activity page
Then I should see "John Doe left project Shop" event
diff --git a/features/dashboard/event_filters.feature b/features/dashboard/event_filters.feature
index ec5680caba6..96399ea21a6 100644
--- a/features/dashboard/event_filters.feature
+++ b/features/dashboard/event_filters.feature
@@ -6,7 +6,7 @@ Feature: Event Filters
And this project has push event
And this project has new member event
And this project has merge request event
- And I visit dashboard page
+ And I visit dashboard activity page
@javascript
Scenario: I should see all events
@@ -16,7 +16,7 @@ Feature: Event Filters
@javascript
Scenario: I should see only pushed events
- When I click "push" event filter
+ When I click "push" event filter
Then I should see push event
And I should not see new member event
And I should not see merge request event
@@ -38,11 +38,11 @@ Feature: Event Filters
@javascript
Scenario: I should see only selected events while page reloaded
When I click "push" event filter
- And I visit dashboard page
+ And I visit dashboard activity page
Then I should see push event
And I should not see new member event
When I click "team" event filter
- And I visit dashboard page
+ And I visit dashboard activity page
Then I should see push event
And I should see new member event
And I should not see merge request event
diff --git a/features/steps/shared/paths.rb b/features/steps/shared/paths.rb
index ca8fbb49101..b4deccb6520 100644
--- a/features/steps/shared/paths.rb
+++ b/features/steps/shared/paths.rb
@@ -71,6 +71,10 @@ module SharedPaths
visit dashboard_path
end
+ step 'I visit dashboard activity page' do
+ visit activity_dashboard_path
+ end
+
step 'I visit dashboard projects page' do
visit projects_dashboard_path
end