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
Kazuhiko Shiozaki
gitlab-ce
Commits
8c9a1487
Commit
8c9a1487
authored
Apr 16, 2015
by
Robert Speicher
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update mentionable shared examples to be (a bit) more understandable
parent
dee52393
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
70 additions
and
43 deletions
+70
-43
spec/models/commit_spec.rb
spec/models/commit_spec.rb
+1
-1
spec/support/mentionable_shared_examples.rb
spec/support/mentionable_shared_examples.rb
+69
-42
No files found.
spec/models/commit_spec.rb
View file @
8c9a1487
...
@@ -69,9 +69,9 @@ eos
...
@@ -69,9 +69,9 @@ eos
end
end
it_behaves_like
'a mentionable'
do
it_behaves_like
'a mentionable'
do
let
(
:mauthor
)
{
create
:user
,
email:
commit
.
author_email
}
subject
{
commit
}
subject
{
commit
}
let
(
:author
)
{
create
(
:user
,
email:
commit
.
author_email
)
}
let
(
:backref_text
)
{
"commit
#{
subject
.
id
}
"
}
let
(
:backref_text
)
{
"commit
#{
subject
.
id
}
"
}
let
(
:set_mentionable_text
)
{
->
(
txt
){
subject
.
stub
(
safe_message:
txt
)
}
}
let
(
:set_mentionable_text
)
{
->
(
txt
){
subject
.
stub
(
safe_message:
txt
)
}
}
...
...
spec/support/mentionable_shared_examples.rb
View file @
8c9a1487
...
@@ -5,19 +5,16 @@
...
@@ -5,19 +5,16 @@
# - let(:set_mentionable_text) { lambda { |txt| "block that assigns txt to the subject's mentionable_text" } }
# - let(:set_mentionable_text) { lambda { |txt| "block that assigns txt to the subject's mentionable_text" } }
def
common_mentionable_setup
def
common_mentionable_setup
# Avoid name collisions with let(:project) or let(:author) in the surrounding scope.
let
(
:project
)
{
create
:project
}
let
(
:mproject
)
{
create
:project
}
let
(
:author
)
{
subject
.
author
}
let
(
:mauthor
)
{
subject
.
author
}
let
(
:mentioned_issue
)
{
create
(
:issue
,
project:
project
)
}
let
(
:mentioned_issue
)
{
create
:issue
,
project:
mproject
}
let
(
:mentioned_mr
)
{
create
(
:merge_request
,
:simple
,
source_project:
project
)
}
let
(
:other_issue
)
{
create
:issue
,
project:
mproject
}
let
(
:mentioned_commit
)
{
project
.
repository
.
commit
}
let
(
:mentioned_mr
)
{
create
:merge_request
,
:simple
,
source_project:
mproject
}
let
(
:mentioned_commit
)
{
double
(
'commit'
,
sha:
'1234567890abcdef'
).
as_null_object
}
let
(
:ext_proj
)
{
create
(
:project
,
:public
)
}
let
(
:ext_issue
)
{
create
(
:issue
,
project:
ext_proj
)
}
let
(
:ext_proj
)
{
create
:project
,
:public
}
let
(
:ext_mr
)
{
create
(
:merge_request
,
:simple
,
source_project:
ext_proj
)
}
let
(
:ext_issue
)
{
create
:issue
,
project:
ext_proj
}
let
(
:other_ext_issue
)
{
create
:issue
,
project:
ext_proj
}
let
(
:ext_mr
)
{
create
:merge_request
,
:simple
,
source_project:
ext_proj
}
let
(
:ext_commit
)
{
ext_proj
.
repository
.
commit
}
let
(
:ext_commit
)
{
ext_proj
.
repository
.
commit
}
# Override to add known commits to the repository stub.
# Override to add known commits to the repository stub.
...
@@ -26,20 +23,37 @@ def common_mentionable_setup
...
@@ -26,20 +23,37 @@ def common_mentionable_setup
# A string that mentions each of the +mentioned_.*+ objects above. Mentionables should add a self-reference
# A string that mentions each of the +mentioned_.*+ objects above. Mentionables should add a self-reference
# to this string and place it in their +mentionable_text+.
# to this string and place it in their +mentionable_text+.
let
(
:ref_string
)
do
let
(
:ref_string
)
do
"mentions #
#{
mentioned_issue
.
iid
}
twice #
#{
mentioned_issue
.
iid
}
, "
+
cross
=
ext_proj
.
path_with_namespace
"!
#{
mentioned_mr
.
iid
}
, "
+
"
#{
ext_proj
.
path_with_namespace
}
#
#{
ext_issue
.
iid
}
, "
+
<<-
MSG
.
strip_heredoc
"
#{
ext_proj
.
path_with_namespace
}
!
#{
ext_mr
.
iid
}
, "
+
These references are new:
"
#{
ext_proj
.
path_with_namespace
}
@
#{
ext_commit
.
short_id
}
, "
+
Issue: #
#{
mentioned_issue
.
iid
}
"
#{
mentioned_commit
.
sha
[
0
..
10
]
}
and itself as
#{
backref_text
}
"
Merge: !
#{
mentioned_mr
.
iid
}
Commit:
#{
mentioned_commit
.
id
}
This reference is a repeat and should only be mentioned once:
Repeat: #
#{
mentioned_issue
.
iid
}
These references are cross-referenced:
Issue:
#{
cross
}
#
#{
ext_issue
.
iid
}
Merge:
#{
cross
}
!
#{
ext_mr
.
iid
}
Commit:
#{
cross
}
@
#{
ext_commit
.
short_id
}
This is a self-reference and should not be mentioned at all:
Self:
#{
backref_text
}
MSG
end
end
before
do
before
do
# Wire the project's repository to return the mentioned commit, and +nil+ for any
# Wire the project's repository to return the mentioned commit, and +nil+
# unrecognized commits.
# for any unrecognized commits.
commitmap
=
{
'1234567890a'
=>
mentioned_commit
}
commitmap
=
{
mentioned_commit
.
id
=>
mentioned_commit
}
extra_commits
.
each
{
|
c
|
commitmap
[
c
.
short_id
]
=
c
}
extra_commits
.
each
{
|
c
|
commitmap
[
c
.
short_id
]
=
c
}
allow
(
mproject
.
repository
).
to
receive
(
:commit
)
{
|
sha
|
commitmap
[
sha
]
}
allow
(
project
.
repository
).
to
receive
(
:commit
)
{
|
sha
|
commitmap
[
sha
]
}
set_mentionable_text
.
call
(
ref_string
)
set_mentionable_text
.
call
(
ref_string
)
end
end
end
end
...
@@ -53,7 +67,7 @@ shared_examples 'a mentionable' do
...
@@ -53,7 +67,7 @@ shared_examples 'a mentionable' do
it
"extracts references from its reference property"
do
it
"extracts references from its reference property"
do
# De-duplicate and omit itself
# De-duplicate and omit itself
refs
=
subject
.
references
(
m
project
)
refs
=
subject
.
references
(
project
)
expect
(
refs
.
size
).
to
eq
(
6
)
expect
(
refs
.
size
).
to
eq
(
6
)
expect
(
refs
).
to
include
(
mentioned_issue
)
expect
(
refs
).
to
include
(
mentioned_issue
)
expect
(
refs
).
to
include
(
mentioned_mr
)
expect
(
refs
).
to
include
(
mentioned_mr
)
...
@@ -68,14 +82,15 @@ shared_examples 'a mentionable' do
...
@@ -68,14 +82,15 @@ shared_examples 'a mentionable' do
ext_issue
,
ext_mr
,
ext_commit
]
ext_issue
,
ext_mr
,
ext_commit
]
mentioned_objects
.
each
do
|
referenced
|
mentioned_objects
.
each
do
|
referenced
|
expect
(
Note
).
to
receive
(
:create_cross_reference_note
).
with
(
referenced
,
subject
.
local_reference
,
mauthor
,
mproject
)
expect
(
Note
).
to
receive
(
:create_cross_reference_note
).
with
(
referenced
,
subject
.
local_reference
,
author
,
project
)
end
end
subject
.
create_cross_references!
(
mproject
,
m
author
)
subject
.
create_cross_references!
(
project
,
author
)
end
end
it
'detects existing cross-references'
do
it
'detects existing cross-references'
do
Note
.
create_cross_reference_note
(
mentioned_issue
,
subject
.
local_reference
,
mauthor
,
m
project
)
Note
.
create_cross_reference_note
(
mentioned_issue
,
subject
.
local_reference
,
author
,
project
)
expect
(
subject
.
has_mentioned?
(
mentioned_issue
)).
to
be_truthy
expect
(
subject
.
has_mentioned?
(
mentioned_issue
)).
to
be_truthy
expect
(
subject
.
has_mentioned?
(
mentioned_mr
)).
to
be_falsey
expect
(
subject
.
has_mentioned?
(
mentioned_mr
)).
to
be_falsey
...
@@ -87,29 +102,41 @@ shared_examples 'an editable mentionable' do
...
@@ -87,29 +102,41 @@ shared_examples 'an editable mentionable' do
it_behaves_like
'a mentionable'
it_behaves_like
'a mentionable'
let
(
:new_issues
)
do
[
create
(
:issue
,
project:
project
),
create
(
:issue
,
project:
ext_proj
)]
end
it
'creates new cross-reference notes when the mentionable text is edited'
do
it
'creates new cross-reference notes when the mentionable text is edited'
do
new_text
=
"still mentions #
#{
mentioned_issue
.
iid
}
, "
+
cross
=
ext_proj
.
path_with_namespace
"
#{
mentioned_commit
.
sha
[
0
..
10
]
}
, "
+
"
#{
ext_issue
.
iid
}
, "
+
new_text
=
<<-
MSG
"new refs: #
#{
other_issue
.
iid
}
, "
+
These references already existed:
"
#{
ext_proj
.
path_with_namespace
}
#
#{
other_ext_issue
.
iid
}
"
Issue: #
#{
mentioned_issue
.
iid
}
Commit:
#{
mentioned_commit
.
id
}
This cross-project reference already existed:
Issue:
#{
cross
}
#
#{
ext_issue
.
iid
}
These two references are introduced in an edit:
Issue: #
#{
new_issues
[
0
].
iid
}
Cross:
#{
cross
}
#
#{
new_issues
[
1
].
iid
}
MSG
# These three objects were already referenced, and should not receive new
# notes
[
mentioned_issue
,
mentioned_commit
,
ext_issue
].
each
do
|
oldref
|
[
mentioned_issue
,
mentioned_commit
,
ext_issue
].
each
do
|
oldref
|
expect
(
Note
).
not_to
receive
(
:create_cross_reference_note
).
with
(
oldref
,
subject
.
local_reference
,
expect
(
Note
).
not_to
receive
(
:create_cross_reference_note
).
mauthor
,
mproject
)
with
(
oldref
,
any_args
)
end
end
[
other_issue
,
other_ext_issue
].
each
do
|
newref
|
# These two issues are new and should receive reference notes
expect
(
Note
).
to
receive
(
:create_cross_reference_note
).
with
(
new_issues
.
each
do
|
newref
|
newref
,
expect
(
Note
).
to
receive
(
:create_cross_reference_note
).
subject
.
local_reference
,
with
(
newref
,
subject
.
local_reference
,
author
,
project
)
mauthor
,
mproject
)
end
end
subject
.
save
subject
.
save
set_mentionable_text
.
call
(
new_text
)
set_mentionable_text
.
call
(
new_text
)
subject
.
notice_added_references
(
mproject
,
m
author
)
subject
.
notice_added_references
(
project
,
author
)
end
end
end
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