Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
gitlab-ce
Commits
7e425877
Commit
7e425877
authored
Mar 08, 2015
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Move Profile groups tests to Dashboard group tests
parent
9b3e156e
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
73 additions
and
76 deletions
+73
-76
features/dashboard/group.feature
features/dashboard/group.feature
+8
-8
features/steps/dashboard/group.rb
features/steps/dashboard/group.rb
+1
-1
features/steps/shared/paths.rb
features/steps/shared/paths.rb
+8
-8
spec/features/security/dashboard_access_spec.rb
spec/features/security/dashboard_access_spec.rb
+8
-0
spec/features/security/profile_access_spec.rb
spec/features/security/profile_access_spec.rb
+48
-59
No files found.
features/
profile
/group.feature
→
features/
dashboard
/group.feature
View file @
7e425877
@
profile
@
dashboard
Feature
:
Profile Group
Feature
:
Profile Group
Background
:
Background
:
Given
I sign in as
"John Doe"
Given
I sign in as
"John Doe"
...
@@ -10,18 +10,18 @@ Feature: Profile Group
...
@@ -10,18 +10,18 @@ Feature: Profile Group
@javascript
@javascript
Scenario
:
Owner should be able to leave from group if he is not the last owner
Scenario
:
Owner should be able to leave from group if he is not the last owner
Given
"Mary Jane"
is owner of group
"Owned"
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
"Owned"
in group list
Then
I should see group
"Guest"
in group list
Then
I should see group
"Guest"
in group list
When
I click on the
"Leave"
button for group
"Owned"
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 not see group
"Owned"
in group list
Then
I should see group
"Guest"
in group list
Then
I should see group
"Guest"
in group list
@javascript
@javascript
Scenario
:
Owner should not be able to leave from group if he is the last owner
Scenario
:
Owner should not be able to leave from group if he is the last owner
Given
"Mary Jane"
is guest of group
"Owned"
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
"Owned"
in group list
Then
I should see group
"Guest"
in group list
Then
I should see group
"Guest"
in group list
Then
I should not see the
"Leave"
button for group
"Owned"
Then
I should not see the
"Leave"
button for group
"Owned"
...
@@ -29,20 +29,20 @@ Feature: Profile Group
...
@@ -29,20 +29,20 @@ Feature: Profile Group
@javascript
@javascript
Scenario
:
Guest should be able to leave from group
Scenario
:
Guest should be able to leave from group
Given
"Mary Jane"
is guest of group
"Guest"
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
"Owned"
in group list
Then
I should see group
"Guest"
in group list
Then
I should see group
"Guest"
in group list
When
I click on the
"Leave"
button for group
"Guest"
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 see group
"Owned"
in group list
Then
I should not see group
"Guest"
in group list
Then
I should not see group
"Guest"
in group list
@javascript
@javascript
Scenario
:
Guest should be able to leave from group even if he is the only user in the group
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
"Owned"
in group list
Then
I should see group
"Guest"
in group list
Then
I should see group
"Guest"
in group list
When
I click on the
"Leave"
button for group
"Guest"
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 see group
"Owned"
in group list
Then
I should not see group
"Guest"
in group list
Then
I should not see group
"Guest"
in group list
features/steps/
profile
/group.rb
→
features/steps/
dashboard
/group.rb
View file @
7e425877
class
Spinach::Features::
Profile
Group
<
Spinach
::
FeatureSteps
class
Spinach::Features::
Dashboard
Group
<
Spinach
::
FeatureSteps
include
SharedAuthentication
include
SharedAuthentication
include
SharedGroup
include
SharedGroup
include
SharedPaths
include
SharedPaths
...
...
features/steps/shared/paths.rb
View file @
7e425877
...
@@ -87,6 +87,14 @@ module SharedPaths
...
@@ -87,6 +87,14 @@ module SharedPaths
visit
help_path
visit
help_path
end
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
# Profile
# ----------------------------------------
# ----------------------------------------
...
@@ -119,14 +127,6 @@ module SharedPaths
...
@@ -119,14 +127,6 @@ module SharedPaths
visit
history_profile_path
visit
history_profile_path
end
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
# Admin
# ----------------------------------------
# ----------------------------------------
...
...
spec/features/security/dashboard_access_spec.rb
View file @
7e425877
...
@@ -52,4 +52,12 @@ describe "Dashboard access", feature: true do
...
@@ -52,4 +52,12 @@ describe "Dashboard access", feature: true do
it
{
expect
(
new_group_path
).
to
be_allowed_for
:user
}
it
{
expect
(
new_group_path
).
to
be_allowed_for
:user
}
it
{
expect
(
new_group_path
).
to
be_denied_for
:visitor
}
it
{
expect
(
new_group_path
).
to
be_denied_for
:visitor
}
end
end
describe
"GET /profile/groups"
do
subject
{
dashboard_groups_path
}
it
{
is_expected
.
to
be_allowed_for
:admin
}
it
{
is_expected
.
to
be_allowed_for
:user
}
it
{
is_expected
.
to
be_denied_for
:visitor
}
end
end
end
spec/features/security/profile_access_spec.rb
View file @
7e425877
require
'spec_helper'
require
'spec_helper'
describe
"Users Security"
,
feature:
true
do
describe
"Profile access"
,
feature:
true
do
describe
"Project"
do
before
do
before
do
@u1
=
create
(
:user
)
@u1
=
create
(
:user
)
end
end
describe
"GET /login"
do
it
{
expect
(
new_user_session_path
).
not_to
be_404_for
:visitor
}
end
describe
"GET /profile/keys"
do
subject
{
profile_keys_path
}
it
{
is_expected
.
to
be_allowed_for
@u1
}
describe
"GET /login"
do
it
{
is_expected
.
to
be_allowed_for
:admin
}
it
{
expect
(
new_user_session_path
).
not_to
be_404_for
:visitor
}
it
{
is_expected
.
to
be_allowed_for
:user
}
end
it
{
is_expected
.
to
be_denied_for
:visitor
}
end
describe
"GET /profile
"
do
describe
"GET /profile/keys
"
do
subject
{
profile
_path
}
subject
{
profile_keys
_path
}
it
{
is_expected
.
to
be_allowed_for
@u1
}
it
{
is_expected
.
to
be_allowed_for
@u1
}
it
{
is_expected
.
to
be_allowed_for
:admin
}
it
{
is_expected
.
to
be_allowed_for
:admin
}
it
{
is_expected
.
to
be_allowed_for
:user
}
it
{
is_expected
.
to
be_allowed_for
:user
}
it
{
is_expected
.
to
be_denied_for
:visitor
}
it
{
is_expected
.
to
be_denied_for
:visitor
}
end
end
describe
"GET /profile/account
"
do
describe
"GET /profile
"
do
subject
{
profile_account
_path
}
subject
{
profile
_path
}
it
{
is_expected
.
to
be_allowed_for
@u1
}
it
{
is_expected
.
to
be_allowed_for
@u1
}
it
{
is_expected
.
to
be_allowed_for
:admin
}
it
{
is_expected
.
to
be_allowed_for
:admin
}
it
{
is_expected
.
to
be_allowed_for
:user
}
it
{
is_expected
.
to
be_allowed_for
:user
}
it
{
is_expected
.
to
be_denied_for
:visitor
}
it
{
is_expected
.
to
be_denied_for
:visitor
}
end
end
describe
"GET /profile/design
"
do
describe
"GET /profile/account
"
do
subject
{
design_profile
_path
}
subject
{
profile_account
_path
}
it
{
is_expected
.
to
be_allowed_for
@u1
}
it
{
is_expected
.
to
be_allowed_for
@u1
}
it
{
is_expected
.
to
be_allowed_for
:admin
}
it
{
is_expected
.
to
be_allowed_for
:admin
}
it
{
is_expected
.
to
be_allowed_for
:user
}
it
{
is_expected
.
to
be_allowed_for
:user
}
it
{
is_expected
.
to
be_denied_for
:visitor
}
it
{
is_expected
.
to
be_denied_for
:visitor
}
end
end
describe
"GET /profile/history
"
do
describe
"GET /profile/design
"
do
subject
{
history
_profile_path
}
subject
{
design
_profile_path
}
it
{
is_expected
.
to
be_allowed_for
@u1
}
it
{
is_expected
.
to
be_allowed_for
@u1
}
it
{
is_expected
.
to
be_allowed_for
:admin
}
it
{
is_expected
.
to
be_allowed_for
:admin
}
it
{
is_expected
.
to
be_allowed_for
:user
}
it
{
is_expected
.
to
be_allowed_for
:user
}
it
{
is_expected
.
to
be_denied_for
:visitor
}
it
{
is_expected
.
to
be_denied_for
:visitor
}
end
end
describe
"GET /profile/notifications
"
do
describe
"GET /profile/history
"
do
subject
{
profile_notifications
_path
}
subject
{
history_profile
_path
}
it
{
is_expected
.
to
be_allowed_for
@u1
}
it
{
is_expected
.
to
be_allowed_for
@u1
}
it
{
is_expected
.
to
be_allowed_for
:admin
}
it
{
is_expected
.
to
be_allowed_for
:admin
}
it
{
is_expected
.
to
be_allowed_for
:user
}
it
{
is_expected
.
to
be_allowed_for
:user
}
it
{
is_expected
.
to
be_denied_for
:visitor
}
it
{
is_expected
.
to
be_denied_for
:visitor
}
end
end
describe
"GET /profile/group
s"
do
describe
"GET /profile/notification
s"
do
subject
{
profile_group
s_path
}
subject
{
profile_notification
s_path
}
it
{
is_expected
.
to
be_allowed_for
@u1
}
it
{
is_expected
.
to
be_allowed_for
@u1
}
it
{
is_expected
.
to
be_allowed_for
:admin
}
it
{
is_expected
.
to
be_allowed_for
:admin
}
it
{
is_expected
.
to
be_allowed_for
:user
}
it
{
is_expected
.
to
be_allowed_for
:user
}
it
{
is_expected
.
to
be_denied_for
:visitor
}
it
{
is_expected
.
to
be_denied_for
:visitor
}
end
end
end
end
end
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment