From abb3bbc868370f156eb08d014fe6d7470b50a660 Mon Sep 17 00:00:00 2001 From: Sanne Raymaekers Date: Tue, 10 Nov 2020 10:51:36 +0100 Subject: [PATCH] test: Make sure the status of a compose is called status This was a bit confusing because in the inline documentation, I wrote that a compose used state as a key. However this changed to status pretty early on and I forgot to update it. Also use an actual uuid with proper length. --- .eslintrc.yml | 2 +- src/SmartComponents/redux/reducers.js | 4 ++-- src/test/SmartComponents/redux/actions.test.js | 4 ++-- src/test/SmartComponents/redux/reducers.test.js | 7 ++++--- 4 files changed, 9 insertions(+), 8 deletions(-) diff --git a/.eslintrc.yml b/.eslintrc.yml index 171eae92..7fff977d 100644 --- a/.eslintrc.yml +++ b/.eslintrc.yml @@ -49,7 +49,7 @@ rules: - error - 4 - SwitchCase: 1 - MemberExpression: 0 + MemberExpression: 1 ImportDeclaration: 1 ObjectExpression: 1 react/jsx-curly-spacing: diff --git a/src/SmartComponents/redux/reducers.js b/src/SmartComponents/redux/reducers.js index 53f3fb9e..d93ce11b 100644 --- a/src/SmartComponents/redux/reducers.js +++ b/src/SmartComponents/redux/reducers.js @@ -2,8 +2,8 @@ import types from './types'; // Example of action.compose // { -// "xxxx-xxxx-xxxx-xxxx": { -// state: "uploading", +// "77e4c693-0497-4b85-936d-b2a3ad69571b": { +// status: "uploading", // distribution: "fedora-31", // architecture: "x86_64", // image_type: "qcow2" diff --git a/src/test/SmartComponents/redux/actions.test.js b/src/test/SmartComponents/redux/actions.test.js index f4502881..c16b2e22 100644 --- a/src/test/SmartComponents/redux/actions.test.js +++ b/src/test/SmartComponents/redux/actions.test.js @@ -2,8 +2,8 @@ import actions from '../../../SmartComponents/redux/actions'; import types from '../../../SmartComponents/redux/types'; const compose = { - 'xxxx-xxxx-xxxx-xxxx': { - state: 'uploading', + '77e4c693-0497-4b85-936d-b2a3ad69571b': { + status: 'uploading', distribution: 'fedora-31', architecture: 'x86_64', image_type: 'qcow2' diff --git a/src/test/SmartComponents/redux/reducers.test.js b/src/test/SmartComponents/redux/reducers.test.js index 16756841..325ec9a8 100644 --- a/src/test/SmartComponents/redux/reducers.test.js +++ b/src/test/SmartComponents/redux/reducers.test.js @@ -2,8 +2,8 @@ import { composeReducer } from '../../../SmartComponents/redux/reducers'; import types from '../../../SmartComponents/redux/types'; const compose = { - 'xxxx-xxxx-xxxx-xxxx': { - state: 'uploading', + '77e4c693-0497-4b85-936d-b2a3ad69571b': { + status: 'uploading', distribution: 'fedora-31', architecture: 'x86_64', image_type: 'qcow2' @@ -29,6 +29,7 @@ describe('composeReducer', () => { }); expect(result.testAttr).toBe('test-me'); - expect(result['xxxx-xxxx-xxxx-xxxx']).toEqual(compose['xxxx-xxxx-xxxx-xxxx']); + expect(result['77e4c693-0497-4b85-936d-b2a3ad69571b']) + .toEqual(compose['77e4c693-0497-4b85-936d-b2a3ad69571b']); }); });