From 413d576b2d5019f0e7e3408bee21eb75c6c56a2d Mon Sep 17 00:00:00 2001
From: Gauthier <ext.sopra.glefevre@grandlyon.com>
Date: Thu, 16 Jul 2020 15:13:23 +0200
Subject: [PATCH] last fix
---
src/components/ContainerComponents/Header/Header.tsx | 1 -
test/services/ConsumptionDataManager.spec.ts | 9 +++++++++
test/services/ConsumptionDataValidator.spec.ts | 9 ++++++++-
test/services/QueryRunner.spec.ts | 8 ++++++++
4 files changed, 25 insertions(+), 2 deletions(-)
diff --git a/src/components/ContainerComponents/Header/Header.tsx b/src/components/ContainerComponents/Header/Header.tsx
index 459594cac..748daf599 100644
--- a/src/components/ContainerComponents/Header/Header.tsx
+++ b/src/components/ContainerComponents/Header/Header.tsx
@@ -1,7 +1,6 @@
import React, { useEffect, useRef, useContext } from 'react'
import { translate } from 'cozy-ui/react/I18n'
import { history } from 'components/ContainerComponents/ViewContainer/ViewContainer'
-//import { withClient, Client } from 'cozy-client'
import { ScreenType } from 'enum/screen.enum'
import { AppContext } from 'components/Contexts/AppContextProvider'
import BackArrowIcon from 'assets/icons/ico/back-arrow.svg'
diff --git a/test/services/ConsumptionDataManager.spec.ts b/test/services/ConsumptionDataManager.spec.ts
index c4d4a68cc..c73f13801 100644
--- a/test/services/ConsumptionDataManager.spec.ts
+++ b/test/services/ConsumptionDataManager.spec.ts
@@ -1,5 +1,14 @@
'use strict'
//import ConsumptionDataManager from '../../src/services/consumptionDataManagerService'
+/*import { DateTime } from 'luxon'
+import { TimeStep } from '../../src/services/dataConsumptionContracts'
+
+// client needs to be mocked correctely to test the CDM
+const mockClient = {
+ query: jest.fn(),
+ get: jest.fn(),
+}*/
+
//jest.mock('../../src/services/consumptionDataFormatterService')
describe('Consumption Data Manager', () => {
diff --git a/test/services/ConsumptionDataValidator.spec.ts b/test/services/ConsumptionDataValidator.spec.ts
index 007234066..4dfbe0ed6 100644
--- a/test/services/ConsumptionDataValidator.spec.ts
+++ b/test/services/ConsumptionDataValidator.spec.ts
@@ -18,13 +18,20 @@ consumptionDataValidator.ValidateGetGraphData(
fluidTypes,
compareTimePeriod
)
-*/
+
+ const yearTimeStep = TimeStep.MONTH
+
+ const sumReducer = (acc, dataLoad) => acc + dataLoad.value*/
it('matching fluidTypes and TimeStep', () => {
const timePeriod = {
startDate: DateTime.local(2018, 1, 1),
endDate: DateTime.local(2018, 1, 2),
}
+ /*const compareTimePeriod = {
+ startDate: DateTime.local(2018, 1, 2),
+ endDate: DateTime.local(2018, 1, 3),
+ }*/
expect(
consumptionDataValidator.ValidateGetGraphData(
diff --git a/test/services/QueryRunner.spec.ts b/test/services/QueryRunner.spec.ts
index aa73104ab..132c2849a 100644
--- a/test/services/QueryRunner.spec.ts
+++ b/test/services/QueryRunner.spec.ts
@@ -1,5 +1,13 @@
'use strict'
//import QuerryRunner from '../../src/services/queryRunnerService'
+/*import { DateTime } from 'luxon'
+import { TimeStep } from '../../src/services/dataConsumptionContracts'
+
+// client needs to be mocked correctely to test the CDM
+const mockClient = {
+ query: jest.fn(),
+ get: jest.fn(),
+}*/
describe('Querry Runner', () => {
beforeEach(() => {
--
GitLab