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
71851a7e
Commit
71851a7e
authored
Jan 23, 2014
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix tests
Signed-off-by:
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
parent
e013cd44
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
5 deletions
+4
-5
spec/models/project_spec.rb
spec/models/project_spec.rb
+3
-4
spec/models/service_spec.rb
spec/models/service_spec.rb
+1
-1
No files found.
spec/models/project_spec.rb
View file @
71851a7e
...
...
@@ -136,7 +136,7 @@ describe Project do
end
it
"should close merge request if last commit from source branch was pushed to target branch"
do
@merge_request
.
reload
ed_commits
@merge_request
.
reload
_code
@merge_request
.
last_commit
.
id
.
should
==
"b1e6a9dbf1c85e6616497a5e7bad9143a4bd0828"
project
.
update_merge_requests
(
"8716fc78f3c65bbf7bcf7b574febd583bc5d2812"
,
"b1e6a9dbf1c85e6616497a5e7bad9143a4bd0828"
,
"refs/heads/stable"
,
@key
.
user
)
@merge_request
.
reload
...
...
@@ -144,7 +144,6 @@ describe Project do
end
it
"should update merge request commits with new one if pushed to source branch"
do
@merge_request
.
last_commit
.
should
==
nil
project
.
update_merge_requests
(
"8716fc78f3c65bbf7bcf7b574febd583bc5d2812"
,
"b1e6a9dbf1c85e6616497a5e7bad9143a4bd0828"
,
"refs/heads/master"
,
@key
.
user
)
@merge_request
.
reload
@merge_request
.
last_commit
.
id
.
should
==
"b1e6a9dbf1c85e6616497a5e7bad9143a4bd0828"
...
...
@@ -156,10 +155,10 @@ describe Project do
context
'with namespace'
do
before
do
@group
=
create
:group
,
name:
'gitlab'
@project
=
create
(
:project
,
name:
'gitlab
-ci
'
,
namespace:
@group
)
@project
=
create
(
:project
,
name:
'gitlab
hq
'
,
namespace:
@group
)
end
it
{
Project
.
find_with_namespace
(
'gitlab/gitlab
-ci
'
).
should
==
@project
}
it
{
Project
.
find_with_namespace
(
'gitlab/gitlab
hq
'
).
should
==
@project
}
it
{
Project
.
find_with_namespace
(
'gitlab-ci'
).
should
be_nil
}
end
end
...
...
spec/models/service_spec.rb
View file @
71851a7e
...
...
@@ -44,7 +44,7 @@ describe Service do
end
describe
:can_test
do
it
{
@testable
.
should
==
fals
e
}
it
{
@testable
.
should
==
tru
e
}
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