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
397b9c8e
Commit
397b9c8e
authored
Apr 06, 2017
by
Luke "Jared" Bennett
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add feature specs
parent
abefedf5
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
246 additions
and
4 deletions
+246
-4
spec/features/discussion_comments_spec.rb
spec/features/discussion_comments_spec.rb
+246
-0
spec/features/merge_requests/discussions_spec.rb
spec/features/merge_requests/discussions_spec.rb
+0
-4
No files found.
spec/features/discussion_comments_spec.rb
0 → 100644
View file @
397b9c8e
require
'spec_helper'
shared_examples
'discussion comments'
do
|
resource_name
|
let
(
:form_selector
)
{
'.js-main-target-form'
}
let
(
:dropdown_selector
)
{
"
#{
form_selector
}
.comment-type-dropdown"
}
let
(
:toggle_selector
)
{
"
#{
dropdown_selector
}
.dropdown-toggle"
}
let
(
:menu_selector
)
{
"
#{
dropdown_selector
}
.dropdown-menu"
}
let
(
:submit_selector
)
{
"
#{
form_selector
}
.js-comment-submit-button"
}
let
(
:close_selector
)
{
"
#{
form_selector
}
.btn-comment-and-close"
}
it
'should show a comment type toggle'
do
expect
(
page
).
to
have_selector
toggle_selector
end
describe
'when the toggle is clicked'
do
before
do
find
(
"
#{
form_selector
}
.note-textarea"
).
send_keys
(
'a'
)
find
(
toggle_selector
).
click
end
it
'opens a comment type dropdown with "Comment" and "Start discussion"'
do
expect
(
page
).
to
have_selector
menu_selector
end
it
'has a "Comment" item'
do
menu
=
find
(
menu_selector
)
expect
(
menu
).
to
have_content
'Comment'
expect
(
menu
).
to
have_content
'Add a general comment to this issue.'
end
it
'has a "Start discussion" item'
do
menu
=
find
(
menu_selector
)
expect
(
menu
).
to
have_content
'Start discussion'
expect
(
menu
).
to
have_content
'Discuss a specific suggestion or question.'
end
it
'has the "Comment" item selected by default'
do
find
(
"
#{
menu_selector
}
li"
)
items
=
all
(
"
#{
menu_selector
}
li"
)
expect
(
items
.
first
).
to
have_content
'Comment'
expect
(
items
.
first
).
to
have_selector
'.fa-check'
expect
(
items
.
first
).
to
have_selector
'.droplab-item-selected'
expect
(
items
.
last
).
to
have_content
'Start discussion'
expect
(
items
.
last
).
not_to
have_selector
'.fa-check'
expect
(
items
.
last
).
not_to
have_selector
'.droplab-item-selected'
end
it
'"Comment" will post a comment'
do
find
(
submit_selector
).
click
find
(
'.timeline .timeline-entry'
)
new_comment
=
all
(
'.timeline .timeline-entry'
).
last
expect
(
new_comment
).
to
have_content
'a'
expect
(
new_comment
).
not_to
have_selector
'.discussion'
end
if
resource_name
=~
/(issue|merge request)/
it
"Comment & close' will post a comment and close the
#{
resource_name
}
"
do
find
(
close_selector
).
click
find
(
'.timeline .timeline-entry'
)
entries
=
all
(
'.timeline .timeline-entry'
)
close_note
=
entries
.
last
new_comment
=
entries
[
-
2
]
expect
(
close_note
).
to
have_content
'closed'
expect
(
new_comment
).
not_to
have_selector
'.discussion'
end
end
it
'closes the menu when clicking the toggle'
do
find
(
toggle_selector
).
click
expect
(
page
).
not_to
have_selector
menu_selector
end
it
'closes the menu when clicking the body'
do
find
(
'body'
).
click
expect
(
page
).
not_to
have_selector
menu_selector
end
describe
'when selecting "Start discussion"'
do
before
do
find
(
"
#{
menu_selector
}
li"
)
first
(
"
#{
menu_selector
}
li"
).
click
end
it
'updates the note_type input to "DiscussionNote"'
do
expect
(
find
(
"
#{
form_selector
}
#note_type"
).
value
).
to
be
'DiscussionNote'
end
it
'updates the submit button text'
do
expect
(
find
(
dropdown_selector
)).
to
have_content
"Start discussion"
end
if
resource_name
=~
/(issue|merge request)/
it
'updates the close button text'
do
expect
(
find
(
close_selector
)).
to
have_content
"Start discussion & close
#{
resource_name
}
"
end
end
it
'closes the dropdown'
do
expect
(
page
).
not_to
have_selector
menu_selector
end
it
'"Start discussion" will post a discussion'
do
find
(
submit_selector
).
click
find
(
'.timeline .timeline-entry'
)
new_comment
=
all
(
'.timeline .timeline-entry'
).
last
expect
(
new_comment
).
to
have_content
'a'
expect
(
new_comment
).
to
have_selector
'.discussion'
end
if
resource_name
=~
/(issue|merge request)/
it
"'Start discussion & close' will post a discussion and close the
#{
resource_name
}
"
do
find
(
close_selector
).
click
find
(
'.timeline .timeline-entry'
)
entries
=
all
(
'.timeline .timeline-entry'
)
close_note
=
entries
.
last
new_discussion
=
entries
[
-
2
]
expect
(
close_note
).
to
have_content
'closed'
expect
(
new_discussion
).
to
have_selector
'.discussion'
end
end
describe
'when opening the menu'
do
before
do
find
(
toggle_selector
).
click
end
it
'should have "Start discussion" selected'
do
find
(
"
#{
menu_selector
}
li"
)
items
=
all
(
"
#{
menu_selector
}
li"
)
expect
(
items
.
first
).
to
have_content
'Comment'
expect
(
items
.
first
).
not_to
have_selector
'.fa-check'
expect
(
items
.
first
).
not_to
have_selector
'.droplab-item-selected'
expect
(
items
.
last
).
to
have_content
'Start discussion'
expect
(
items
.
last
).
to
have_selector
'.fa-check'
expect
(
items
.
last
).
to
have_selector
'.droplab-item-selected'
end
describe
'when selecting "Comment"'
do
before
do
find
(
"
#{
menu_selector
}
li"
)
all
(
"
#{
menu_selector
}
li"
).
last
.
click
end
it
'clears the note_type input"'
do
expect
(
find
(
"
#{
form_selector
}
#note_type"
).
value
).
to
be
''
end
it
'updates the submit button text'
do
expect
(
find
(
dropdown_selector
)).
to
have_content
"Comment"
end
if
resource_name
=~
/(issue|merge request)/
it
'updates the close button text'
do
expect
(
find
(
close_selector
)).
to
have_content
"Comment & close
#{
resource_name
}
"
end
end
it
'closes the dropdown'
do
expect
(
page
).
not_to
have_selector
menu_selector
end
it
'should have "Comment" selected when opening the menu'
do
find
(
toggle_selector
).
click
find
(
"
#{
menu_selector
}
li"
)
items
=
all
(
"
#{
menu_selector
}
li"
)
expect
(
items
.
first
).
to
have_content
'Comment'
expect
(
items
.
first
).
to
have_selector
'.fa-check'
expect
(
items
.
first
).
to
have_selector
'.droplab-item-selected'
expect
(
items
.
last
).
to
have_content
'Start discussion'
expect
(
items
.
last
).
not_to
have_selector
'.fa-check'
expect
(
items
.
last
).
not_to
have_selector
'.droplab-item-selected'
end
end
end
end
end
end
describe
'Discussion Comments'
,
:feature
,
:js
do
include
RepoHelpers
let
(
:user
)
{
create
(
:user
)
}
let
(
:project
)
{
create
(
:project
)
}
before
do
login_as
(
user
)
end
describe
'on a merge request'
do
let
(
:merge_request
)
{
create
(
:merge_request
,
source_project:
project
)
}
before
do
visit
namespace_project_merge_request_path
(
project
.
namespace
,
project
,
merge_request
)
end
it_behaves_like
'discussion comments'
,
'merge request'
end
describe
'on an issue'
do
let
(
:issue
)
{
create
(
:issue
,
project:
project
)
}
before
do
visit
namespace_project_issue_path
(
project
.
namespace
,
project
,
issue
)
end
it_behaves_like
'discussion comments'
,
'issue'
end
describe
'on an snippet'
do
let
(
:snippet
)
{
create
(
:personal_snippet
,
:public
,
author:
user
)
}
before
do
visit
snippet_path
(
snippet
)
end
it_behaves_like
'discussion comments'
,
'snippet'
end
describe
'on a commit'
do
before
do
visit
namespace_project_commit_path
(
project
.
namespace
,
project
,
sample_commit
.
id
)
end
it_behaves_like
'discussion comments'
,
'commit'
end
end
spec/features/merge_requests/discussions_spec.rb
deleted
100644 → 0
View file @
abefedf5
require
'spec_helper'
describe
'Merge Request Discussions'
,
:feature
,
:js
do
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