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
ecfd82ac909a
Commit
959e6d22
authored
Aug 30, 2017
by
Ashley Dumaine
Committed by
Sean McGivern
Sep 06, 2017
Browse files
add unit tests for new collapse_outdated_diff_comments toggle
parent
bac58c105294
Changes
3
Show whitespace changes
Inline
Side-by-side
spec/features/merge_requests/collapse_outdated_diff_comments.rb
0 → 100644
View file @
ecfd82ac
require
'spec_helper'
feature
'Collapse outdated diff comments'
,
js:
true
do
let
(
:merge_request
)
{
create
(
:merge_request
,
importing:
true
)
}
let
(
:project
)
{
merge_request
.
source_project
}
let!
(
:outdated_discussion
)
{
create
(
:diff_note_on_merge_request
,
project:
project
,
noteable:
merge_request
,
position:
outdated_position
).
to_discussion
}
let!
(
:active_discussion
)
{
create
(
:diff_note_on_merge_request
,
noteable:
merge_request
,
project:
project
).
to_discussion
}
let
(
:outdated_position
)
do
Gitlab
::
Diff
::
Position
.
new
(
old_path:
"files/ruby/popen.rb"
,
new_path:
"files/ruby/popen.rb"
,
old_line:
nil
,
new_line:
9
,
diff_refs:
outdated_diff_refs
)
end
let
(
:outdated_diff_refs
)
{
project
.
commit
(
"874797c3a73b60d2187ed6e2fcabd289ff75171e"
).
diff_refs
}
before
do
sign_in
(
create
(
:admin
))
end
context
'when project.collapse_outdated_diff_comments == true'
do
before
do
project
.
update_column
(
:collapse_outdated_diff_comments
,
true
)
end
context
'with unresolved outdated discussions'
do
it
'does not show outdated discussion'
do
visit_merge_request
(
merge_request
)
within
(
".discussion[data-discussion-id='
#{
outdated_discussion
.
id
}
']"
)
do
expect
(
page
).
to
have_css
(
'.discussion-body .hide .js-toggle-content'
,
visible:
false
)
end
end
end
context
'with unresolved active discussions'
do
it
'shows active discussion'
do
visit_merge_request
(
merge_request
)
within
(
".discussion[data-discussion-id='
#{
active_discussion
.
id
}
']"
)
do
expect
(
page
).
to
have_css
(
'.discussion-body .hide .js-toggle-content'
,
visible:
true
)
end
end
end
end
context
'when project.collapse_outdated_diff_comments == false'
do
before
do
project
.
update_column
(
:collapse_outdated_diff_comments
,
false
)
end
context
'with unresolved outdated discussions'
do
it
'shows outdated discussion'
do
visit_merge_request
(
merge_request
)
within
(
".discussion[data-discussion-id='
#{
outdated_discussion
.
id
}
']"
)
do
expect
(
page
).
to
have_css
(
'.discussion-body .hide .js-toggle-content'
,
visible:
true
)
end
end
end
context
'with unresolved active discussions'
do
it
'shows active discussion'
do
visit_merge_request
(
merge_request
)
within
(
".discussion[data-discussion-id='
#{
active_discussion
.
id
}
']"
)
do
expect
(
page
).
to
have_css
(
'.discussion-body .hide .js-toggle-content'
,
visible:
true
)
end
end
end
end
def
visit_merge_request
(
merge_request
)
visit
project_merge_request_path
(
project
,
merge_request
)
end
end
spec/requests/api/projects_spec.rb
View file @
ecfd82ac
...
@@ -414,6 +414,7 @@
...
@@ -414,6 +414,7 @@
jobs_enabled:
false
,
jobs_enabled:
false
,
merge_requests_enabled:
false
,
merge_requests_enabled:
false
,
wiki_enabled:
false
,
wiki_enabled:
false
,
collapse_outdated_diff_comments:
false
,
only_allow_merge_if_pipeline_succeeds:
false
,
only_allow_merge_if_pipeline_succeeds:
false
,
request_access_enabled:
true
,
request_access_enabled:
true
,
only_allow_merge_if_all_discussions_are_resolved:
false
,
only_allow_merge_if_all_discussions_are_resolved:
false
,
...
@@ -477,6 +478,18 @@
...
@@ -477,6 +478,18 @@
expect
(
json_response
[
'avatar_url'
]).
to
eq
(
"http://localhost/uploads/-/system/project/avatar/
#{
project_id
}
/banana_sample.gif"
)
expect
(
json_response
[
'avatar_url'
]).
to
eq
(
"http://localhost/uploads/-/system/project/avatar/
#{
project_id
}
/banana_sample.gif"
)
end
end
it
'sets a project as allowing outdated diff comments to collapse regardless of discussion resolution'
do
project
=
attributes_for
(
:project
,
{
collapse_outdated_diff_comments:
false
})
post
api
(
'/projects'
,
user
),
project
expect
(
json_response
[
'collapse_outdated_diff_comments'
]).
to
be_falsey
end
it
'sets a project as allowing outdated diff comments to collapse if collapse_outdated_diff_comments'
do
project
=
attributes_for
(
:project
,
{
collapse_outdated_diff_comments:
true
})
post
api
(
'/projects'
,
user
),
project
expect
(
json_response
[
'collapse_outdated_diff_comments'
]).
to
be_truthy
end
it
'sets a project as allowing merge even if build fails'
do
it
'sets a project as allowing merge even if build fails'
do
project
=
attributes_for
(
:project
,
{
only_allow_merge_if_pipeline_succeeds:
false
})
project
=
attributes_for
(
:project
,
{
only_allow_merge_if_pipeline_succeeds:
false
})
post
api
(
'/projects'
,
user
),
project
post
api
(
'/projects'
,
user
),
project
...
@@ -642,6 +655,22 @@
...
@@ -642,6 +655,22 @@
expect
(
json_response
[
'visibility'
]).
to
eq
(
'private'
)
expect
(
json_response
[
'visibility'
]).
to
eq
(
'private'
)
end
end
it
'sets a project as allowing outdated diff comments to collapse regardless of discussion resolution'
do
project
=
attributes_for
(
:project
,
{
collapse_outdated_diff_comments:
false
})
post
api
(
"/projects/user/
#{
user
.
id
}
"
,
admin
),
project
expect
(
json_response
[
'collapse_outdated_diff_comments'
]).
to
be_falsey
end
it
'sets a project as allowing outdated diff comments to collapse only if collapse_outdated_diff_comments'
do
project
=
attributes_for
(
:project
,
{
collapse_outdated_diff_comments:
true
})
post
api
(
"/projects/user/
#{
user
.
id
}
"
,
admin
),
project
expect
(
json_response
[
'collapse_outdated_diff_comments'
]).
to
be_truthy
end
it
'sets a project as allowing merge even if build fails'
do
it
'sets a project as allowing merge even if build fails'
do
project
=
attributes_for
(
:project
,
{
only_allow_merge_if_pipeline_succeeds:
false
})
project
=
attributes_for
(
:project
,
{
only_allow_merge_if_pipeline_succeeds:
false
})
post
api
(
"/projects/user/
#{
user
.
id
}
"
,
admin
),
project
post
api
(
"/projects/user/
#{
user
.
id
}
"
,
admin
),
project
...
@@ -732,6 +761,7 @@
...
@@ -732,6 +761,7 @@
expect
(
json_response
[
'wiki_enabled'
]).
to
be_present
expect
(
json_response
[
'wiki_enabled'
]).
to
be_present
expect
(
json_response
[
'jobs_enabled'
]).
to
be_present
expect
(
json_response
[
'jobs_enabled'
]).
to
be_present
expect
(
json_response
[
'snippets_enabled'
]).
to
be_present
expect
(
json_response
[
'snippets_enabled'
]).
to
be_present
expect
(
json_response
[
'collapse_outdated_diff_comments'
]).
to
eq
(
project
.
collapse_outdated_diff_comments
)
expect
(
json_response
[
'container_registry_enabled'
]).
to
be_present
expect
(
json_response
[
'container_registry_enabled'
]).
to
be_present
expect
(
json_response
[
'created_at'
]).
to
be_present
expect
(
json_response
[
'created_at'
]).
to
be_present
expect
(
json_response
[
'last_activity_at'
]).
to
be_present
expect
(
json_response
[
'last_activity_at'
]).
to
be_present
...
...
spec/requests/api/v3/projects_spec.rb
View file @
ecfd82ac
...
@@ -394,6 +394,7 @@
...
@@ -394,6 +394,7 @@
issues_enabled:
false
,
issues_enabled:
false
,
merge_requests_enabled:
false
,
merge_requests_enabled:
false
,
wiki_enabled:
false
,
wiki_enabled:
false
,
collapse_outdated_diff_comments:
false
,
only_allow_merge_if_build_succeeds:
false
,
only_allow_merge_if_build_succeeds:
false
,
request_access_enabled:
true
,
request_access_enabled:
true
,
only_allow_merge_if_all_discussions_are_resolved:
false
only_allow_merge_if_all_discussions_are_resolved:
false
...
@@ -455,6 +456,18 @@
...
@@ -455,6 +456,18 @@
expect
(
json_response
[
'visibility_level'
]).
to
eq
(
Gitlab
::
VisibilityLevel
::
PRIVATE
)
expect
(
json_response
[
'visibility_level'
]).
to
eq
(
Gitlab
::
VisibilityLevel
::
PRIVATE
)
end
end
it
'sets a project as allowing outdated diff comments to collapse regardless of discussion resolution'
do
project
=
attributes_for
(
:project
,
{
collapse_outdated_diff_comments:
false
})
post
v3_api
(
'/projects'
,
user
),
project
expect
(
json_response
[
'collapse_outdated_diff_comments'
]).
to
be_falsey
end
it
'sets a project as allowing outdated diff comments to collapse if collapse_outdated_diff_comments'
do
project
=
attributes_for
(
:project
,
{
collapse_outdated_diff_comments:
true
})
post
v3_api
(
'/projects'
,
user
),
project
expect
(
json_response
[
'collapse_outdated_diff_comments'
]).
to
be_truthy
end
it
'sets a project as allowing merge even if build fails'
do
it
'sets a project as allowing merge even if build fails'
do
project
=
attributes_for
(
:project
,
{
only_allow_merge_if_build_succeeds:
false
})
project
=
attributes_for
(
:project
,
{
only_allow_merge_if_build_succeeds:
false
})
post
v3_api
(
'/projects'
,
user
),
project
post
v3_api
(
'/projects'
,
user
),
project
...
@@ -599,6 +612,18 @@
...
@@ -599,6 +612,18 @@
expect
(
json_response
[
'visibility_level'
]).
to
eq
(
Gitlab
::
VisibilityLevel
::
PRIVATE
)
expect
(
json_response
[
'visibility_level'
]).
to
eq
(
Gitlab
::
VisibilityLevel
::
PRIVATE
)
end
end
it
'sets a project as allowing outdated diff comments to collapse regardless of discussion resolution'
do
project
=
attributes_for
(
:project
,
{
collapse_outdated_diff_comments:
false
})
post
v3_api
(
"/projects/user/
#{
user
.
id
}
"
,
admin
),
project
expect
(
json_response
[
'collapse_outdated_diff_comments'
]).
to
be_falsey
end
it
'sets a project as allowing outdated diff comments to collapse only if collapse_outdated_diff_comments'
do
project
=
attributes_for
(
:project
,
{
collapse_outdated_diff_comments:
true
})
post
v3_api
(
"/projects/user/
#{
user
.
id
}
"
,
admin
),
project
expect
(
json_response
[
'collapse_outdated_diff_comments'
]).
to
be_truthy
end
it
'sets a project as allowing merge even if build fails'
do
it
'sets a project as allowing merge even if build fails'
do
project
=
attributes_for
(
:project
,
{
only_allow_merge_if_build_succeeds:
false
})
project
=
attributes_for
(
:project
,
{
only_allow_merge_if_build_succeeds:
false
})
post
v3_api
(
"/projects/user/
#{
user
.
id
}
"
,
admin
),
project
post
v3_api
(
"/projects/user/
#{
user
.
id
}
"
,
admin
),
project
...
@@ -687,6 +712,7 @@
...
@@ -687,6 +712,7 @@
expect
(
json_response
[
'wiki_enabled'
]).
to
be_present
expect
(
json_response
[
'wiki_enabled'
]).
to
be_present
expect
(
json_response
[
'builds_enabled'
]).
to
be_present
expect
(
json_response
[
'builds_enabled'
]).
to
be_present
expect
(
json_response
[
'snippets_enabled'
]).
to
be_present
expect
(
json_response
[
'snippets_enabled'
]).
to
be_present
expect
(
json_response
[
'collapse_outdated_diff_comments'
]).
to
eq
(
project
.
collapse_outdated_diff_comments
)
expect
(
json_response
[
'container_registry_enabled'
]).
to
be_present
expect
(
json_response
[
'container_registry_enabled'
]).
to
be_present
expect
(
json_response
[
'created_at'
]).
to
be_present
expect
(
json_response
[
'created_at'
]).
to
be_present
expect
(
json_response
[
'last_activity_at'
]).
to
be_present
expect
(
json_response
[
'last_activity_at'
]).
to
be_present
...
...
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