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
e7012b574b2a
Commit
e7012b57
authored
Sep 29, 2015
by
Kamil Trzcinski
Browse files
Make ensure_gitlab_ci_project return ci_project or create a new one
parent
e437307fb976
Changes
5
Hide whitespace changes
Inline
Side-by-side
app/models/ci/commit.rb
View file @
e7012b57
...
...
@@ -37,11 +37,7 @@
end
def
project
unless
@project
gl_project
.
ensure_ci_project
@project
=
gl_project
.
gitlab_ci_project
end
@project
@project
||=
gl_project
.
ensure_gitlab_ci_project
end
def
project_id
...
...
app/models/project.rb
View file @
e7012b57
...
...
@@ -747,10 +747,8 @@
gitlab_ci_project
.
commits
.
find_by
(
sha:
sha
)
if
gitlab_ci?
end
def
ensure_ci_project
unless
gitlab_ci_project
create_gitlab_ci_project
end
def
ensure_gitlab_ci_project
gitlab_ci_project
||
create_gitlab_ci_project
end
def
enable_ci
(
user
)
...
...
spec/models/ci/project_spec.rb
View file @
e7012b57
...
...
@@ -56,5 +56,5 @@
describe
"ordered_by_last_commit_date"
do
it
"returns ordered projects"
do
newest_project
=
FactoryGirl
.
create
:empty_project
newest_project
.
ensure_ci_project
newest_ci_project
=
newest_project
.
ensure_
gitlab_
ci_project
oldest_project
=
FactoryGirl
.
create
:empty_project
...
...
@@ -60,3 +60,3 @@
oldest_project
=
FactoryGirl
.
create
:empty_project
oldest_project
.
ensure_ci_project
oldest_ci_project
=
oldest_project
.
ensure_
gitlab_
ci_project
project_without_commits
=
FactoryGirl
.
create
:empty_project
...
...
@@ -62,6 +62,6 @@
project_without_commits
=
FactoryGirl
.
create
:empty_project
project_without_commits
.
ensure_ci_project
ci_project_without_commits
=
project_without_commits
.
ensure_
gitlab_
ci_project
FactoryGirl
.
create
:ci_commit
,
committed_at:
1
.
hour
.
ago
,
gl_project:
newest_project
FactoryGirl
.
create
:ci_commit
,
committed_at:
2
.
hour
.
ago
,
gl_project:
oldest_project
...
...
@@ -64,8 +64,8 @@
FactoryGirl
.
create
:ci_commit
,
committed_at:
1
.
hour
.
ago
,
gl_project:
newest_project
FactoryGirl
.
create
:ci_commit
,
committed_at:
2
.
hour
.
ago
,
gl_project:
oldest_project
expect
(
Ci
::
Project
.
ordered_by_last_commit_date
).
to
eq
([
newest_
project
.
gitlab_
ci_project
,
oldest_
project
.
gitlab_
ci_project
,
project_without_commits
.
gitlab_ci_project
])
expect
(
Ci
::
Project
.
ordered_by_last_commit_date
).
to
eq
([
newest_ci_project
,
oldest_ci_project
,
ci_
project_without_commits
])
end
end
...
...
spec/models/project_spec.rb
View file @
e7012b57
...
...
@@ -407,7 +407,7 @@
let
(
:commit
)
{
create
:ci_commit
,
gl_project:
project
}
before
do
project
.
ensure_ci_project
project
.
ensure_
gitlab_
ci_project
project
.
create_gitlab_ci_service
(
active:
true
)
end
...
...
spec/services/ci/register_build_service_spec.rb
View file @
e7012b57
...
...
@@ -10,8 +10,7 @@
let!
(
:specific_runner
)
{
FactoryGirl
.
create
(
:ci_runner
,
is_shared:
false
)
}
before
do
gl_project
.
ensure_ci_project
specific_runner
.
assign_to
(
gl_project
.
gitlab_ci_project
)
specific_runner
.
assign_to
(
gl_project
.
ensure_gitlab_ci_project
)
end
describe
:execute
do
...
...
Write
Preview
Supports
Markdown
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