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
Tatuya Kamada
gitlab-ce
Commits
75c6b29f
Commit
75c6b29f
authored
Dec 03, 2015
by
Grzegorz Bizon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add `RepositoryPush` specs
parent
360a96a2
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
127 additions
and
5 deletions
+127
-5
lib/gitlab/email/message/repository_push.rb
lib/gitlab/email/message/repository_push.rb
+5
-5
spec/lib/gitlab/email/message/repository_push_spec.rb
spec/lib/gitlab/email/message/repository_push_spec.rb
+122
-0
No files found.
lib/gitlab/email/message/repository_push.rb
View file @
75c6b29f
...
@@ -87,17 +87,17 @@ module Gitlab
...
@@ -87,17 +87,17 @@ module Gitlab
if
@action
==
:push
if
@action
==
:push
if
commits
.
length
>
1
&&
compare
if
commits
.
length
>
1
&&
compare
@urls
.
namespace_project_compare_url
(
project_namespace
,
@urls
.
namespace_project_compare_url
(
project_namespace
,
project
,
project
,
from:
Commit
.
new
(
compare
.
base
,
project
),
from:
Commit
.
new
(
compare
.
base
,
project
),
to:
Commit
.
new
(
compare
.
head
,
project
))
to:
Commit
.
new
(
compare
.
head
,
project
))
else
else
@urls
.
namespace_project_commit_url
(
project_namespace
,
@urls
.
namespace_project_commit_url
(
project_namespace
,
project
,
commits
.
first
)
project
,
commits
.
first
)
end
end
else
else
unless
@action
==
:delete
unless
@action
==
:delete
@urls
.
namespace_project_tree_url
(
project_namespace
,
@urls
.
namespace_project_tree_url
(
project_namespace
,
project
,
ref_name
)
project
,
ref_name
)
end
end
end
end
end
end
...
...
spec/lib/gitlab/email/message/repository_push_spec.rb
0 → 100644
View file @
75c6b29f
require
'spec_helper'
describe
Gitlab
::
Email
::
Message
::
RepositoryPush
do
include
RepoHelpers
let!
(
:group
)
{
create
(
:group
,
name:
'my_group'
)
}
let!
(
:project
)
{
create
(
:project
,
name:
'my_project'
,
namespace:
group
)
}
let!
(
:author
)
{
create
(
:author
,
name:
'Author'
)
}
let
(
:message
)
do
described_class
.
new
(
Notify
,
project
.
id
,
'recipient@example.com'
,
opts
)
end
context
'new commits have been pushed to repository'
do
let
(
:opts
)
do
{
author_id:
author
.
id
,
ref:
'master'
,
action: :push
,
compare:
compare
,
send_from_committer_email:
true
}
end
let
(
:compare
)
do
Gitlab
::
Git
::
Compare
.
new
(
project
.
repository
.
raw_repository
,
sample_image_commit
.
id
,
sample_commit
.
id
)
end
describe
'#project'
do
subject
{
message
.
project
}
it
{
is_expected
.
to
eq
project
}
it
{
is_expected
.
to
be_an_instance_of
Project
}
end
describe
'#project_namespace'
do
subject
{
message
.
project_namespace
}
it
{
is_expected
.
to
eq
group
}
it
{
is_expected
.
to
be_kind_of
Namespace
}
end
describe
'#project_name_with_namespace'
do
subject
{
message
.
project_name_with_namespace
}
it
{
is_expected
.
to
eq
'my_group / my_project'
}
end
describe
'#author'
do
subject
{
message
.
author
}
it
{
is_expected
.
to
eq
author
}
it
{
is_expected
.
to
be_an_instance_of
User
}
end
describe
'#author_name'
do
subject
{
message
.
author_name
}
it
{
is_expected
.
to
eq
'Author'
}
end
describe
'#commits'
do
subject
{
message
.
commits
}
it
{
is_expected
.
to
be_kind_of
Array
}
it
{
is_expected
.
to
all
(
be_instance_of
Commit
)
}
end
describe
'#diffs'
do
subject
{
message
.
diffs
}
it
{
is_expected
.
to
all
(
be_an_instance_of
Gitlab
::
Git
::
Diff
)
}
end
describe
'#diffs_count'
do
subject
{
message
.
diffs_count
}
it
{
is_expected
.
to
eq
compare
.
diffs
.
count
}
end
describe
'#compare'
do
subject
{
message
.
compare
}
it
{
is_expected
.
to
be_an_instance_of
Gitlab
::
Git
::
Compare
}
end
describe
'#compare_timeout'
do
subject
{
message
.
compare_timeout
}
it
{
is_expected
.
to
eq
compare
.
timeout
}
end
describe
'#reverse_compare?'
do
subject
{
message
.
reverse_compare?
}
it
{
is_expected
.
to
eq
false
}
end
describe
'#disable_diffs?'
do
subject
{
message
.
disable_diffs?
}
it
{
is_expected
.
to
eq
false
}
end
describe
'#send_from_committer_email?'
do
subject
{
message
.
send_from_committer_email?
}
it
{
is_expected
.
to
eq
true
}
end
describe
'#action_name'
do
subject
{
message
.
action_name
}
it
{
is_expected
.
to
eq
'pushed to'
}
end
describe
'#ref_name'
do
subject
{
message
.
ref_name
}
it
{
is_expected
.
to
eq
'master'
}
end
describe
'#ref_type'
do
subject
{
message
.
ref_type
}
it
{
is_expected
.
to
eq
'branch'
}
end
describe
'#target_url'
do
subject
{
message
.
target_url
}
it
{
is_expected
.
to
include
'compare'
}
it
{
is_expected
.
to
include
compare
.
commits
.
first
.
parents
.
first
.
id
}
it
{
is_expected
.
to
include
compare
.
commits
.
last
.
id
}
end
describe
'#subject'
do
subject
{
message
.
subject
}
it
{
is_expected
.
to
include
"[Git][
#{
project
.
path_with_namespace
}
]"
}
it
{
is_expected
.
to
include
"
#{
compare
.
commits
.
length
}
commits"
}
it
{
is_expected
.
to
include
compare
.
commits
.
first
.
message
.
split
(
"
\n
"
).
first
}
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