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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
23712d20
Commit
23712d20
authored
Jun 07, 2017
by
Kamil Trzcinski
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix failures
parent
8367e91f
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
13 deletions
+9
-13
spec/factories/ci/sources/pipelines.rb
spec/factories/ci/sources/pipelines.rb
+4
-8
spec/serializers/pipeline_details_entity_spec.rb
spec/serializers/pipeline_details_entity_spec.rb
+3
-3
spec/workers/expire_pipeline_cache_worker_spec.rb
spec/workers/expire_pipeline_cache_worker_spec.rb
+2
-2
No files found.
spec/factories/ci/sources/pipelines.rb
View file @
23712d20
...
@@ -5,13 +5,9 @@ FactoryGirl.define do
...
@@ -5,13 +5,9 @@ FactoryGirl.define do
source
.
source_pipeline
||=
source
.
source_job
.
pipeline
source
.
source_pipeline
||=
source
.
source_job
.
pipeline
source
.
source_project
||=
source
.
source_pipeline
.
project
source
.
source_project
||=
source
.
source_pipeline
.
project
end
end
trait
:create_source
do
source_job
factory: :ci_build
source_job
factory: :ci_build
end
pipeline
factory: :ci_empty_pipeline
trait
:create_target
do
pipeline
factory: :ci_empty_pipeline
end
end
end
end
end
spec/serializers/pipeline_details_entity_spec.rb
View file @
23712d20
...
@@ -121,7 +121,7 @@ describe PipelineDetailsEntity do
...
@@ -121,7 +121,7 @@ describe PipelineDetailsEntity do
let
(
:pipeline
)
{
create
(
:ci_empty_pipeline
)
}
let
(
:pipeline
)
{
create
(
:ci_empty_pipeline
)
}
before
do
before
do
create
(
:ci_sources_pipeline
,
:create_source
,
pipeline:
pipeline
)
create
(
:ci_sources_pipeline
,
pipeline:
pipeline
)
end
end
it
'contains an information about depedent pipeline'
do
it
'contains an information about depedent pipeline'
do
...
@@ -138,8 +138,8 @@ describe PipelineDetailsEntity do
...
@@ -138,8 +138,8 @@ describe PipelineDetailsEntity do
let
(
:build
)
{
create
(
:ci_build
,
pipeline:
pipeline
)
}
let
(
:build
)
{
create
(
:ci_build
,
pipeline:
pipeline
)
}
before
do
before
do
create
(
:ci_sources_pipeline
,
:create_target
,
source_job:
build
)
create
(
:ci_sources_pipeline
,
source_job:
build
)
create
(
:ci_sources_pipeline
,
:create_target
,
source_job:
build
)
create
(
:ci_sources_pipeline
,
source_job:
build
)
end
end
it
'contains an information about depedent pipeline'
do
it
'contains an information about depedent pipeline'
do
...
...
spec/workers/expire_pipeline_cache_worker_spec.rb
View file @
23712d20
...
@@ -45,7 +45,7 @@ describe ExpirePipelineCacheWorker do
...
@@ -45,7 +45,7 @@ describe ExpirePipelineCacheWorker do
context
'when pipeline is triggered by other pipeline'
do
context
'when pipeline is triggered by other pipeline'
do
let
(
:pipeline
)
{
create
(
:ci_empty_pipeline
)
}
let
(
:pipeline
)
{
create
(
:ci_empty_pipeline
)
}
let
(
:source
)
{
create
(
:ci_sources_pipeline
,
:create_source
,
pipeline:
pipeline
)
}
let
(
:source
)
{
create
(
:ci_sources_pipeline
,
pipeline:
pipeline
)
}
it
'updates the cache of dependent pipeline'
do
it
'updates the cache of dependent pipeline'
do
dependent_pipeline_path
=
"/
#{
source
.
source_project
.
full_path
}
/pipelines/
#{
source
.
source_pipeline
.
id
}
.json"
dependent_pipeline_path
=
"/
#{
source
.
source_project
.
full_path
}
/pipelines/
#{
source
.
source_pipeline
.
id
}
.json"
...
@@ -60,7 +60,7 @@ describe ExpirePipelineCacheWorker do
...
@@ -60,7 +60,7 @@ describe ExpirePipelineCacheWorker do
context
'when pipeline triggered other pipeline'
do
context
'when pipeline triggered other pipeline'
do
let
(
:pipeline
)
{
create
(
:ci_empty_pipeline
)
}
let
(
:pipeline
)
{
create
(
:ci_empty_pipeline
)
}
let
(
:build
)
{
create
(
:ci_build
,
pipeline:
pipeline
)
}
let
(
:build
)
{
create
(
:ci_build
,
pipeline:
pipeline
)
}
let
(
:source
)
{
create
(
:ci_sources_pipeline
,
:create_target
,
source_job:
build
)
}
let
(
:source
)
{
create
(
:ci_sources_pipeline
,
source_job:
build
)
}
it
'updates the cache of dependent pipeline'
do
it
'updates the cache of dependent pipeline'
do
dependent_pipeline_path
=
"/
#{
source
.
project
.
full_path
}
/pipelines/
#{
source
.
pipeline
.
id
}
.json"
dependent_pipeline_path
=
"/
#{
source
.
project
.
full_path
}
/pipelines/
#{
source
.
pipeline
.
id
}
.json"
...
...
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