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
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
gitlab-ce
Commits
0082cfb1
Commit
0082cfb1
authored
Aug 01, 2014
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix notify specs
Signed-off-by:
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
parent
ff5176d4
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
6 deletions
+7
-6
spec/mailers/notify_spec.rb
spec/mailers/notify_spec.rb
+7
-6
No files found.
spec/mailers/notify_spec.rb
View file @
0082cfb1
...
...
@@ -3,6 +3,7 @@ require 'spec_helper'
describe
Notify
do
include
EmailSpec
::
Helpers
include
EmailSpec
::
Matchers
include
RepoHelpers
let
(
:gitlab_sender
)
{
Gitlab
.
config
.
gitlab
.
email_from
}
let
(
:recipient
)
{
create
(
:user
,
email:
'recipient@example.com'
)
}
...
...
@@ -524,7 +525,7 @@ describe Notify do
describe
'email on push with multiple commits'
do
let
(
:example_site_path
)
{
root_path
}
let
(
:user
)
{
create
(
:user
)
}
let
(
:compare
)
{
Gitlab
::
Git
::
Compare
.
new
(
project
.
repository
.
raw_repository
,
'cd5c4bac'
,
'b1e6a9db'
)
}
let
(
:compare
)
{
Gitlab
::
Git
::
Compare
.
new
(
project
.
repository
.
raw_repository
,
sample_image_commit
.
id
,
sample_commit
.
id
)
}
let
(
:commits
)
{
Commit
.
decorate
(
compare
.
commits
)
}
let
(
:diff_path
)
{
project_compare_path
(
project
,
from:
commits
.
first
,
to:
commits
.
last
)
}
...
...
@@ -545,11 +546,11 @@ describe Notify do
end
it
'includes commits list'
do
should
have_body_text
/
tree css fix
es/
should
have_body_text
/
Change some fil
es/
end
it
'includes diffs'
do
should
have_body_text
/
Checkout wiki pages for installation information
/
should
have_body_text
/
def archive_formats_regex
/
end
it
'contains a link to the diff'
do
...
...
@@ -560,7 +561,7 @@ describe Notify do
describe
'email on push with a single commit'
do
let
(
:example_site_path
)
{
root_path
}
let
(
:user
)
{
create
(
:user
)
}
let
(
:compare
)
{
Gitlab
::
Git
::
Compare
.
new
(
project
.
repository
.
raw_repository
,
'8716fc78'
,
'b1e6a9db'
)
}
let
(
:compare
)
{
Gitlab
::
Git
::
Compare
.
new
(
project
.
repository
.
raw_repository
,
sample_commit
.
parent_id
,
sample_commit
.
id
)
}
let
(
:commits
)
{
Commit
.
decorate
(
compare
.
commits
)
}
let
(
:diff_path
)
{
project_commit_path
(
project
,
commits
.
first
)
}
...
...
@@ -581,11 +582,11 @@ describe Notify do
end
it
'includes commits list'
do
should
have_body_text
/
tree css fix
es/
should
have_body_text
/
Change some fil
es/
end
it
'includes diffs'
do
should
have_body_text
/
Checkout wiki pages for installation information
/
should
have_body_text
/
def archive_formats_regex
/
end
it
'contains a link to the diff'
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