Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-03-09 06:52:22 +0300
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-03-09 06:52:22 +0300
commit7e4258777f8eed31cfe202bb96178823218f3b1c (patch)
treed908f55aa559721914d16ef4d9f1b301e5da10bd /features
parent9b3e156e43b8a14e4eb294a47bda6a477c8573b0 (diff)
Move Profile groups tests to Dashboard group tests
Diffstat (limited to 'features')
-rw-r--r--features/dashboard/group.feature (renamed from features/profile/group.feature)16
-rw-r--r--features/steps/dashboard/group.rb (renamed from features/steps/profile/group.rb)2
-rw-r--r--features/steps/shared/paths.rb16
3 files changed, 17 insertions, 17 deletions
diff --git a/features/profile/group.feature b/features/dashboard/group.feature
index e2fbfde77be..0e4acb325b7 100644
--- a/features/profile/group.feature
+++ b/features/dashboard/group.feature
@@ -1,4 +1,4 @@
-@profile
+@dashboard
Feature: Profile Group
Background:
Given I sign in as "John Doe"
@@ -10,18 +10,18 @@ Feature: Profile Group
@javascript
Scenario: Owner should be able to leave from group if he is not the last owner
Given "Mary Jane" is owner of group "Owned"
- When I visit profile groups page
+ When I visit dashboard groups page
Then I should see group "Owned" in group list
Then I should see group "Guest" in group list
When I click on the "Leave" button for group "Owned"
- And I visit profile groups page
+ And I visit dashboard groups page
Then I should not see group "Owned" in group list
Then I should see group "Guest" in group list
@javascript
Scenario: Owner should not be able to leave from group if he is the last owner
Given "Mary Jane" is guest of group "Owned"
- When I visit profile groups page
+ When I visit dashboard groups page
Then I should see group "Owned" in group list
Then I should see group "Guest" in group list
Then I should not see the "Leave" button for group "Owned"
@@ -29,20 +29,20 @@ Feature: Profile Group
@javascript
Scenario: Guest should be able to leave from group
Given "Mary Jane" is guest of group "Guest"
- When I visit profile groups page
+ When I visit dashboard groups page
Then I should see group "Owned" in group list
Then I should see group "Guest" in group list
When I click on the "Leave" button for group "Guest"
- When I visit profile groups page
+ When I visit dashboard groups page
Then I should see group "Owned" in group list
Then I should not see group "Guest" in group list
@javascript
Scenario: Guest should be able to leave from group even if he is the only user in the group
- When I visit profile groups page
+ When I visit dashboard groups page
Then I should see group "Owned" in group list
Then I should see group "Guest" in group list
When I click on the "Leave" button for group "Guest"
- When I visit profile groups page
+ When I visit dashboard groups page
Then I should see group "Owned" in group list
Then I should not see group "Guest" in group list
diff --git a/features/steps/profile/group.rb b/features/steps/dashboard/group.rb
index 0a10e04e219..09d7717b67b 100644
--- a/features/steps/profile/group.rb
+++ b/features/steps/dashboard/group.rb
@@ -1,4 +1,4 @@
-class Spinach::Features::ProfileGroup < Spinach::FeatureSteps
+class Spinach::Features::DashboardGroup < Spinach::FeatureSteps
include SharedAuthentication
include SharedGroup
include SharedPaths
diff --git a/features/steps/shared/paths.rb b/features/steps/shared/paths.rb
index 835b644e6c7..db6417bf951 100644
--- a/features/steps/shared/paths.rb
+++ b/features/steps/shared/paths.rb
@@ -87,6 +87,14 @@ module SharedPaths
visit help_path
end
+ step 'I visit dashboard groups page' do
+ visit dashboard_groups_path
+ end
+
+ step 'I should be redirected to the dashboard groups page' do
+ current_path.should == dashboard_groups_path
+ end
+
# ----------------------------------------
# Profile
# ----------------------------------------
@@ -119,14 +127,6 @@ module SharedPaths
visit history_profile_path
end
- step 'I visit profile groups page' do
- visit profile_groups_path
- end
-
- step 'I should be redirected to the profile groups page' do
- current_path.should == profile_groups_path
- end
-
# ----------------------------------------
# Admin
# ----------------------------------------