Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
N
nexpie-grafana-theme
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Registry
Registry
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Kornkitt Poolsup
nexpie-grafana-theme
Commits
0683742e
Commit
0683742e
authored
Jan 16, 2017
by
Torkel Ödegaard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
tech(library upgrade): fixed unit test broken by angularjs upgrade, #7274
parent
6f87f886
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
27 additions
and
4 deletions
+27
-4
public/app/features/templating/specs/variable_srv_init_specs.ts
+3
-0
public/app/plugins/datasource/graphite/specs/query_ctrl_specs.ts
+3
-0
public/app/plugins/datasource/influxdb/specs/query_ctrl_specs.ts
+3
-0
public/app/plugins/datasource/opentsdb/specs/query-ctrl-specs.ts
+4
-0
public/app/plugins/panel/graph/specs/graph_ctrl_specs.ts
+3
-0
public/app/plugins/panel/singlestat/specs/singlestat-specs.ts
+3
-0
public/test/specs/helpers.js
+1
-0
public/test/specs/shareModalCtrl-specs.js
+7
-4
No files found.
public/app/features/templating/specs/variable_srv_init_specs.ts
View file @
0683742e
...
...
@@ -12,6 +12,9 @@ describe('VariableSrv init', function() {
beforeEach
(
angularMocks
.
module
(
'grafana.core'
));
beforeEach
(
angularMocks
.
module
(
'grafana.controllers'
));
beforeEach
(
angularMocks
.
module
(
'grafana.services'
));
beforeEach
(
angularMocks
.
module
(
function
(
$compileProvider
)
{
$compileProvider
.
preAssignBindingsEnabled
(
true
);
}));
beforeEach
(
ctx
.
providePhase
([
'datasourceSrv'
,
'timeSrv'
,
'templateSrv'
,
'$location'
]));
beforeEach
(
angularMocks
.
inject
((
$rootScope
,
$q
,
$location
,
$injector
)
=>
{
...
...
public/app/plugins/datasource/graphite/specs/query_ctrl_specs.ts
View file @
0683742e
...
...
@@ -13,6 +13,9 @@ describe('GraphiteQueryCtrl', function() {
beforeEach
(
angularMocks
.
module
(
'grafana.core'
));
beforeEach
(
angularMocks
.
module
(
'grafana.controllers'
));
beforeEach
(
angularMocks
.
module
(
'grafana.services'
));
beforeEach
(
angularMocks
.
module
(
function
(
$compileProvider
)
{
$compileProvider
.
preAssignBindingsEnabled
(
true
);
}));
beforeEach
(
ctx
.
providePhase
());
beforeEach
(
angularMocks
.
inject
((
$rootScope
,
$controller
,
$q
)
=>
{
...
...
public/app/plugins/datasource/influxdb/specs/query_ctrl_specs.ts
View file @
0683742e
...
...
@@ -10,6 +10,9 @@ describe('InfluxDBQueryCtrl', function() {
beforeEach
(
angularMocks
.
module
(
'grafana.core'
));
beforeEach
(
angularMocks
.
module
(
'grafana.controllers'
));
beforeEach
(
angularMocks
.
module
(
'grafana.services'
));
beforeEach
(
angularMocks
.
module
(
function
(
$compileProvider
)
{
$compileProvider
.
preAssignBindingsEnabled
(
true
);
}));
beforeEach
(
ctx
.
providePhase
());
beforeEach
(
angularMocks
.
inject
((
$rootScope
,
$controller
,
$q
)
=>
{
...
...
public/app/plugins/datasource/opentsdb/specs/query-ctrl-specs.ts
View file @
0683742e
...
...
@@ -7,6 +7,10 @@ describe('OpenTsQueryCtrl', function() {
beforeEach
(
angularMocks
.
module
(
'grafana.core'
));
beforeEach
(
angularMocks
.
module
(
'grafana.services'
));
beforeEach
(
angularMocks
.
module
(
function
(
$compileProvider
)
{
$compileProvider
.
preAssignBindingsEnabled
(
true
);
}));
beforeEach
(
ctx
.
providePhase
([
'backendSrv'
,
'templateSrv'
]));
beforeEach
(
ctx
.
providePhase
());
...
...
public/app/plugins/panel/graph/specs/graph_ctrl_specs.ts
View file @
0683742e
...
...
@@ -12,6 +12,9 @@ describe('GraphCtrl', function() {
beforeEach
(
angularMocks
.
module
(
'grafana.services'
));
beforeEach
(
angularMocks
.
module
(
'grafana.controllers'
));
beforeEach
(
angularMocks
.
module
(
function
(
$compileProvider
)
{
$compileProvider
.
preAssignBindingsEnabled
(
true
);
}));
beforeEach
(
ctx
.
providePhase
());
beforeEach
(
ctx
.
createPanelController
(
GraphCtrl
));
...
...
public/app/plugins/panel/singlestat/specs/singlestat-specs.ts
View file @
0683742e
...
...
@@ -17,6 +17,9 @@ describe('SingleStatCtrl', function() {
beforeEach
(
angularMocks
.
module
(
'grafana.services'
));
beforeEach
(
angularMocks
.
module
(
'grafana.controllers'
));
beforeEach
(
angularMocks
.
module
(
function
(
$compileProvider
)
{
$compileProvider
.
preAssignBindingsEnabled
(
true
);
}));
beforeEach
(
ctx
.
providePhase
());
beforeEach
(
ctx
.
createPanelController
(
SingleStatCtrl
));
...
...
public/test/specs/helpers.js
View file @
0683742e
...
...
@@ -162,6 +162,7 @@ define([
this
.
fillVariableValuesForUrl
=
function
()
{};
this
.
updateTemplateData
=
function
()
{
};
this
.
variableExists
=
function
()
{
return
false
;
};
this
.
variableInitialized
=
function
()
{
};
this
.
highlightVariablesAsHtml
=
function
(
str
)
{
return
str
;
};
this
.
setGrafanaVariable
=
function
(
name
,
value
)
{
this
.
data
[
name
]
=
value
;
...
...
public/test/specs/shareModalCtrl-specs.js
View file @
0683742e
...
...
@@ -16,6 +16,9 @@ define([
beforeEach
(
module
(
'grafana.controllers'
));
beforeEach
(
module
(
'grafana.services'
));
beforeEach
(
module
(
function
(
$compileProvider
)
{
$compileProvider
.
preAssignBindingsEnabled
(
true
);
}));
beforeEach
(
ctx
.
providePhase
());
...
...
@@ -28,7 +31,7 @@ define([
ctx
.
scope
.
panel
=
{
id
:
22
};
ctx
.
scope
.
init
();
expect
(
ctx
.
scope
.
shareUrl
).
to
.
be
(
'http://server/#/test?from=1000&to=2000&panelId=22&fullscreen'
);
expect
(
ctx
.
scope
.
shareUrl
).
to
.
be
(
'http://server/#
!
/test?from=1000&to=2000&panelId=22&fullscreen'
);
});
it
(
'should generate render url'
,
function
()
{
...
...
@@ -48,7 +51,7 @@ define([
ctx
.
scope
.
panel
=
null
;
ctx
.
scope
.
init
();
expect
(
ctx
.
scope
.
shareUrl
).
to
.
be
(
'http://server/#/test?from=1000&to=2000'
);
expect
(
ctx
.
scope
.
shareUrl
).
to
.
be
(
'http://server/#
!
/test?from=1000&to=2000'
);
});
it
(
'should add theme when specified'
,
function
()
{
...
...
@@ -57,7 +60,7 @@ define([
ctx
.
scope
.
panel
=
null
;
ctx
.
scope
.
init
();
expect
(
ctx
.
scope
.
shareUrl
).
to
.
be
(
'http://server/#/test?from=1000&to=2000&theme=light'
);
expect
(
ctx
.
scope
.
shareUrl
).
to
.
be
(
'http://server/#
!
/test?from=1000&to=2000&theme=light'
);
});
it
(
'should include template variables in url'
,
function
()
{
...
...
@@ -70,7 +73,7 @@ define([
};
ctx
.
scope
.
buildUrl
();
expect
(
ctx
.
scope
.
shareUrl
).
to
.
be
(
'http://server/#/test?from=1000&to=2000&var-app=mupp&var-server=srv-01'
);
expect
(
ctx
.
scope
.
shareUrl
).
to
.
be
(
'http://server/#
!
/test?from=1000&to=2000&var-app=mupp&var-server=srv-01'
);
});
});
...
...
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