Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
heptapod
heptapod
Commits
3b67e925ccad
Commit
a6ec5121
authored
Jun 14, 2017
by
Robert Speicher
Browse files
Correct RSpec/SingleLineHook cop offenses
parent
405a30211de5
Changes
205
Hide whitespace changes
Inline
Side-by-side
spec/controllers/admin/identities_controller_spec.rb
View file @
3b67e925
...
...
@@ -2,7 +2,10 @@
describe
Admin
::
IdentitiesController
do
let
(
:admin
)
{
create
(
:admin
)
}
before
{
sign_in
(
admin
)
}
before
do
sign_in
(
admin
)
end
describe
'UPDATE identity'
do
let
(
:user
)
{
create
(
:omniauth_user
,
provider:
'ldapmain'
,
extern_uid:
'uid=myuser,ou=people,dc=example,dc=com'
)
}
...
...
spec/controllers/admin/services_controller_spec.rb
View file @
3b67e925
...
...
@@ -3,7 +3,9 @@
describe
Admin
::
ServicesController
do
let
(
:admin
)
{
create
(
:admin
)
}
before
{
sign_in
(
admin
)
}
before
do
sign_in
(
admin
)
end
describe
'GET #edit'
do
let!
(
:project
)
{
create
(
:empty_project
)
}
...
...
spec/controllers/autocomplete_controller_spec.rb
View file @
3b67e925
...
...
@@ -200,7 +200,9 @@
end
context
'skip_users parameter included'
do
before
{
sign_in
(
user
)
}
before
do
sign_in
(
user
)
end
it
'skips the user IDs passed'
do
get
(
:users
,
skip_users:
[
user
,
user2
].
map
(
&
:id
))
...
...
spec/controllers/groups/group_members_controller_spec.rb
View file @
3b67e925
...
...
@@ -16,10 +16,14 @@
describe
'POST create'
do
let
(
:group_user
)
{
create
(
:user
)
}
before
{
sign_in
(
user
)
}
before
do
sign_in
(
user
)
end
context
'when user does not have enough rights'
do
before
{
group
.
add_developer
(
user
)
}
before
do
group
.
add_developer
(
user
)
end
it
'returns 403'
do
post
:create
,
group_id:
group
,
...
...
@@ -32,7 +36,9 @@
end
context
'when user has enough rights'
do
before
{
group
.
add_owner
(
user
)
}
before
do
group
.
add_owner
(
user
)
end
it
'adds user to members'
do
post
:create
,
group_id:
group
,
...
...
@@ -59,7 +65,9 @@
describe
'DELETE destroy'
do
let
(
:member
)
{
create
(
:group_member
,
:developer
,
group:
group
)
}
before
{
sign_in
(
user
)
}
before
do
sign_in
(
user
)
end
context
'when member is not found'
do
it
'returns 403'
do
...
...
@@ -71,7 +79,9 @@
context
'when member is found'
do
context
'when user does not have enough rights'
do
before
{
group
.
add_developer
(
user
)
}
before
do
group
.
add_developer
(
user
)
end
it
'returns 403'
do
delete
:destroy
,
group_id:
group
,
id:
member
...
...
@@ -82,7 +92,9 @@
end
context
'when user has enough rights'
do
before
{
group
.
add_owner
(
user
)
}
before
do
group
.
add_owner
(
user
)
end
it
'[HTML] removes user from members'
do
delete
:destroy
,
group_id:
group
,
id:
member
...
...
@@ -103,7 +115,9 @@
end
describe
'DELETE leave'
do
before
{
sign_in
(
user
)
}
before
do
sign_in
(
user
)
end
context
'when member is not found'
do
it
'returns 404'
do
...
...
@@ -115,7 +129,9 @@
context
'when member is found'
do
context
'and is not an owner'
do
before
{
group
.
add_developer
(
user
)
}
before
do
group
.
add_developer
(
user
)
end
it
'removes user from members'
do
delete
:leave
,
group_id:
group
...
...
@@ -134,7 +150,9 @@
end
context
'and is an owner'
do
before
{
group
.
add_owner
(
user
)
}
before
do
group
.
add_owner
(
user
)
end
it
'cannot removes himself from the group'
do
delete
:leave
,
group_id:
group
...
...
@@ -144,7 +162,9 @@
end
context
'and is a requester'
do
before
{
group
.
request_access
(
user
)
}
before
do
group
.
request_access
(
user
)
end
it
'removes user from members'
do
delete
:leave
,
group_id:
group
...
...
@@ -159,7 +179,9 @@
end
describe
'POST request_access'
do
before
{
sign_in
(
user
)
}
before
do
sign_in
(
user
)
end
it
'creates a new GroupMember that is not a team member'
do
post
:request_access
,
group_id:
group
...
...
@@ -174,7 +196,9 @@
describe
'POST approve_access_request'
do
let
(
:member
)
{
create
(
:group_member
,
:access_request
,
group:
group
)
}
before
{
sign_in
(
user
)
}
before
do
sign_in
(
user
)
end
context
'when member is not found'
do
it
'returns 403'
do
...
...
@@ -186,7 +210,9 @@
context
'when member is found'
do
context
'when user does not have enough rights'
do
before
{
group
.
add_developer
(
user
)
}
before
do
group
.
add_developer
(
user
)
end
it
'returns 403'
do
post
:approve_access_request
,
group_id:
group
,
id:
member
...
...
@@ -197,7 +223,9 @@
end
context
'when user has enough rights'
do
before
{
group
.
add_owner
(
user
)
}
before
do
group
.
add_owner
(
user
)
end
it
'adds user to members'
do
post
:approve_access_request
,
group_id:
group
,
id:
member
...
...
spec/controllers/notification_settings_controller_spec.rb
View file @
3b67e925
...
...
@@ -94,7 +94,10 @@
context
'not authorized'
do
let
(
:private_project
)
{
create
(
:empty_project
,
:private
)
}
before
{
sign_in
(
user
)
}
before
do
sign_in
(
user
)
end
it
'returns 404'
do
post
:create
,
...
...
@@ -120,7 +123,9 @@
end
context
'when authorized'
do
before
{
sign_in
(
user
)
}
before
do
sign_in
(
user
)
end
it
'returns success'
do
put
:update
,
...
...
@@ -152,7 +157,9 @@
context
'not authorized'
do
let
(
:other_user
)
{
create
(
:user
)
}
before
{
sign_in
(
other_user
)
}
before
do
sign_in
(
other_user
)
end
it
'returns 404'
do
put
:update
,
...
...
spec/controllers/profiles/personal_access_tokens_controller_spec.rb
View file @
3b67e925
...
...
@@ -4,7 +4,9 @@
let
(
:user
)
{
create
(
:user
)
}
let
(
:token_attributes
)
{
attributes_for
(
:personal_access_token
)
}
before
{
sign_in
(
user
)
}
before
do
sign_in
(
user
)
end
describe
'#create'
do
def
created_token
...
...
@@ -38,7 +40,9 @@ def created_token
let!
(
:inactive_personal_access_token
)
{
create
(
:personal_access_token
,
:revoked
,
user:
user
)
}
let!
(
:impersonation_personal_access_token
)
{
create
(
:personal_access_token
,
:impersonation
,
user:
user
)
}
before
{
get
:index
}
before
do
get
:index
end
it
"retrieves active personal access tokens"
do
expect
(
assigns
(
:active_personal_access_tokens
)).
to
include
(
active_personal_access_token
)
...
...
spec/controllers/projects/commit_controller_spec.rb
View file @
3b67e925
...
...
@@ -281,7 +281,9 @@ def diff_for_path(extra_params = {})
end
context
'when the path does not exist in the diff'
do
before
{
diff_for_path
(
id:
commit
.
id
,
old_path:
existing_path
.
succ
,
new_path:
existing_path
.
succ
)
}
before
do
diff_for_path
(
id:
commit
.
id
,
old_path:
existing_path
.
succ
,
new_path:
existing_path
.
succ
)
end
it
'returns a 404'
do
expect
(
response
).
to
have_http_status
(
404
)
...
...
@@ -302,7 +304,9 @@ def diff_for_path(extra_params = {})
end
context
'when the commit does not exist'
do
before
{
diff_for_path
(
id:
commit
.
id
.
succ
,
old_path:
existing_path
,
new_path:
existing_path
)
}
before
do
diff_for_path
(
id:
commit
.
id
.
succ
,
old_path:
existing_path
,
new_path:
existing_path
)
end
it
'returns a 404'
do
expect
(
response
).
to
have_http_status
(
404
)
...
...
spec/controllers/projects/compare_controller_spec.rb
View file @
3b67e925
...
...
@@ -128,7 +128,9 @@ def diff_for_path(extra_params = {})
end
context
'when the path does not exist in the diff'
do
before
{
diff_for_path
(
from:
ref_from
,
to:
ref_to
,
old_path:
existing_path
.
succ
,
new_path:
existing_path
.
succ
)
}
before
do
diff_for_path
(
from:
ref_from
,
to:
ref_to
,
old_path:
existing_path
.
succ
,
new_path:
existing_path
.
succ
)
end
it
'returns a 404'
do
expect
(
response
).
to
have_http_status
(
404
)
...
...
@@ -149,7 +151,9 @@ def diff_for_path(extra_params = {})
end
context
'when the from ref does not exist'
do
before
{
diff_for_path
(
from:
ref_from
.
succ
,
to:
ref_to
,
old_path:
existing_path
,
new_path:
existing_path
)
}
before
do
diff_for_path
(
from:
ref_from
.
succ
,
to:
ref_to
,
old_path:
existing_path
,
new_path:
existing_path
)
end
it
'returns a 404'
do
expect
(
response
).
to
have_http_status
(
404
)
...
...
@@ -157,7 +161,9 @@ def diff_for_path(extra_params = {})
end
context
'when the to ref does not exist'
do
before
{
diff_for_path
(
from:
ref_from
,
to:
ref_to
.
succ
,
old_path:
existing_path
,
new_path:
existing_path
)
}
before
do
diff_for_path
(
from:
ref_from
,
to:
ref_to
.
succ
,
old_path:
existing_path
,
new_path:
existing_path
)
end
it
'returns a 404'
do
expect
(
response
).
to
have_http_status
(
404
)
...
...
spec/controllers/projects/forks_controller_spec.rb
View file @
3b67e925
...
...
@@ -14,7 +14,9 @@ def get_forks
end
context
'when fork is public'
do
before
{
forked_project
.
update_attribute
(
:visibility_level
,
Project
::
PUBLIC
)
}
before
do
forked_project
.
update_attribute
(
:visibility_level
,
Project
::
PUBLIC
)
end
it
'is visible for non logged in users'
do
get_forks
...
...
@@ -35,7 +37,9 @@ def get_forks
end
context
'when user is logged in'
do
before
{
sign_in
(
project
.
creator
)
}
before
do
sign_in
(
project
.
creator
)
end
context
'when user is not a Project member neither a group member'
do
it
'does not see the Project listed'
do
...
...
@@ -46,7 +50,9 @@ def get_forks
end
context
'when user is a member of the Project'
do
before
{
forked_project
.
team
<<
[
project
.
creator
,
:developer
]
}
before
do
forked_project
.
team
<<
[
project
.
creator
,
:developer
]
end
it
'sees the project listed'
do
get_forks
...
...
@@ -56,7 +62,9 @@ def get_forks
end
context
'when user is a member of the Group'
do
before
{
forked_project
.
group
.
add_developer
(
project
.
creator
)
}
before
do
forked_project
.
group
.
add_developer
(
project
.
creator
)
end
it
'sees the project listed'
do
get_forks
...
...
spec/controllers/projects/group_links_controller_spec.rb
View file @
3b67e925
...
...
@@ -22,7 +22,10 @@
end
context
'when user has access to group he want to link project to'
do
before
{
group
.
add_developer
(
user
)
}
before
do
group
.
add_developer
(
user
)
end
include_context
'link project to group'
it
'links project with selected group'
do
...
...
spec/controllers/projects/issues_controller_spec.rb
View file @
3b67e925
...
...
@@ -212,7 +212,9 @@
let
(
:another_project
)
{
create
(
:empty_project
,
:private
)
}
context
'when user has access to move issue'
do
before
{
another_project
.
team
<<
[
user
,
:reporter
]
}
before
do
another_project
.
team
<<
[
user
,
:reporter
]
end
it
'moves issue to another project'
do
move_issue
...
...
@@ -250,14 +252,18 @@
end
context
'when an issue is identified as spam'
do
before
{
allow_any_instance_of
(
AkismetService
).
to
receive
(
:is_spam?
).
and_return
(
true
)
}
before
do
allow_any_instance_of
(
AkismetService
).
to
receive
(
:is_spam?
).
and_return
(
true
)
end
context
'when captcha is not verified'
do
def
update_spam_issue
update_issue
(
title:
'Spam Title'
,
description:
'Spam lives here'
)
end
before
{
allow_any_instance_of
(
described_class
).
to
receive
(
:verify_recaptcha
).
and_return
(
false
)
}
before
do
allow_any_instance_of
(
described_class
).
to
receive
(
:verify_recaptcha
).
and_return
(
false
)
end
it
'rejects an issue recognized as a spam'
do
expect
(
Gitlab
::
Recaptcha
).
to
receive
(
:load_configurations!
).
and_return
(
true
)
...
...
@@ -620,14 +626,18 @@ def post_issue(issue_params, other_params: {})
end
context
'when an issue is identified as spam'
do
before
{
allow_any_instance_of
(
AkismetService
).
to
receive
(
:is_spam?
).
and_return
(
true
)
}
before
do
allow_any_instance_of
(
AkismetService
).
to
receive
(
:is_spam?
).
and_return
(
true
)
end
context
'when captcha is not verified'
do
def
post_spam_issue
post_new_issue
(
title:
'Spam Title'
,
description:
'Spam lives here'
)
end
before
{
allow_any_instance_of
(
described_class
).
to
receive
(
:verify_recaptcha
).
and_return
(
false
)
}
before
do
allow_any_instance_of
(
described_class
).
to
receive
(
:verify_recaptcha
).
and_return
(
false
)
end
it
'rejects an issue recognized as a spam'
do
expect
{
post_spam_issue
}.
not_to
change
(
Issue
,
:count
)
...
...
@@ -739,7 +749,10 @@ def post_spam
describe
"DELETE #destroy"
do
context
"when the user is a developer"
do
before
{
sign_in
(
user
)
}
before
do
sign_in
(
user
)
end
it
"rejects a developer to destroy an issue"
do
delete
:destroy
,
namespace_id:
project
.
namespace
,
project_id:
project
,
id:
issue
.
iid
expect
(
response
).
to
have_http_status
(
404
)
...
...
@@ -751,7 +764,9 @@ def post_spam
let
(
:namespace
)
{
create
(
:namespace
,
owner:
owner
)
}
let
(
:project
)
{
create
(
:empty_project
,
namespace:
namespace
)
}
before
{
sign_in
(
owner
)
}
before
do
sign_in
(
owner
)
end
it
"deletes the issue"
do
delete
:destroy
,
namespace_id:
project
.
namespace
,
project_id:
project
,
id:
issue
.
iid
...
...
spec/controllers/projects/merge_requests_controller_spec.rb
View file @
3b67e925
...
...
@@ -19,7 +19,10 @@
render_views
let
(
:fork_project
)
{
create
(
:forked_project_with_submodules
)
}
before
{
fork_project
.
team
<<
[
user
,
:master
]
}
before
do
fork_project
.
team
<<
[
user
,
:master
]
end
context
'when rendering HTML response'
do
it
'renders new merge request widget template'
do
...
...
@@ -328,7 +331,9 @@ def get_merge_requests(page = nil)
end
context
'when the sha parameter does not match the source SHA'
do
before
{
post
:merge
,
base_params
.
merge
(
sha:
'foo'
)
}
before
do
post
:merge
,
base_params
.
merge
(
sha:
'foo'
)
end
it
'returns :sha_mismatch'
do
expect
(
json_response
).
to
eq
(
'status'
=>
'sha_mismatch'
)
...
...
@@ -473,7 +478,9 @@ def merge_when_pipeline_succeeds
let
(
:namespace
)
{
create
(
:namespace
,
owner:
owner
)
}
let
(
:project
)
{
create
(
:project
,
namespace:
namespace
)
}
before
{
sign_in
owner
}
before
do
sign_in
owner
end
it
"deletes the merge request"
do
delete
:destroy
,
namespace_id:
project
.
namespace
,
project_id:
project
,
id:
merge_request
.
iid
...
...
@@ -505,7 +512,9 @@ def go(extra_params = {})
context
'with default params'
do
context
'as html'
do
before
{
go
(
format:
'html'
)
}
before
do
go
(
format:
'html'
)
end
it
'renders the diff template'
do
expect
(
response
).
to
render_template
(
'diffs'
)
...
...
@@ -513,7 +522,9 @@ def go(extra_params = {})
end
context
'as json'
do
before
{
go
(
format:
'json'
)
}
before
do
go
(
format:
'json'
)
end
it
'renders the diffs template to a string'
do
expect
(
response
).
to
render_template
(
'projects/merge_requests/show/_diffs'
)
...
...
@@ -544,7 +555,9 @@ def go(extra_params = {})
context
'with ignore_whitespace_change'
do
context
'as html'
do
before
{
go
(
format:
'html'
,
w:
1
)
}
before
do
go
(
format:
'html'
,
w:
1
)
end
it
'renders the diff template'
do
expect
(
response
).
to
render_template
(
'diffs'
)
...
...
@@ -552,7 +565,9 @@ def go(extra_params = {})
end
context
'as json'
do
before
{
go
(
format:
'json'
,
w:
1
)
}
before
do
go
(
format:
'json'
,
w:
1
)
end
it
'renders the diffs template to a string'
do
expect
(
response
).
to
render_template
(
'projects/merge_requests/show/_diffs'
)
...
...
@@ -562,7 +577,9 @@ def go(extra_params = {})
end
context
'with view'
do
before
{
go
(
view:
'parallel'
)
}
before
do
go
(
view:
'parallel'
)
end
it
'saves the preferred diff view in a cookie'
do
expect
(
response
.
cookies
[
'diff_view'
]).
to
eq
(
'parallel'
)
...
...
@@ -605,7 +622,9 @@ def diff_for_path(extra_params = {})
end
context
'when the path does not exist in the diff'
do
before
{
diff_for_path
(
id:
merge_request
.
iid
,
old_path:
'files/ruby/nopen.rb'
,
new_path:
'files/ruby/nopen.rb'
)
}
before
do
diff_for_path
(
id:
merge_request
.
iid
,
old_path:
'files/ruby/nopen.rb'
,
new_path:
'files/ruby/nopen.rb'
)
end
it
'returns a 404'
do
expect
(
response
).
to
have_http_status
(
404
)
...
...
@@ -626,7 +645,9 @@ def diff_for_path(extra_params = {})
end
context
'when the merge request does not exist'
do
before
{
diff_for_path
(
id:
merge_request
.
iid
.
succ
,
old_path:
existing_path
,
new_path:
existing_path
)
}
before
do
diff_for_path
(
id:
merge_request
.
iid
.
succ
,
old_path:
existing_path
,
new_path:
existing_path
)
end
it
'returns a 404'
do
expect
(
response
).
to
have_http_status
(
404
)
...
...
@@ -670,7 +691,9 @@ def diff_for_path(extra_params = {})
context
'when the source branch is in a different project to the target'
do
let
(
:other_project
)
{
create
(
:project
)
}
before
{
other_project
.
team
<<
[
user
,
:master
]
}
before
do
other_project
.
team
<<
[
user
,
:master
]
end
context
'when the path exists in the diff'
do
it
'disables diff notes'
do
...
...
@@ -690,7 +713,9 @@ def diff_for_path(extra_params = {})
end
context
'when the path does not exist in the diff'
do
before
{
diff_for_path
(
old_path:
'files/ruby/nopen.rb'
,
new_path:
'files/ruby/nopen.rb'
,
merge_request:
{
source_project:
other_project
,
source_branch:
'feature'
,
target_branch:
'master'
})
}
before
do
diff_for_path
(
old_path:
'files/ruby/nopen.rb'
,
new_path:
'files/ruby/nopen.rb'
,
merge_request:
{
source_project:
other_project
,
source_branch:
'feature'
,
target_branch:
'master'
})
end
it
'returns a 404'
do
expect
(
response
).
to
have_http_status
(
404
)
...
...
@@ -913,7 +938,9 @@ def conflict_for_path(path)
end
context
'when the file does not exist cannot be resolved in the UI'
do
before
{
conflict_for_path
(
'files/ruby/regexp.rb'
)
}
before
do
conflict_for_path
(
'files/ruby/regexp.rb'
)
end
it
'returns a 404 status code'
do
expect
(
response
).
to
have_http_status
(
:not_found
)
...
...
@@ -923,7 +950,9 @@ def conflict_for_path(path)
context
'with an existing file'
do
let
(
:path
)
{
'files/ruby/regex.rb'
}
before
{
conflict_for_path
(
path
)
}
before
do
conflict_for_path
(
path
)
end
it
'returns a 200 status code'
do
expect
(
response
).
to
have_http_status
(
:ok
)
...
...
@@ -1195,7 +1224,9 @@ def post_assign_issues
end
context
'when head_pipeline does not exist'
do
before
{
get_pipeline_status
}
before
do
get_pipeline_status
end
it
'return empty'
do
expect
(
response
).
to
have_http_status
(
:ok
)
...
...
spec/controllers/projects/project_members_controller_spec.rb
View file @
3b67e925
...
...
@@ -16,10 +16,14 @@
describe
'POST create'
do
let
(
:project_user
)
{
create
(
:user
)
}
before
{
sign_in
(
user
)
}
before
do
sign_in
(
user
)
end
context
'when user does not have enough rights'
do
before
{
project
.
team
<<
[
user
,
:developer
]
}
before
do
project
.
team
<<
[
user
,
:developer
]
end
it
'returns 404'
do
post
:create
,
namespace_id:
project
.
namespace
,
...
...
@@ -33,7 +37,9 @@
end
context
'when user has enough rights'
do
before
{
project
.
team
<<
[
user
,
:master
]
}
before
do
project
.
team
<<
[
user
,
:master
]
end