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
7569a4bd
Commit
7569a4bd
authored
Nov 05, 2018
by
Shinya Maeda
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix EE specific tests
parent
18fa8041
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
10 additions
and
6 deletions
+10
-6
ee/spec/controllers/operations_controller_spec.rb
ee/spec/controllers/operations_controller_spec.rb
+1
-1
ee/spec/controllers/projects/environments_controller_spec.rb
ee/spec/controllers/projects/environments_controller_spec.rb
+1
-1
ee/spec/features/projects/environments/environments_spec.rb
ee/spec/features/projects/environments/environments_spec.rb
+4
-0
ee/spec/features/projects/environments_pod_logs_spec.rb
ee/spec/features/projects/environments_pod_logs_spec.rb
+1
-1
ee/spec/models/ee/environment_spec.rb
ee/spec/models/ee/environment_spec.rb
+1
-1
ee/spec/services/dashboard/operations/list_service_spec.rb
ee/spec/services/dashboard/operations/list_service_spec.rb
+2
-2
No files found.
ee/spec/controllers/operations_controller_spec.rb
View file @
7569a4bd
...
...
@@ -53,7 +53,7 @@ describe OperationsController do
let
(
:project
)
{
create
(
:project
,
:repository
)
}
let
(
:commit
)
{
project
.
commit
}
let!
(
:environment
)
{
create
(
:environment
,
name:
'production'
,
project:
project
)
}
let!
(
:deployment
)
{
create
(
:deployment
,
environment:
environment
,
sha:
commit
.
id
,
created_at:
now
)
}
let!
(
:deployment
)
{
create
(
:deployment
,
:success
,
environment:
environment
,
sha:
commit
.
id
,
created_at:
now
)
}
it_behaves_like
'unlicensed'
,
:get
,
:list
...
...
ee/spec/controllers/projects/environments_controller_spec.rb
View file @
7569a4bd
...
...
@@ -82,7 +82,7 @@ describe Projects::EnvironmentsController do
create
(
:cluster
,
:provided_by_gcp
,
environment_scope:
'*'
,
projects:
[
project
])
create
(
:deployment
,
environment:
environment
)
create
(
:deployment
,
:success
,
environment:
environment
)
allow_any_instance_of
(
EE
::
KubernetesService
).
to
receive
(
:read_pod_logs
).
with
(
pod_name
).
and_return
(
kube_logs_body
)
allow_any_instance_of
(
Gitlab
::
Kubernetes
::
RolloutStatus
).
to
receive
(
:instances
).
and_return
([{
pod_name:
pod_name
}])
...
...
ee/spec/features/projects/environments/environments_spec.rb
View file @
7569a4bd
...
...
@@ -28,6 +28,7 @@ describe 'Environments page', :js do
let!
(
:deployment
)
do
create
(
:deployment
,
:success
,
environment:
environment
,
deployable:
build
,
sha:
project
.
commit
.
id
)
end
...
...
@@ -80,6 +81,7 @@ describe 'Environments page', :js do
let!
(
:deployment
)
do
create
(
:deployment
,
:success
,
environment:
environment
,
deployable:
build
,
sha:
project
.
commit
.
id
)
end
...
...
@@ -110,6 +112,7 @@ describe 'Environments page', :js do
let!
(
:deployment
)
do
create
(
:deployment
,
:success
,
environment:
environment
,
deployable:
build
,
sha:
project
.
commit
.
id
)
end
...
...
@@ -162,6 +165,7 @@ describe 'Environments page', :js do
let!
(
:deployment
)
do
create
(
:deployment
,
:success
,
environment:
environment
,
deployable:
build
,
sha:
project
.
commit
.
id
)
end
...
...
ee/spec/features/projects/environments_pod_logs_spec.rb
View file @
7569a4bd
...
...
@@ -14,7 +14,7 @@ describe 'Environment > Pod Logs', :js do
stub_licensed_features
(
pod_logs:
true
)
create
(
:cluster
,
:provided_by_gcp
,
environment_scope:
'*'
,
projects:
[
project
])
create
(
:deployment
,
environment:
environment
)
create
(
:deployment
,
:success
,
environment:
environment
)
allow_any_instance_of
(
EE
::
KubernetesService
).
to
receive
(
:read_pod_logs
).
with
(
pod_name
).
and_return
(
kube_logs_body
)
allow_any_instance_of
(
EE
::
Environment
).
to
receive
(
:pod_names
).
and_return
(
pod_names
)
...
...
ee/spec/models/ee/environment_spec.rb
View file @
7569a4bd
...
...
@@ -15,7 +15,7 @@ describe Environment do
it
'returns the pod_names'
do
pod_name
=
"pod_1"
create
(
:cluster
,
:provided_by_gcp
,
environment_scope:
'*'
,
projects:
[
project
])
create
(
:deployment
,
environment:
environment
)
create
(
:deployment
,
:success
,
environment:
environment
)
allow_any_instance_of
(
Gitlab
::
Kubernetes
::
RolloutStatus
).
to
receive
(
:instances
)
.
and_return
([{
pod_name:
pod_name
}])
...
...
ee/spec/services/dashboard/operations/list_service_spec.rb
View file @
7569a4bd
...
...
@@ -43,10 +43,10 @@ describe Dashboard::Operations::ListService do
let
(
:staging
)
{
create
(
:environment
,
project:
project
,
name:
'staging'
)
}
let
(
:production_deployment
)
do
create
(
:deployment
,
project:
project
,
environment:
production
,
ref:
'master'
)
create
(
:deployment
,
:success
,
project:
project
,
environment:
production
,
ref:
'master'
)
end
let
(
:staging_deployment
)
do
create
(
:deployment
,
project:
project
,
environment:
staging
,
ref:
'wip'
)
create
(
:deployment
,
:success
,
project:
project
,
environment:
staging
,
ref:
'wip'
)
end
before
do
...
...
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