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
b78d8a74
Commit
b78d8a74
authored
Nov 03, 2017
by
Shinya Maeda
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix spec failure. MySQL does not bite true
parent
694cfeb7
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
2 deletions
+7
-2
spec/factories/clusters/platforms/kubernetes.rb
spec/factories/clusters/platforms/kubernetes.rb
+2
-0
spec/lib/gitlab/import_export/all_models.yml
spec/lib/gitlab/import_export/all_models.yml
+3
-0
spec/migrations/migrate_gcp_clusters_to_new_clusters_architectures_spec.rb
...igrate_gcp_clusters_to_new_clusters_architectures_spec.rb
+2
-2
No files found.
spec/factories/clusters/platforms/kubernetes.rb
View file @
b78d8a74
...
@@ -2,6 +2,8 @@ FactoryGirl.define do
...
@@ -2,6 +2,8 @@ FactoryGirl.define do
factory
:platform_kubernetes
,
class:
Clusters
::
Platforms
::
Kubernetes
do
factory
:platform_kubernetes
,
class:
Clusters
::
Platforms
::
Kubernetes
do
cluster
cluster
namespace
nil
namespace
nil
api_url
'https://kubernetes.example.com'
token
'a'
*
40
trait
:configured
do
trait
:configured
do
api_url
'https://kubernetes.example.com'
api_url
'https://kubernetes.example.com'
...
...
spec/lib/gitlab/import_export/all_models.yml
View file @
b78d8a74
...
@@ -147,6 +147,9 @@ deploy_keys:
...
@@ -147,6 +147,9 @@ deploy_keys:
-
user
-
user
-
deploy_keys_projects
-
deploy_keys_projects
-
projects
-
projects
cluster
:
-
projects
-
user
clusters
:
clusters
:
-
projects
-
projects
-
user
-
user
...
...
spec/migrations/migrate_gcp_clusters_to_new_clusters_architectures_spec.rb
View file @
b78d8a74
...
@@ -13,7 +13,7 @@ describe MigrateGcpClustersToNewClustersArchitectures, :migration do
...
@@ -13,7 +13,7 @@ describe MigrateGcpClustersToNewClustersArchitectures, :migration do
let
(
:gcp_cluster_size
)
{
1
}
let
(
:gcp_cluster_size
)
{
1
}
let
(
:created_at
)
{
'2017-10-17 20:24:02.219679'
}
let
(
:created_at
)
{
'2017-10-17 20:24:02.219679'
}
let
(
:updated_at
)
{
'2017-10-17 20:28:44.738998'
}
let
(
:updated_at
)
{
'2017-10-17 20:28:44.738998'
}
let
(
:enabled
)
{
true
}
let
(
:enabled
)
{
1
}
# true
let
(
:status_reason
)
{
'general error'
}
let
(
:status_reason
)
{
'general error'
}
let
(
:project_namespace
)
{
'sample-app'
}
let
(
:project_namespace
)
{
'sample-app'
}
let
(
:endpoint
)
{
'111.111.111.111'
}
let
(
:endpoint
)
{
'111.111.111.111'
}
...
@@ -50,7 +50,7 @@ describe MigrateGcpClustersToNewClustersArchitectures, :migration do
...
@@ -50,7 +50,7 @@ describe MigrateGcpClustersToNewClustersArchitectures, :migration do
expect
(
Clusters
::
Platforms
::
Kubernetes
.
count
).
to
eq
(
1
)
expect
(
Clusters
::
Platforms
::
Kubernetes
.
count
).
to
eq
(
1
)
expect
(
cluster
.
user
).
to
eq
(
user
)
expect
(
cluster
.
user
).
to
eq
(
user
)
expect
(
cluster
.
enabled
).
to
eq
(
enabled
)
expect
(
cluster
.
enabled
).
to
be_truthy
expect
(
cluster
.
name
).
to
eq
(
gcp_cluster_name
)
expect
(
cluster
.
name
).
to
eq
(
gcp_cluster_name
)
expect
(
cluster
.
provider_type
).
to
eq
(
'gcp'
)
expect
(
cluster
.
provider_type
).
to
eq
(
'gcp'
)
expect
(
cluster
.
platform_type
).
to
eq
(
'kubernetes'
)
expect
(
cluster
.
platform_type
).
to
eq
(
'kubernetes'
)
...
...
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