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
be5f6655
Commit
be5f6655
authored
Jun 16, 2017
by
Pawel Chojnacki
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix prometheus service frontend fixture
parent
9f2c992f
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
spec/javascripts/fixtures/prometheus_service.rb
spec/javascripts/fixtures/prometheus_service.rb
+2
-2
spec/javascripts/prometheus_metrics/prometheus_metrics_spec.js
...javascripts/prometheus_metrics/prometheus_metrics_spec.js
+1
-1
No files found.
spec/javascripts/fixtures/prometheus_service.rb
View file @
be5f6655
...
@@ -11,14 +11,14 @@ describe Projects::ServicesController, '(JavaScript fixtures)', type: :controlle
...
@@ -11,14 +11,14 @@ describe Projects::ServicesController, '(JavaScript fixtures)', type: :controlle
render_views
render_views
before
(
:all
)
do
before
(
:all
)
do
clean_frontend_fixtures
(
'services/'
)
clean_frontend_fixtures
(
'services/
prometheus
'
)
end
end
before
(
:each
)
do
before
(
:each
)
do
sign_in
(
admin
)
sign_in
(
admin
)
end
end
it
'services/prometheus_service.html.raw'
do
|
example
|
it
'services/prometheus
/prometheus
_service.html.raw'
do
|
example
|
get
:edit
,
get
:edit
,
namespace_id:
namespace
,
namespace_id:
namespace
,
project_id:
project
,
project_id:
project
,
...
...
spec/javascripts/prometheus_metrics/prometheus_metrics_spec.js
View file @
be5f6655
...
@@ -3,7 +3,7 @@ import PANEL_STATE from '~/prometheus_metrics/constants';
...
@@ -3,7 +3,7 @@ import PANEL_STATE from '~/prometheus_metrics/constants';
import
{
metrics
,
missingVarMetrics
}
from
'
./mock_data
'
;
import
{
metrics
,
missingVarMetrics
}
from
'
./mock_data
'
;
describe
(
'
PrometheusMetrics
'
,
()
=>
{
describe
(
'
PrometheusMetrics
'
,
()
=>
{
const
FIXTURE
=
'
services/prometheus_service.html.raw
'
;
const
FIXTURE
=
'
services/prometheus
/prometheus
_service.html.raw
'
;
preloadFixtures
(
FIXTURE
);
preloadFixtures
(
FIXTURE
);
beforeEach
(()
=>
{
beforeEach
(()
=>
{
...
...
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