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
671556c6
Commit
671556c6
authored
Oct 27, 2016
by
Nick Thomas
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix a failing spec in diff_notes_resolve_spec.rb
parent
20a7db44
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
4 deletions
+6
-4
spec/features/merge_requests/diff_notes_resolve_spec.rb
spec/features/merge_requests/diff_notes_resolve_spec.rb
+6
-4
No files found.
spec/features/merge_requests/diff_notes_resolve_spec.rb
View file @
671556c6
...
...
@@ -194,12 +194,12 @@ feature 'Diff notes resolve', feature: true, js: true do
context
'multiple notes'
do
before
do
create
(
:diff_note_on_merge_request
,
project:
project
,
noteable:
merge_request
)
visit_merge_request
end
it
'does not mark discussion as resolved when resolving single note'
do
page
.
within
'.diff-content .note'
do
page
.
first
'.diff-content .note'
do
first
(
'.line-resolve-btn'
).
click
sleep
1
expect
(
first
(
'.line-resolve-btn'
)[
'data-original-title'
]).
to
eq
(
"Resolved by
#{
user
.
name
}
"
)
end
...
...
@@ -212,7 +212,9 @@ feature 'Diff notes resolve', feature: true, js: true do
it
'resolves discussion'
do
page
.
all
(
'.note'
).
each
do
|
note
|
note
.
find
(
'.line-resolve-btn'
).
click
note
.
all
(
'.line-resolve-btn'
).
each
do
|
button
|
button
.
click
end
end
expect
(
page
).
to
have_content
(
'Resolved by'
)
...
...
@@ -292,7 +294,7 @@ feature 'Diff notes resolve', feature: true, js: true do
expect
(
holder
).
to
have_selector
(
'.discussion-next-btn'
)
end
end
it
'displays next discussion even if hidden'
do
page
.
all
(
'.note-discussion'
).
each
do
|
discussion
|
page
.
within
discussion
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