Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
heptapod
heptapod
Commits
e0dcdf2bbd37
Commit
0f3deac3
authored
Sep 28, 2015
by
Kamil Trzcinski
Browse files
Fix tests
parent
36dde3b23633
Changes
4
Hide whitespace changes
Inline
Side-by-side
features/steps/project/commits/commits.rb
View file @
e0dcdf2b
...
...
@@ -104,7 +104,7 @@ class Spinach::Features::ProjectCommits < Spinach::FeatureSteps
step
'commit has ci status'
do
@project
.
enable_ci
(
@user
)
create
:ci_commit
,
project:
@project
.
gitlab_ci_project
,
sha:
sample_commit
.
id
create
:ci_commit
,
gl_
project:
@project
,
sha:
sample_commit
.
id
end
step
'I see commit ci info'
do
...
...
features/steps/shared/project.rb
View file @
e0dcdf2b
...
...
@@ -204,6 +204,6 @@ def current_project
step
'project "Shop" has CI build'
do
project
=
Project
.
find_by
(
name:
"Shop"
)
create
:ci_commit
,
project:
project
.
gitlab_ci_
project
,
sha:
project
.
commit
.
sha
create
:ci_commit
,
gl_
project:
project
,
sha:
project
.
commit
.
sha
end
end
spec/lib/ci/charts_spec.rb
View file @
e0dcdf2b
...
...
@@ -4,13 +4,12 @@
context
"build_times"
do
before
do
@project
=
FactoryGirl
.
create
(
:ci_project
)
@commit
=
FactoryGirl
.
create
(
:ci_commit
,
project:
@project
)
@commit
=
FactoryGirl
.
create
(
:ci_commit
)
FactoryGirl
.
create
(
:ci_build
,
commit:
@commit
)
end
it
'should return build times in minutes'
do
chart
=
Ci
::
Charts
::
BuildTime
.
new
(
@project
)
chart
=
Ci
::
Charts
::
BuildTime
.
new
(
@
commit
.
project
)
expect
(
chart
.
build_times
).
to
eq
([
2
])
end
end
...
...
spec/models/project_spec.rb
View file @
e0dcdf2b
...
...
@@ -404,10 +404,12 @@
describe
:ci_commit
do
let
(
:project
)
{
create
:project
}
let
(
:ci_project
)
{
create
:ci_project
,
gl_project:
project
}
let
(
:commit
)
{
create
:ci_commit
,
project:
ci_project
}
let
(
:commit
)
{
create
:ci_commit
,
gl_project:
project
}
before
{
project
.
create_gitlab_ci_service
(
active:
true
)
}
before
do
project
.
ensure_ci_project
project
.
create_gitlab_ci_service
(
active:
true
)
end
it
{
expect
(
project
.
ci_commit
(
commit
.
sha
)).
to
eq
(
commit
)
}
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