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
Boxiang Sun
gitlab-ce
Commits
65664c2e
Commit
65664c2e
authored
6 years ago
by
Jan Provaznik
Committed by
Fatih Acet
6 years ago
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Refactor discussions/notes code
parent
67ca10f3
No related merge requests found
Changes
23
Hide whitespace changes
Inline
Side-by-side
Showing
23 changed files
with
161 additions
and
110 deletions
+161
-110
app/assets/javascripts/awards_handler.js
app/assets/javascripts/awards_handler.js
+2
-2
app/assets/javascripts/lib/utils/common_utils.js
app/assets/javascripts/lib/utils/common_utils.js
+1
-0
app/assets/javascripts/notes/components/comment_form.vue
app/assets/javascripts/notes/components/comment_form.vue
+5
-1
app/assets/javascripts/notes/components/notes_app.vue
app/assets/javascripts/notes/components/notes_app.vue
+5
-1
app/assets/javascripts/notes/constants.js
app/assets/javascripts/notes/constants.js
+1
-0
app/assets/javascripts/notes/index.js
app/assets/javascripts/notes/index.js
+4
-1
app/assets/javascripts/notes/mixins/noteable.js
app/assets/javascripts/notes/mixins/noteable.js
+2
-0
app/controllers/concerns/issuable_actions.rb
app/controllers/concerns/issuable_actions.rb
+5
-1
app/controllers/concerns/notes_actions.rb
app/controllers/concerns/notes_actions.rb
+1
-1
app/controllers/projects/discussions_controller.rb
app/controllers/projects/discussions_controller.rb
+1
-1
app/helpers/notes_helper.rb
app/helpers/notes_helper.rb
+9
-9
app/models/note.rb
app/models/note.rb
+5
-2
app/serializers/discussion_entity.rb
app/serializers/discussion_entity.rb
+4
-2
app/serializers/note_entity.rb
app/serializers/note_entity.rb
+0
-30
app/serializers/note_serializer.rb
app/serializers/note_serializer.rb
+0
-3
app/serializers/project_note_entity.rb
app/serializers/project_note_entity.rb
+25
-0
app/serializers/project_note_serializer.rb
app/serializers/project_note_serializer.rb
+3
-0
spec/controllers/projects/issues_controller_spec.rb
spec/controllers/projects/issues_controller_spec.rb
+1
-1
spec/serializers/discussion_entity_spec.rb
spec/serializers/discussion_entity_spec.rb
+1
-1
spec/serializers/note_entity_spec.rb
spec/serializers/note_entity_spec.rb
+1
-49
spec/serializers/project_note_entity_spec.rb
spec/serializers/project_note_entity_spec.rb
+29
-0
spec/support/features/discussion_comments_shared_example.rb
spec/support/features/discussion_comments_shared_example.rb
+14
-5
spec/support/shared_examples/serializers/note_entity_examples.rb
...pport/shared_examples/serializers/note_entity_examples.rb
+42
-0
No files found.
app/assets/javascripts/awards_handler.js
View file @
65664c2e
...
...
@@ -4,7 +4,7 @@ import $ from 'jquery';
import
_
from
'
underscore
'
;
import
Cookies
from
'
js-cookie
'
;
import
{
__
}
from
'
./locale
'
;
import
{
isInIssuePage
,
isInMRPage
,
hasVueMRDiscussionsCookie
,
updateTooltipTitle
}
from
'
./lib/utils/common_utils
'
;
import
{
isInIssuePage
,
isInMRPage
,
isInEpicPage
,
hasVueMRDiscussionsCookie
,
updateTooltipTitle
}
from
'
./lib/utils/common_utils
'
;
import
flash
from
'
./flash
'
;
import
axios
from
'
./lib/utils/axios_utils
'
;
...
...
@@ -300,7 +300,7 @@ class AwardsHandler {
}
isInVueNoteablePage
()
{
return
isInIssuePage
()
||
this
.
isVueMRDiscussions
();
return
isInIssuePage
()
||
isInEpicPage
()
||
this
.
isVueMRDiscussions
();
}
getVotesBlock
()
{
...
...
This diff is collapsed.
Click to expand it.
app/assets/javascripts/lib/utils/common_utils.js
View file @
65664c2e
...
...
@@ -33,6 +33,7 @@ export const checkPageAndAction = (page, action) => {
export
const
isInIssuePage
=
()
=>
checkPageAndAction
(
'
issues
'
,
'
show
'
);
export
const
isInMRPage
=
()
=>
checkPageAndAction
(
'
merge_requests
'
,
'
show
'
);
export
const
isInEpicPage
=
()
=>
checkPageAndAction
(
'
epics
'
,
'
show
'
);
export
const
isInNoteablePage
=
()
=>
isInIssuePage
()
||
isInMRPage
();
export
const
hasVueMRDiscussionsCookie
=
()
=>
Cookies
.
get
(
'
vue_mr_discussions
'
);
...
...
This diff is collapsed.
Click to expand it.
app/assets/javascripts/notes/components/comment_form.vue
View file @
65664c2e
...
...
@@ -99,6 +99,10 @@ export default {
'
js-note-target-reopen
'
:
!
this
.
isOpen
,
};
},
supportQuickActions
()
{
// Disable quick actions support for Epics
return
this
.
noteableType
!==
constants
.
EPIC_NOTEABLE_TYPE
;
},
markdownDocsPath
()
{
return
this
.
getNotesData
.
markdownDocsPath
;
},
...
...
@@ -355,7 +359,7 @@ Please check your network connection and try again.`;
name=
"note[note]"
class=
"note-textarea js-vue-comment-form
js-gfm-input js-autosize markdown-area js-vue-textarea"
data-supports-quick-actions=
"true
"
:data-supports-quick-actions=
"supportQuickActions
"
aria-label=
"Description"
v-model=
"note"
ref=
"textarea"
...
...
This diff is collapsed.
Click to expand it.
app/assets/javascripts/notes/components/notes_app.vue
View file @
65664c2e
...
...
@@ -50,7 +50,11 @@ export default {
...
mapGetters
([
'
notes
'
,
'
getNotesDataByProp
'
,
'
discussionCount
'
]),
noteableType
()
{
// FIXME -- @fatihacet Get this from JSON data.
const
{
ISSUE_NOTEABLE_TYPE
,
MERGE_REQUEST_NOTEABLE_TYPE
}
=
constants
;
const
{
ISSUE_NOTEABLE_TYPE
,
MERGE_REQUEST_NOTEABLE_TYPE
,
EPIC_NOTEABLE_TYPE
}
=
constants
;
if
(
this
.
noteableData
.
noteableType
===
EPIC_NOTEABLE_TYPE
)
{
return
EPIC_NOTEABLE_TYPE
;
}
return
this
.
noteableData
.
merge_params
?
MERGE_REQUEST_NOTEABLE_TYPE
...
...
This diff is collapsed.
Click to expand it.
app/assets/javascripts/notes/constants.js
View file @
65664c2e
...
...
@@ -10,6 +10,7 @@ export const CLOSED = 'closed';
export
const
EMOJI_THUMBSUP
=
'
thumbsup
'
;
export
const
EMOJI_THUMBSDOWN
=
'
thumbsdown
'
;
export
const
ISSUE_NOTEABLE_TYPE
=
'
issue
'
;
export
const
EPIC_NOTEABLE_TYPE
=
'
epic
'
;
export
const
MERGE_REQUEST_NOTEABLE_TYPE
=
'
merge_request
'
;
export
const
UNRESOLVE_NOTE_METHOD_NAME
=
'
delete
'
;
export
const
RESOLVE_NOTE_METHOD_NAME
=
'
post
'
;
This diff is collapsed.
Click to expand it.
app/assets/javascripts/notes/index.js
View file @
65664c2e
...
...
@@ -12,8 +12,11 @@ document.addEventListener(
data
()
{
const
notesDataset
=
document
.
getElementById
(
'
js-vue-notes
'
).
dataset
;
const
parsedUserData
=
JSON
.
parse
(
notesDataset
.
currentUserData
);
const
noteableData
=
JSON
.
parse
(
notesDataset
.
noteableData
);
let
currentUserData
=
{};
noteableData
.
noteableType
=
notesDataset
.
noteableType
;
if
(
parsedUserData
)
{
currentUserData
=
{
id
:
parsedUserData
.
id
,
...
...
@@ -25,7 +28,7 @@ document.addEventListener(
}
return
{
noteableData
:
JSON
.
parse
(
notesDataset
.
noteableData
)
,
noteableData
,
currentUserData
,
notesData
:
JSON
.
parse
(
notesDataset
.
notesData
),
};
...
...
This diff is collapsed.
Click to expand it.
app/assets/javascripts/notes/mixins/noteable.js
View file @
65664c2e
...
...
@@ -14,6 +14,8 @@ export default {
return
constants
.
MERGE_REQUEST_NOTEABLE_TYPE
;
case
'
Issue
'
:
return
constants
.
ISSUE_NOTEABLE_TYPE
;
case
'
Epic
'
:
return
constants
.
EPIC_NOTEABLE_TYPE
;
default
:
return
''
;
}
...
...
This diff is collapsed.
Click to expand it.
app/controllers/concerns/issuable_actions.rb
View file @
65664c2e
...
...
@@ -88,11 +88,15 @@ module IssuableActions
discussions
=
Discussion
.
build_collection
(
notes
,
issuable
)
render
json:
DiscussionSerializer
.
new
(
project:
project
,
noteable:
issuable
,
current_user:
current_user
)
.
represent
(
discussions
,
context:
self
)
render
json:
discussion_serializer
.
represent
(
discussions
,
context:
self
)
end
private
def
discussion_serializer
DiscussionSerializer
.
new
(
project:
project
,
noteable:
issuable
,
current_user:
current_user
,
note_entity:
ProjectNoteEntity
)
end
def
recaptcha_check_if_spammable
(
should_redirect
=
true
,
&
block
)
return
yield
unless
issuable
.
is_a?
Spammable
...
...
This diff is collapsed.
Click to expand it.
app/controllers/concerns/notes_actions.rb
View file @
65664c2e
...
...
@@ -212,7 +212,7 @@ module NotesActions
end
def
note_serializer
NoteSerializer
.
new
(
project:
project
,
noteable:
noteable
,
current_user:
current_user
)
Project
NoteSerializer
.
new
(
project:
project
,
noteable:
noteable
,
current_user:
current_user
)
end
def
note_project
...
...
This diff is collapsed.
Click to expand it.
app/controllers/projects/discussions_controller.rb
View file @
65664c2e
...
...
@@ -43,7 +43,7 @@ class Projects::DiscussionsController < Projects::ApplicationController
def
render_json_with_discussions_serializer
render
json:
DiscussionSerializer
.
new
(
project:
project
,
noteable:
discussion
.
noteable
,
current_user:
current_user
)
DiscussionSerializer
.
new
(
project:
project
,
noteable:
discussion
.
noteable
,
current_user:
current_user
,
note_entity:
ProjectNoteEntity
)
.
represent
(
discussion
,
context:
self
)
end
...
...
This diff is collapsed.
Click to expand it.
app/helpers/notes_helper.rb
View file @
65664c2e
...
...
@@ -151,16 +151,17 @@ module NotesHelper
}
end
def
notes_data
(
issuable
)
discussions_path
=
if
issuable
.
is_a?
(
Issue
)
discussions_project_issue_path
(
@project
,
issuable
,
format: :json
)
else
discussions_project_merge_request_path
(
@project
,
issuable
,
format: :json
)
end
def
discussions_path
(
issuable
)
if
issuable
.
is_a?
(
Issue
)
discussions_project_issue_path
(
@project
,
issuable
,
format: :json
)
else
discussions_project_merge_request_path
(
@project
,
issuable
,
format: :json
)
end
end
def
notes_data
(
issuable
)
{
discussionsPath:
discussions_path
,
discussionsPath:
discussions_path
(
issuable
)
,
registerPath:
new_session_path
(
:user
,
redirect_to_referer:
'yes'
,
anchor:
'register-pane'
),
newSessionPath:
new_session_path
(
:user
,
redirect_to_referer:
'yes'
),
markdownDocsPath:
help_page_path
(
'user/markdown'
),
...
...
@@ -170,7 +171,6 @@ module NotesHelper
notesPath:
notes_url
,
totalNotes:
issuable
.
discussions
.
length
,
lastFetchedAt:
Time
.
now
.
to_i
}.
to_json
end
...
...
This diff is collapsed.
Click to expand it.
app/models/note.rb
View file @
65664c2e
...
...
@@ -379,12 +379,15 @@ class Note < ActiveRecord::Base
def
expire_etag_cache
return
unless
noteable
&
.
discussions_rendered_on_frontend?
key
=
Gitlab
::
Routing
.
url_helpers
.
project_noteable_notes_path
(
Gitlab
::
EtagCaching
::
Store
.
new
.
touch
(
etag_key
)
end
def
etag_key
Gitlab
::
Routing
.
url_helpers
.
project_noteable_notes_path
(
project
,
target_type:
noteable_type
.
underscore
,
target_id:
noteable_id
)
Gitlab
::
EtagCaching
::
Store
.
new
.
touch
(
key
)
end
def
touch
(
*
args
)
...
...
This diff is collapsed.
Click to expand it.
app/serializers/discussion_entity.rb
View file @
65664c2e
...
...
@@ -4,7 +4,9 @@ class DiscussionEntity < Grape::Entity
expose
:id
,
:reply_id
expose
:expanded?
,
as: :expanded
expose
:notes
,
using:
NoteEntity
expose
:notes
do
|
discussion
,
opts
|
request
.
note_entity
.
represent
(
discussion
.
notes
,
opts
)
end
expose
:individual_note?
,
as: :individual_note
expose
:resolvable?
,
as: :resolvable
...
...
@@ -12,7 +14,7 @@ class DiscussionEntity < Grape::Entity
expose
:resolve_path
,
if:
->
(
d
,
_
)
{
d
.
resolvable?
}
do
|
discussion
|
resolve_project_merge_request_discussion_path
(
discussion
.
project
,
discussion
.
noteable
,
discussion
.
id
)
end
expose
:resolve_with_issue_path
do
|
discussion
|
expose
:resolve_with_issue_path
,
if:
->
(
d
,
_
)
{
d
.
resolvable?
}
do
|
discussion
|
new_project_issue_path
(
discussion
.
project
,
merge_request_to_resolve_discussions_of:
discussion
.
noteable
.
iid
,
discussion_to_resolve:
discussion
.
id
)
end
...
...
This diff is collapsed.
Click to expand it.
app/serializers/note_entity.rb
View file @
65664c2e
...
...
@@ -5,10 +5,6 @@ class NoteEntity < API::Entities::Note
expose
:author
,
using:
NoteUserEntity
expose
:human_access
do
|
note
|
note
.
project
.
team
.
human_max_access
(
note
.
author_id
)
end
unexpose
:note
,
as: :body
expose
:note
...
...
@@ -37,36 +33,10 @@ class NoteEntity < API::Entities::Note
expose
:emoji_awardable?
,
as: :emoji_awardable
expose
:award_emoji
,
if:
->
(
note
,
_
)
{
note
.
emoji_awardable?
},
using:
AwardEmojiEntity
expose
:toggle_award_path
,
if:
->
(
note
,
_
)
{
note
.
emoji_awardable?
}
do
|
note
|
if
note
.
for_personal_snippet?
toggle_award_emoji_snippet_note_path
(
note
.
noteable
,
note
)
else
toggle_award_emoji_project_note_path
(
note
.
project
,
note
.
id
)
end
end
expose
:report_abuse_path
do
|
note
|
new_abuse_report_path
(
user_id:
note
.
author
.
id
,
ref_url:
Gitlab
::
UrlBuilder
.
build
(
note
))
end
expose
:path
do
|
note
|
if
note
.
for_personal_snippet?
snippet_note_path
(
note
.
noteable
,
note
)
else
project_note_path
(
note
.
project
,
note
)
end
end
expose
:resolve_path
,
if:
->
(
note
,
_
)
{
note
.
part_of_discussion?
&&
note
.
resolvable?
}
do
|
note
|
resolve_project_merge_request_discussion_path
(
note
.
project
,
note
.
noteable
,
note
.
discussion_id
)
end
expose
:resolve_with_issue_path
,
if:
->
(
note
,
_
)
{
note
.
part_of_discussion?
&&
note
.
resolvable?
}
do
|
note
|
new_project_issue_path
(
note
.
project
,
merge_request_to_resolve_discussions_of:
note
.
noteable
.
iid
,
discussion_to_resolve:
note
.
discussion_id
)
end
expose
:attachment
,
using:
NoteAttachmentEntity
,
if:
->
(
note
,
_
)
{
note
.
attachment?
}
expose
:delete_attachment_path
,
if:
->
(
note
,
_
)
{
note
.
attachment?
}
do
|
note
|
delete_attachment_project_note_path
(
note
.
project
,
note
)
end
end
This diff is collapsed.
Click to expand it.
app/serializers/note_serializer.rb
deleted
100644 → 0
View file @
67ca10f3
class
NoteSerializer
<
BaseSerializer
entity
NoteEntity
end
This diff is collapsed.
Click to expand it.
app/serializers/project_note_entity.rb
0 → 100644
View file @
65664c2e
class
ProjectNoteEntity
<
NoteEntity
expose
:human_access
do
|
note
|
note
.
project
.
team
.
human_max_access
(
note
.
author_id
)
end
expose
:toggle_award_path
,
if:
->
(
note
,
_
)
{
note
.
emoji_awardable?
}
do
|
note
|
toggle_award_emoji_project_note_path
(
note
.
project
,
note
.
id
)
end
expose
:path
do
|
note
|
project_note_path
(
note
.
project
,
note
)
end
expose
:resolve_path
,
if:
->
(
note
,
_
)
{
note
.
part_of_discussion?
&&
note
.
resolvable?
}
do
|
note
|
resolve_project_merge_request_discussion_path
(
note
.
project
,
note
.
noteable
,
note
.
discussion_id
)
end
expose
:resolve_with_issue_path
,
if:
->
(
note
,
_
)
{
note
.
part_of_discussion?
&&
note
.
resolvable?
}
do
|
note
|
new_project_issue_path
(
note
.
project
,
merge_request_to_resolve_discussions_of:
note
.
noteable
.
iid
,
discussion_to_resolve:
note
.
discussion_id
)
end
expose
:delete_attachment_path
,
if:
->
(
note
,
_
)
{
note
.
attachment?
}
do
|
note
|
delete_attachment_project_note_path
(
note
.
project
,
note
)
end
end
This diff is collapsed.
Click to expand it.
app/serializers/project_note_serializer.rb
0 → 100644
View file @
65664c2e
class
ProjectNoteSerializer
<
BaseSerializer
entity
ProjectNoteEntity
end
This diff is collapsed.
Click to expand it.
spec/controllers/projects/issues_controller_spec.rb
View file @
65664c2e
...
...
@@ -974,7 +974,7 @@ describe Projects::IssuesController do
it
'returns discussion json'
do
get
:discussions
,
namespace_id:
project
.
namespace
,
project_id:
project
,
id:
issue
.
iid
expect
(
json_response
.
first
.
keys
).
to
match_array
(
%w[id reply_id expanded notes diff_discussion individual_note resolvable resolve
_with_issue_path resolve
d]
)
expect
(
json_response
.
first
.
keys
).
to
match_array
(
%w[id reply_id expanded notes diff_discussion individual_note resolvable resolved]
)
end
context
'with cross-reference system note'
,
:request_store
do
...
...
This diff is collapsed.
Click to expand it.
spec/serializers/discussion_entity_spec.rb
View file @
65664c2e
...
...
@@ -6,7 +6,7 @@ describe DiscussionEntity do
let
(
:user
)
{
create
(
:user
)
}
let
(
:note
)
{
create
(
:discussion_note_on_merge_request
)
}
let
(
:discussion
)
{
note
.
discussion
}
let
(
:request
)
{
double
(
'request'
)
}
let
(
:request
)
{
double
(
'request'
,
note_entity:
ProjectNoteEntity
)
}
let
(
:controller
)
{
double
(
'controller'
)
}
let
(
:entity
)
{
described_class
.
new
(
discussion
,
request:
request
,
context:
controller
)
}
...
...
This diff is collapsed.
Click to expand it.
spec/serializers/note_entity_spec.rb
View file @
65664c2e
...
...
@@ -10,53 +10,5 @@ describe NoteEntity do
let
(
:user
)
{
create
(
:user
)
}
subject
{
entity
.
as_json
}
context
'basic note'
do
it
'exposes correct elements'
do
expect
(
subject
).
to
include
(
:type
,
:author
,
:human_access
,
:note
,
:note_html
,
:current_user
,
:discussion_id
,
:emoji_awardable
,
:award_emoji
,
:toggle_award_path
,
:report_abuse_path
,
:path
,
:attachment
)
end
it
'does not expose elements for specific notes cases'
do
expect
(
subject
).
not_to
include
(
:last_edited_by
,
:last_edited_at
,
:system_note_icon_name
)
end
it
'exposes author correctly'
do
expect
(
subject
[
:author
]).
to
include
(
:id
,
:name
,
:username
,
:state
,
:avatar_url
,
:path
)
end
it
'does not expose web_url for author'
do
expect
(
subject
[
:author
]).
not_to
include
(
:web_url
)
end
end
context
'when note was edited'
do
before
do
note
.
update
(
updated_at:
1
.
minute
.
from_now
,
updated_by:
user
)
end
it
'exposes last_edited_at and last_edited_by elements'
do
expect
(
subject
).
to
include
(
:last_edited_at
,
:last_edited_by
)
end
end
context
'when note is a system note'
do
before
do
note
.
update
(
system:
true
)
end
it
'exposes system_note_icon_name element'
do
expect
(
subject
).
to
include
(
:system_note_icon_name
)
end
end
context
'when note is part of resolvable discussion'
do
before
do
allow
(
note
).
to
receive
(
:part_of_discussion?
).
and_return
(
true
)
allow
(
note
).
to
receive
(
:resolvable?
).
and_return
(
true
)
end
it
'exposes paths to resolve note'
do
expect
(
subject
).
to
include
(
:resolve_path
,
:resolve_with_issue_path
)
end
end
it_behaves_like
'note entity'
end
This diff is collapsed.
Click to expand it.
spec/serializers/project_note_entity_spec.rb
0 → 100644
View file @
65664c2e
require
'spec_helper'
describe
ProjectNoteEntity
do
include
Gitlab
::
Routing
let
(
:request
)
{
double
(
'request'
,
current_user:
user
,
noteable:
note
.
noteable
)
}
let
(
:entity
)
{
described_class
.
new
(
note
,
request:
request
)
}
let
(
:note
)
{
create
(
:note
)
}
let
(
:user
)
{
create
(
:user
)
}
subject
{
entity
.
as_json
}
it_behaves_like
'note entity'
it
'exposes project-specific elements'
do
expect
(
subject
).
to
include
(
:human_access
,
:toggle_award_path
,
:path
)
end
context
'when note is part of resolvable discussion'
do
before
do
allow
(
note
).
to
receive
(
:part_of_discussion?
).
and_return
(
true
)
allow
(
note
).
to
receive
(
:resolvable?
).
and_return
(
true
)
end
it
'exposes paths to resolve note'
do
expect
(
subject
).
to
include
(
:resolve_path
,
:resolve_with_issue_path
)
end
end
end
This diff is collapsed.
Click to expand it.
spec/support/features/discussion_comments_shared_example.rb
View file @
65664c2e
...
...
@@ -81,7 +81,10 @@ shared_examples 'discussion comments' do |resource_name|
# 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'
#
# if dropdown menu is not toggled (and also not present),
# it's "issue-type" dropdown
if
first
(
menu_selector
).
nil?
expect
(
find
(
dropdown_selector
)).
to
have_content
'Comment'
find
(
toggle_selector
).
click
...
...
@@ -107,8 +110,10 @@ shared_examples 'discussion comments' do |resource_name|
end
it
'updates the submit button text and closes the dropdown'
do
button
=
find
(
submit_selector
)
# on issues page, the submit input is a <button>, on other pages it is <input>
if
resource_name
==
'issue
'
if
button
.
tag_name
==
'button
'
expect
(
find
(
submit_selector
)).
to
have_content
'Start discussion'
else
expect
(
find
(
submit_selector
).
value
).
to
eq
'Start discussion'
...
...
@@ -132,6 +137,8 @@ shared_examples 'discussion comments' do |resource_name|
describe
'creating a discussion'
do
before
do
find
(
submit_selector
).
click
wait_for_requests
find
(
comments_selector
,
match: :first
)
end
...
...
@@ -197,11 +204,13 @@ shared_examples 'discussion comments' do |resource_name|
end
it
'updates the submit button text and closes the dropdown'
do
button
=
find
(
submit_selector
)
# 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'
if
button
.
tag_name
==
'button
'
expect
(
button
).
to
have_content
'Comment'
else
expect
(
find
(
submit_selector
)
.
value
).
to
eq
'Comment'
expect
(
button
.
value
).
to
eq
'Comment'
end
expect
(
page
).
not_to
have_selector
menu_selector
...
...
This diff is collapsed.
Click to expand it.
spec/support/shared_examples/serializers/note_entity_examples.rb
0 → 100644
View file @
65664c2e
shared_examples
'note entity'
do
subject
{
entity
.
as_json
}
context
'basic note'
do
it
'exposes correct elements'
do
expect
(
subject
).
to
include
(
:type
,
:author
,
:note
,
:note_html
,
:current_user
,
:discussion_id
,
:emoji_awardable
,
:award_emoji
,
:report_abuse_path
,
:attachment
)
end
it
'does not expose elements for specific notes cases'
do
expect
(
subject
).
not_to
include
(
:last_edited_by
,
:last_edited_at
,
:system_note_icon_name
)
end
it
'exposes author correctly'
do
expect
(
subject
[
:author
]).
to
include
(
:id
,
:name
,
:username
,
:state
,
:avatar_url
,
:path
)
end
it
'does not expose web_url for author'
do
expect
(
subject
[
:author
]).
not_to
include
(
:web_url
)
end
end
context
'when note was edited'
do
before
do
note
.
update
(
updated_at:
1
.
minute
.
from_now
,
updated_by:
user
)
end
it
'exposes last_edited_at and last_edited_by elements'
do
expect
(
subject
).
to
include
(
:last_edited_at
,
:last_edited_by
)
end
end
context
'when note is a system note'
do
before
do
note
.
update
(
system:
true
)
end
it
'exposes system_note_icon_name element'
do
expect
(
subject
).
to
include
(
:system_note_icon_name
)
end
end
end
This diff is collapsed.
Click to expand it.
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