From d5af3a736e38a1c4a594c5a18ea4e53fb28cf5cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ivar=20Conradi=20=C3=98sthus?= Date: Sun, 4 Feb 2018 22:04:28 +0100 Subject: [PATCH] bugfix(metrics-poller) use size and not length for immutable array --- frontend/src/__tests__/metrics-poller-test.jsx | 7 ++++--- frontend/src/metrics-poller.js | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/frontend/src/__tests__/metrics-poller-test.jsx b/frontend/src/__tests__/metrics-poller-test.jsx index 6a3c7d6e1e..cd652cf5e7 100644 --- a/frontend/src/__tests__/metrics-poller-test.jsx +++ b/frontend/src/__tests__/metrics-poller-test.jsx @@ -1,4 +1,5 @@ import configureStore from 'redux-mock-store'; +import { List } from 'immutable'; import thunkMiddleware from 'redux-thunk'; import fetchMock from 'fetch-mock'; import MetricsPoller from '../metrics-poller'; @@ -12,7 +13,7 @@ describe('metrics-poller.js', () => { }); test('Should not start poller before toggles are recieved', () => { - const initialState = { features: [{ name: 'test1' }] }; + const initialState = { features: List.of([{ name: 'test1' }]) }; const store = mockStore(initialState); fetchMock.getOnce('api/admin/metrics/feature-toggles', { body: { lastHour: {}, lastMinute: {} }, @@ -26,7 +27,7 @@ describe('metrics-poller.js', () => { }); test('Should not start poller when state does not contain toggles', () => { - const initialState = { features: [] }; + const initialState = { features: new List([]) }; const store = mockStore(initialState); const metricsPoller = new MetricsPoller(store); @@ -46,7 +47,7 @@ describe('metrics-poller.js', () => { headers: { 'content-type': 'application/json' }, }); - const initialState = { features: [{ name: 'test1' }] }; + const initialState = { features: List.of([{ name: 'test1' }]) }; const store = mockStore(initialState); const metricsPoller = new MetricsPoller(store); diff --git a/frontend/src/metrics-poller.js b/frontend/src/metrics-poller.js index 3c1c331e2f..0ffce583de 100644 --- a/frontend/src/metrics-poller.js +++ b/frontend/src/metrics-poller.js @@ -9,7 +9,7 @@ class MetricsPoller { start() { this.store.subscribe(() => { const features = this.store.getState().features; - if (!this.timer && features.length > 0) { + if (!this.timer && features.size > 0) { this.timer = setInterval(this.fetchMetrics.bind(this), 5000); this.fetchMetrics(); }