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
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
iv
gitlab-ce
Commits
dd68e37d
Commit
dd68e37d
authored
Oct 09, 2013
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix profile specs
parent
e50c0d5c
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
5 deletions
+5
-5
spec/features/profile_spec.rb
spec/features/profile_spec.rb
+3
-3
spec/features/security/profile_access_spec.rb
spec/features/security/profile_access_spec.rb
+1
-1
spec/routing/routing_spec.rb
spec/routing/routing_spec.rb
+1
-1
No files found.
spec/features/profile_spec.rb
View file @
dd68e37d
...
@@ -12,7 +12,7 @@ describe "Profile account page" do
...
@@ -12,7 +12,7 @@ describe "Profile account page" do
describe
"when signup is enabled"
do
describe
"when signup is enabled"
do
before
do
before
do
Gitlab
.
config
.
gitlab
.
stub
(
:signup_enabled
).
and_return
(
true
)
Gitlab
.
config
.
gitlab
.
stub
(
:signup_enabled
).
and_return
(
true
)
visit
account_profile
_path
visit
profile_account
_path
end
end
it
{
page
.
should
have_content
(
"Remove account"
)
}
it
{
page
.
should
have_content
(
"Remove account"
)
}
...
@@ -26,12 +26,12 @@ describe "Profile account page" do
...
@@ -26,12 +26,12 @@ describe "Profile account page" do
describe
"when signup is disabled"
do
describe
"when signup is disabled"
do
before
do
before
do
Gitlab
.
config
.
gitlab
.
stub
(
:signup_enabled
).
and_return
(
false
)
Gitlab
.
config
.
gitlab
.
stub
(
:signup_enabled
).
and_return
(
false
)
visit
account_profile
_path
visit
profile_account
_path
end
end
it
"should not have option to remove account"
do
it
"should not have option to remove account"
do
page
.
should_not
have_content
(
"Remove account"
)
page
.
should_not
have_content
(
"Remove account"
)
current_path
.
should
==
account_profile
_path
current_path
.
should
==
profile_account
_path
end
end
end
end
end
end
spec/features/security/profile_access_spec.rb
View file @
dd68e37d
...
@@ -29,7 +29,7 @@ describe "Users Security" do
...
@@ -29,7 +29,7 @@ describe "Users Security" do
end
end
describe
"GET /profile/account"
do
describe
"GET /profile/account"
do
subject
{
account_profile
_path
}
subject
{
profile_account
_path
}
it
{
should
be_allowed_for
@u1
}
it
{
should
be_allowed_for
@u1
}
it
{
should
be_allowed_for
:admin
}
it
{
should
be_allowed_for
:admin
}
...
...
spec/routing/routing_spec.rb
View file @
dd68e37d
...
@@ -128,7 +128,7 @@ end
...
@@ -128,7 +128,7 @@ end
# profile_update PUT /profile/update(.:format) profile#update
# profile_update PUT /profile/update(.:format) profile#update
describe
ProfilesController
,
"routing"
do
describe
ProfilesController
,
"routing"
do
it
"to #account"
do
it
"to #account"
do
get
(
"/profile/account"
).
should
route_to
(
'profiles
#account
'
)
get
(
"/profile/account"
).
should
route_to
(
'profiles
/accounts#show
'
)
end
end
it
"to #history"
do
it
"to #history"
do
...
...
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