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
7d8814a2
Commit
7d8814a2
authored
Apr 05, 2017
by
Kamil Trzcinski
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix spec failures
parent
a4064c14
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
4 deletions
+3
-4
lib/gitlab/kubernetes/deployment.rb
lib/gitlab/kubernetes/deployment.rb
+1
-1
spec/lib/gitlab/kubernetes/deployment_spec.rb
spec/lib/gitlab/kubernetes/deployment_spec.rb
+1
-2
spec/support/kubernetes_helpers.rb
spec/support/kubernetes_helpers.rb
+1
-1
No files found.
lib/gitlab/kubernetes/deployment.rb
View file @
7d8814a2
...
@@ -14,7 +14,7 @@ module Gitlab
...
@@ -14,7 +14,7 @@ module Gitlab
end
end
def
track
def
track
labels
.
fetch
(
'track'
)
||
'stable'
labels
.
fetch
(
'track'
,
nil
)
||
'stable'
end
end
def
stable?
def
stable?
...
...
spec/lib/gitlab/kubernetes/deployment_spec.rb
View file @
7d8814a2
...
@@ -107,7 +107,7 @@ describe Gitlab::Kubernetes::Deployment do
...
@@ -107,7 +107,7 @@ describe Gitlab::Kubernetes::Deployment do
context
'with track label'
do
context
'with track label'
do
let
(
:labels
)
{
{
'track'
=>
track
}
}
let
(
:labels
)
{
{
'track'
=>
track
}
}
let
(
:params
)
{
combine
(
named
(
'foo'
),
generation
(
1
,
0
),
instances
(
1
,
1
,
1
,
labels
))
}
let
(
:params
)
{
combine
(
named
(
'foo'
,
labels
),
generation
(
1
,
0
),
instances
(
1
,
1
,
1
,
labels
))
}
context
'when marked as stable'
do
context
'when marked as stable'
do
let
(
:track
)
{
'stable'
}
let
(
:track
)
{
'stable'
}
...
@@ -148,7 +148,6 @@ describe Gitlab::Kubernetes::Deployment do
...
@@ -148,7 +148,6 @@ describe Gitlab::Kubernetes::Deployment do
def
instances
(
replicas
=
4
,
available
=
1
,
updated
=
2
,
labels
=
{})
def
instances
(
replicas
=
4
,
available
=
1
,
updated
=
2
,
labels
=
{})
combine
(
combine
(
named
(
'foo'
,
labels
),
make
(
'spec'
,
'replicas'
=>
replicas
),
make
(
'spec'
,
'replicas'
=>
replicas
),
make
(
'status'
,
'availableReplicas'
=>
available
,
'updatedReplicas'
=>
updated
),
make
(
'status'
,
'availableReplicas'
=>
available
,
'updatedReplicas'
=>
updated
),
)
)
...
...
spec/support/kubernetes_helpers.rb
View file @
7d8814a2
...
@@ -93,7 +93,7 @@ module KubernetesHelpers
...
@@ -93,7 +93,7 @@ module KubernetesHelpers
"labels"
=>
{
"labels"
=>
{
"app"
=>
app
,
"app"
=>
app
,
"track"
=>
track
"track"
=>
track
},
}
.
compact
,
},
},
"spec"
=>
{
"replicas"
=>
3
},
"spec"
=>
{
"replicas"
=>
3
},
"status"
=>
{
"status"
=>
{
...
...
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