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
0
Merge Requests
0
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
Jérome Perrin
gitlab-ce
Commits
c489b237
Commit
c489b237
authored
Oct 13, 2017
by
Mike Greiling
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix shared discussion_comments examples (for realz this time!)
parent
53e11239
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
24 additions
and
25 deletions
+24
-25
spec/features/discussion_comments/commit_spec.rb
spec/features/discussion_comments/commit_spec.rb
+1
-1
spec/features/discussion_comments/snippets_spec.rb
spec/features/discussion_comments/snippets_spec.rb
+1
-1
spec/support/features/discussion_comments_shared_example.rb
spec/support/features/discussion_comments_shared_example.rb
+22
-23
No files found.
spec/features/discussion_comments/commit_spec.rb
View file @
c489b237
require
'spec_helper'
describe
'Discussion Comments
Merge Reques
t'
,
:js
do
describe
'Discussion Comments
Commi
t'
,
:js
do
include
RepoHelpers
let
(
:user
)
{
create
(
:user
)
}
...
...
spec/features/discussion_comments/snippets_spec.rb
View file @
c489b237
require
'spec_helper'
describe
'Discussion Comments
Issue
'
,
:js
do
describe
'Discussion Comments
Snippet
'
,
:js
do
let
(
:user
)
{
create
(
:user
)
}
let
(
:project
)
{
create
(
:project
)
}
let
(
:snippet
)
{
create
(
:project_snippet
,
:private
,
project:
project
,
author:
user
)
}
...
...
spec/support/features/discussion_comments_shared_example.rb
View file @
c489b237
...
...
@@ -4,7 +4,6 @@ shared_examples 'discussion comments' do |resource_name|
let
(
:toggle_selector
)
{
"
#{
dropdown_selector
}
.dropdown-toggle"
}
let
(
:menu_selector
)
{
"
#{
dropdown_selector
}
.dropdown-menu"
}
let
(
:submit_selector
)
{
"
#{
form_selector
}
.js-comment-submit-button"
}
let
(
:submit_button
)
{
".js-comment-submit-button"
}
let
(
:close_selector
)
{
"
#{
form_selector
}
.btn-comment-and-close"
}
let
(
:comments_selector
)
{
'.timeline > .note.timeline-entry'
}
...
...
@@ -78,34 +77,27 @@ shared_examples 'discussion comments' do |resource_name|
end
it
'clicking the ul padding or divider should not change the text'
do
find
(
menu_selector
).
click
execute_script
(
"document.querySelector('
#{
menu_selector
}
').click()"
)
# on issues page, the menu closes when clicking anywhere, on other pages it will
# remain open if clicking divider or menu padding, but should not change button action
if
resource_name
==
'issue'
expect
(
find
(
dropdown_selector
)).
to
have_content
'Comment'
find
(
toggle_selector
).
click
find
(
"
#{
menu_selector
}
.divider"
).
click
execute_script
(
"document.querySelector('
#{
menu_selector
}
.divider').click()"
)
else
within
dropdown_selector
do
find
(
'.dropdown-toggle'
).
click
execute_script
(
"document.querySelector('
#{
menu_selector
}
').click()"
)
expect
(
find
(
'.dropdown-menu'
)).
not_to
be_nil
find
(
'li[data-submit-text="Comment"]'
).
click
expect
(
find
(
submit_button
).
value
).
to
eq
"Comment"
expect
(
page
).
to
have_selector
menu_selector
expect
(
find
(
dropdown_selector
)).
to
have_content
'Comment'
find
(
'.dropdown-toggle'
).
click
page
.
driver
.
execute_script
(
"document.querySelector('.comment-type-dropdown .dropdown-menu .divider').click()"
)
execute_script
(
"document.querySelector('
#{
menu_selector
}
.divider').click()"
)
expect
(
find
(
'.dropdown-menu'
)).
not_to
be_nil
find
(
'li[data-submit-text="Comment"]'
).
click
end
expect
(
page
).
to
have_selector
menu_selector
end
within
dropdown_selector
do
expect
(
find
(
submit_button
).
value
).
to
eq
"Comment"
end
expect
(
find
(
dropdown_selector
)).
to
have_content
'Comment'
end
describe
'when selecting "Start discussion"'
do
...
...
@@ -115,8 +107,11 @@ shared_examples 'discussion comments' do |resource_name|
end
it
'updates the submit button text and closes the dropdown'
do
within
dropdown_selector
do
expect
(
find
(
submit_button
).
value
).
to
eq
"Start discussion"
# on issues page, the submit input is a <button>, on other pages it is <input>
if
resource_name
==
'issue'
expect
(
find
(
submit_selector
)).
to
have_content
'Start discussion'
else
expect
(
find
(
submit_selector
).
value
).
to
eq
'Start discussion'
end
expect
(
page
).
not_to
have_selector
menu_selector
end
...
...
@@ -182,8 +177,11 @@ shared_examples 'discussion comments' do |resource_name|
end
it
'updates the submit button text and closes the dropdown'
do
within
dropdown_selector
do
expect
(
find
(
submit_button
).
value
).
to
eq
"Comment"
# on issues page, the submit input is a <button>, on other pages it is <input>
if
resource_name
==
'issue'
expect
(
find
(
submit_selector
)).
to
have_content
'Comment'
else
expect
(
find
(
submit_selector
).
value
).
to
eq
'Comment'
end
expect
(
page
).
not_to
have_selector
menu_selector
end
...
...
@@ -223,6 +221,7 @@ shared_examples 'discussion comments' do |resource_name|
describe
"on a closed
#{
resource_name
}
"
do
before
do
find
(
"
#{
form_selector
}
.js-note-target-close"
).
click
wait_for_requests
find
(
"
#{
form_selector
}
.note-textarea"
).
send_keys
(
'a'
)
end
...
...
@@ -232,7 +231,7 @@ shared_examples 'discussion comments' do |resource_name|
end
it
"should show a 'Start discussion & reopen
#{
resource_name
}
' button when 'Start discussion' is selected"
do
find
(
toggle_selector
).
send_keys
(
:return
)
find
(
toggle_selector
).
click
find
(
"
#{
menu_selector
}
li"
,
match: :first
)
all
(
"
#{
menu_selector
}
li"
).
last
.
click
...
...
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