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
Léo-Paul Géneau
gitlab-ce
Commits
b67e333c
Commit
b67e333c
authored
Aug 14, 2017
by
Jarka Kadlecova
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix static_analysis (rubocop)
parent
240d262d
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
7 deletions
+5
-7
spec/controllers/projects/issues_controller_spec.rb
spec/controllers/projects/issues_controller_spec.rb
+1
-2
spec/features/issues/note_polling_spec.rb
spec/features/issues/note_polling_spec.rb
+0
-1
spec/support/features/discussion_comments_shared_example.rb
spec/support/features/discussion_comments_shared_example.rb
+4
-4
No files found.
spec/controllers/projects/issues_controller_spec.rb
View file @
b67e333c
...
@@ -889,8 +889,7 @@ describe Projects::IssuesController do
...
@@ -889,8 +889,7 @@ describe Projects::IssuesController do
it
'returns discussion json'
do
it
'returns discussion json'
do
get
:discussions
,
namespace_id:
project
.
namespace
,
project_id:
project
,
id:
issue
.
iid
get
:discussions
,
namespace_id:
project
.
namespace
,
project_id:
project
,
id:
issue
.
iid
expect
(
JSON
.
parse
(
response
.
body
).
first
.
keys
).
to
match_array
(
expect
(
JSON
.
parse
(
response
.
body
).
first
.
keys
).
to
match_array
(
%w[id reply_id expanded notes individual_note]
)
[
'id'
,
'reply_id'
,
'expanded'
,
'notes'
,
'individual_note'
])
end
end
end
end
end
end
spec/features/issues/note_polling_spec.rb
View file @
b67e333c
...
@@ -50,7 +50,6 @@ feature 'Issue notes polling', :js do
...
@@ -50,7 +50,6 @@ feature 'Issue notes polling', :js do
expect
(
page
).
to
have_selector
(
".alert"
)
expect
(
page
).
to
have_selector
(
".alert"
)
end
end
it
'when editing but you changed some things, an update comes in, and you press cancel, show the updated content'
do
it
'when editing but you changed some things, an update comes in, and you press cancel, show the updated content'
do
click_edit_action
(
existing_note
)
click_edit_action
(
existing_note
)
...
...
spec/support/features/discussion_comments_shared_example.rb
View file @
b67e333c
...
@@ -76,15 +76,14 @@ shared_examples 'discussion comments' do |resource_name|
...
@@ -76,15 +76,14 @@ shared_examples 'discussion comments' do |resource_name|
expect
(
page
).
not_to
have_selector
menu_selector
expect
(
page
).
not_to
have_selector
menu_selector
end
end
it
'clicking the ul padding or divider should not change the text'
do
it
'clicking the ul padding or divider should not change the text'
do
if
resource_name
==
'issue'
find
(
menu_selector
).
trigger
'click'
find
(
menu_selector
).
trigger
'click'
if
resource_name
==
'issue'
expect
(
find
(
dropdown_selector
)).
to
have_content
'Comment'
expect
(
find
(
dropdown_selector
)).
to
have_content
'Comment'
find
(
toggle_selector
).
click
find
(
toggle_selector
).
click
find
(
"
#{
menu_selector
}
.divider"
).
trigger
'click'
find
(
"
#{
menu_selector
}
.divider"
).
trigger
'click'
expect
(
find
(
dropdown_selector
)).
to
have_content
'Comment'
else
else
find
(
menu_selector
).
trigger
'click'
find
(
menu_selector
).
trigger
'click'
...
@@ -94,8 +93,9 @@ shared_examples 'discussion comments' do |resource_name|
...
@@ -94,8 +93,9 @@ shared_examples 'discussion comments' do |resource_name|
find
(
"
#{
menu_selector
}
.divider"
).
trigger
'click'
find
(
"
#{
menu_selector
}
.divider"
).
trigger
'click'
expect
(
page
).
to
have_selector
menu_selector
expect
(
page
).
to
have_selector
menu_selector
expect
(
find
(
dropdown_selector
)).
to
have_content
'Comment'
end
end
expect
(
find
(
dropdown_selector
)).
to
have_content
'Comment'
end
end
describe
'when selecting "Start discussion"'
do
describe
'when selecting "Start 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