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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
501d2df4
Commit
501d2df4
authored
Oct 10, 2017
by
Clement Ho
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add explicit test to test resolved discussion toggle content
parent
9ac5338b
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
15 additions
and
5 deletions
+15
-5
spec/features/merge_requests/diff_notes_resolve_spec.rb
spec/features/merge_requests/diff_notes_resolve_spec.rb
+15
-5
No files found.
spec/features/merge_requests/diff_notes_resolve_spec.rb
View file @
501d2df4
...
...
@@ -88,14 +88,24 @@ feature 'Diff notes resolve', :js do
end
end
it
'hides resolved discussion'
do
page
.
within
'.diff-content'
do
click_button
'Resolve discussion'
describe
'resolved discussion'
do
before
do
page
.
within
'.diff-content'
do
click_button
'Resolve discussion'
end
visit_merge_request
end
visit_merge_request
it
'hides when resolve discussion is clicked'
do
expect
(
page
).
to
have_selector
(
'.discussion-body'
,
visible:
false
)
end
expect
(
page
).
to
have_selector
(
'.discussion-body'
,
visible:
false
)
it
'shows resolved discussion when toggled'
do
find
(
".timeline-content .discussion[data-discussion-id='
#{
note
.
discussion_id
}
'] .discussion-toggle-button"
).
click
expect
(
page
.
find
(
".timeline-content #note_
#{
note
.
noteable_id
}
"
)).
to
be_visible
end
end
it
'allows user to resolve from reply form without a comment'
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