BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
6656faed
Commit
6656faed
authored
Jul 29, 2016
by
Phil Hughes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Tests for not logged in user
parent
03ea267f
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
30 additions
and
7 deletions
+30
-7
diff_notes_resolve_spec.rb
spec/features/merge_requests/diff_notes_resolve_spec.rb
+30
-7
No files found.
spec/features/merge_requests/diff_notes_resolve_spec.rb
View file @
6656faed
...
@@ -433,17 +433,40 @@ feature 'Diff notes resolve', feature: true, js: true do
...
@@ -433,17 +433,40 @@ feature 'Diff notes resolve', feature: true, js: true do
end
end
context
'unauthorized user'
do
context
'unauthorized user'
do
before
do
context
'no resolved comments'
do
visit_merge_request
before
do
visit_merge_request
end
it
'does not allow user to mark note as resolved'
do
page
.
within
'.diff-content .note'
do
expect
(
page
).
not_to
have_selector
(
'.line-resolve-btn'
)
end
page
.
within
'.line-resolve-all-container'
do
expect
(
page
).
to
have_content
(
'0/1 discussion resolved'
)
end
end
end
end
it
'does not allow user to mark note as resolved'
do
context
'resolved comment'
do
page
.
within
'.diff-content .note'
do
before
do
expect
(
page
).
not_to
have_selector
(
'.line-resolve-btn'
)
note
.
resolve!
(
user
)
visit_merge_request
end
it
'shows resolved icon'
do
expect
(
page
).
to
have_content
'1/1 discussion resolved'
click_link
'Toggle discussion'
expect
(
page
).
to
have_selector
(
'.line-resolve-btn.is-active'
)
end
end
page
.
within
'.line-resolve-all-container'
do
it
'does not allow user to click resolve button'
do
expect
(
page
).
to
have_content
(
'0/1 discussion resolved'
)
expect
(
page
).
to
have_selector
(
'.line-resolve-btn.is-disabled'
)
click_link
'Toggle discussion'
expect
(
page
).
to
have_selector
(
'.line-resolve-btn.is-disabled'
)
end
end
end
end
end
end
...
...
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