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
0
Merge Requests
0
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
Jérome Perrin
gitlab-ce
Commits
64bb0d37
Commit
64bb0d37
authored
Jun 16, 2017
by
Pawel Chojnacki
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
cleanup wip
parent
b97d5b65
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
6 deletions
+9
-6
spec/controllers/projects/deployments_controller_spec.rb
spec/controllers/projects/deployments_controller_spec.rb
+2
-0
spec/controllers/projects/environments_controller_spec.rb
spec/controllers/projects/environments_controller_spec.rb
+7
-5
spec/javascripts/fixtures/prometheus_service.rb
spec/javascripts/fixtures/prometheus_service.rb
+0
-1
No files found.
spec/controllers/projects/deployments_controller_spec.rb
View file @
64bb0d37
...
@@ -42,6 +42,7 @@ describe Projects::DeploymentsController do
...
@@ -42,6 +42,7 @@ describe Projects::DeploymentsController do
before
do
before
do
allow
(
controller
).
to
receive
(
:deployment
).
and_return
(
deployment
)
allow
(
controller
).
to
receive
(
:deployment
).
and_return
(
deployment
)
end
end
context
'when metrics are disabled'
do
context
'when metrics are disabled'
do
before
do
before
do
allow
(
deployment
).
to
receive
(
:has_metrics?
).
and_return
false
allow
(
deployment
).
to
receive
(
:has_metrics?
).
and_return
false
...
@@ -114,6 +115,7 @@ describe Projects::DeploymentsController do
...
@@ -114,6 +115,7 @@ describe Projects::DeploymentsController do
before
do
before
do
allow
(
controller
).
to
receive
(
:deployment
).
and_return
(
deployment
)
allow
(
controller
).
to
receive
(
:deployment
).
and_return
(
deployment
)
end
end
context
'when metrics are disabled'
do
context
'when metrics are disabled'
do
before
do
before
do
allow
(
deployment
).
to
receive
(
:has_metrics?
).
and_return
false
allow
(
deployment
).
to
receive
(
:has_metrics?
).
and_return
false
...
...
spec/controllers/projects/environments_controller_spec.rb
View file @
64bb0d37
...
@@ -338,11 +338,13 @@ describe Projects::EnvironmentsController do
...
@@ -338,11 +338,13 @@ describe Projects::EnvironmentsController do
context
'when environment has some metrics'
do
context
'when environment has some metrics'
do
before
do
before
do
expect
(
environment
).
to
receive
(
:additional_metrics
).
and_return
({
expect
(
environment
)
success:
true
,
.
to
receive
(
:additional_metrics
)
data:
{},
.
and_return
({
last_update:
42
success:
true
,
})
data:
{},
last_update:
42
})
end
end
it
'returns a metrics JSON document'
do
it
'returns a metrics JSON document'
do
...
...
spec/javascripts/fixtures/prometheus_service.rb
View file @
64bb0d37
...
@@ -8,7 +8,6 @@ describe Projects::ServicesController, '(JavaScript fixtures)', type: :controlle
...
@@ -8,7 +8,6 @@ describe Projects::ServicesController, '(JavaScript fixtures)', type: :controlle
let
(
:project
)
{
create
(
:project_empty_repo
,
namespace:
namespace
,
path:
'services-project'
)
}
let
(
:project
)
{
create
(
:project_empty_repo
,
namespace:
namespace
,
path:
'services-project'
)
}
let!
(
:service
)
{
create
(
:prometheus_service
,
project:
project
)
}
let!
(
:service
)
{
create
(
:prometheus_service
,
project:
project
)
}
render_views
render_views
before
(
:all
)
do
before
(
:all
)
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