From 9cca522c43750e9c8c2ec15ee4c49c014d7de888 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fredrik=20Adel=C3=B6w?= Date: Fri, 13 Mar 2020 08:39:49 +0100 Subject: [PATCH] Fix progess test --- packages/core/src/components/CircleProgress.js | 4 ++-- packages/core/src/components/CircleProgress.test.js | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/core/src/components/CircleProgress.js b/packages/core/src/components/CircleProgress.js index 2c3ce533c9..f11f9d193b 100644 --- a/packages/core/src/components/CircleProgress.js +++ b/packages/core/src/components/CircleProgress.js @@ -18,7 +18,7 @@ import React, { Component } from 'react'; import PropTypes from 'prop-types'; import { withStyles } from '@material-ui/core'; import { Circle } from 'rc-progress'; -import { COLORS } from '../theme/BackstageTheme'; +import { COLORS, V1 } from '../theme/BackstageTheme'; const styles = theme => ({ root: { @@ -59,7 +59,7 @@ class CircleProgress extends Component { static getProgressColor(value, inverse, max /* , classes */) { if (isNaN(value)) { - return 'grey'; + return V1.palette.textVerySubtle; } const actualMax = max ? max : CircleProgress.defaultProps.max; diff --git a/packages/core/src/components/CircleProgress.test.js b/packages/core/src/components/CircleProgress.test.js index e97105d28a..05e175fe1e 100644 --- a/packages/core/src/components/CircleProgress.test.js +++ b/packages/core/src/components/CircleProgress.test.js @@ -56,6 +56,7 @@ describe('', () => { expect(CircleProgress.getProgressColor(50)).toBe(COLORS.STATUS.WARNING); expect(CircleProgress.getProgressColor(90)).toBe(COLORS.STATUS.OK); }); + it('colors the inverse progress correct', () => { expect(CircleProgress.getProgressColor()).toBe(V1.palette.textVerySubtle); expect(CircleProgress.getProgressColor(10, true)).toBe(COLORS.STATUS.OK);