summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsyasonik <syasonik@gitlab.com>2019-04-08 23:58:42 +0800
committersyasonik <syasonik@gitlab.com>2019-04-08 23:58:42 +0800
commita0ac8c25f0c153da5fa7125cbcba2670beb8fa1b (patch)
tree27f6c7e40125666e87609ccc88bb9ca31fe9cea5
parentc0e342c192e8285bb224df596c7243c44609b764 (diff)
downloadgitlab-ce-60162-fix-time-windows.tar.gz
Fix static analysis and false positive test60162-fix-time-windows
-rw-r--r--spec/javascripts/monitoring/utils_spec.js8
1 files changed, 6 insertions, 2 deletions
diff --git a/spec/javascripts/monitoring/utils_spec.js b/spec/javascripts/monitoring/utils_spec.js
index 688dced6d89..e3c455d1686 100644
--- a/spec/javascripts/monitoring/utils_spec.js
+++ b/spec/javascripts/monitoring/utils_spec.js
@@ -15,10 +15,14 @@ describe('getTimeDiff', () => {
});
it('returns a value for every defined time window', () => {
- Object.keys(timeWindows).forEach(window => {
- const params = getTimeDiff(timeWindows.window);
+ const nonDefaultWindows = Object.keys(timeWindows).filter(window => window !== 'eightHours');
+
+ nonDefaultWindows.forEach(window => {
+ const params = getTimeDiff(timeWindows[window]);
const diff = params.end - params.start;
+ // Ensure we're not returning the default, 28800 (the # of seconds in 8 hrs)
+ expect(diff).not.toEqual(28800);
expect(typeof diff).toEqual('number');
});
});