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
d493c16f
Commit
d493c16f
authored
Jul 20, 2017
by
Fatih Acet
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
IssueNotesRefactor: Fix reportable spec.
parent
4ab0aaeb
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
8 deletions
+7
-8
app/assets/javascripts/notes/components/issue_note_actions.vue
...ssets/javascripts/notes/components/issue_note_actions.vue
+6
-7
spec/support/features/reportable_note_shared_examples.rb
spec/support/features/reportable_note_shared_examples.rb
+1
-1
No files found.
app/assets/javascripts/notes/components/issue_note_actions.vue
View file @
d493c16f
...
...
@@ -121,16 +121,15 @@ export default {
Report as abuse
</a>
</li>
<li>
<a
v-if=
"canEdit"
@
click.prevent=
"deleteHandler"
class=
"js-note-delete js-note-delete"
href=
"#"
>
<li
v-if=
"canEdit"
>
<button
@
click=
"deleteHandler"
class=
"btn btn-transparent js-note-delete js-note-delete"
type=
"button"
>
<span
class=
"text-danger"
>
Delete comment
</span>
</
a
>
</
button
>
</li>
</ul>
</div>
...
...
spec/support/features/reportable_note_shared_examples.rb
View file @
d493c16f
...
...
@@ -16,8 +16,8 @@ shared_examples 'reportable note' do
open_dropdown
(
dropdown
)
expect
(
dropdown
).
to
have_button
(
'Edit comment'
)
expect
(
dropdown
).
to
have_button
(
'Delete comment'
)
expect
(
dropdown
).
to
have_link
(
'Report as abuse'
,
href:
abuse_report_path
)
expect
(
dropdown
).
to
have_link
(
'Delete comment'
,
href:
note_url
(
note
,
project
))
end
it
'Report button links to a report page'
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