From 9e59c122d55e3b9a6ad117af61e483a0ec3bcc07 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juan=20Juli=C3=A1n=20=28JJ=29=20Merelo?= Date: Mon, 17 Oct 2022 10:21:49 +0200 Subject: [PATCH 1/5] Refactor to call the ctor directly :recycle: --- feature-utils/poly-import/utils/zipfile-mock.js | 10 ++++++++-- .../test/ministory/report-metadata.test.js | 4 ++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/feature-utils/poly-import/utils/zipfile-mock.js b/feature-utils/poly-import/utils/zipfile-mock.js index 6341c2628b..9dda563d96 100644 --- a/feature-utils/poly-import/utils/zipfile-mock.js +++ b/feature-utils/poly-import/utils/zipfile-mock.js @@ -35,12 +35,18 @@ export class ZipFileEntryMock { } export class ZipFileMock { - constructor() { + constructor( + dataFilePairs = [["foo.json", { foo: "bar" }]], + name = "facebook-facebookuser.zip" + ) { this.id = "polypod://de71f571-d90a-45e0-b007-d8f059e0541b"; this.time = new Date("2021-09-20T16:37:36.243Z"); - this.name = "facebook-facebookuser.zip"; + this.name = name; this.size = MINIMUM_FILE_SIZE; this._entriesPathHash = new Map(); + dataFilePairs.forEach(([path, dataset]) => + this.addJsonEntry(path, dataset) + ); } async getEntries() { diff --git a/features/facebookImport/test/ministory/report-metadata.test.js b/features/facebookImport/test/ministory/report-metadata.test.js index 6f56887f05..8d7953892e 100644 --- a/features/facebookImport/test/ministory/report-metadata.test.js +++ b/features/facebookImport/test/ministory/report-metadata.test.js @@ -7,7 +7,7 @@ import ReportMetadataReport from "../../src/views/ministories/reportMetadata"; import { createInteractedWithAdvertisersDataset } from "../datasets/interacted-with-advertisers-data"; import { createLanguageSettingsData } from "../datasets/language-and-locale-data"; import { createOffFacebookEventsSimpleData } from "../datasets/off-facebook-events-data"; -import { MINIMUM_FILE_SIZE } from "@polypoly-eu/poly-import"; +import { MINIMUM_FILE_SIZE, ZipFileMock } from "@polypoly-eu/poly-import"; import { runAnalysisForExport } from "../utils/analyses-execution"; import { expectActiveAnalysis, @@ -26,7 +26,7 @@ describe("Report metadata analysis", () => { let jsonReport = null; beforeAll(async () => { - const zipFile = createMockedZip([ + const zipFile = new ZipFileMock([ [ OFF_FACEBOOK_EVENTS_FILE_PATH, createOffFacebookEventsSimpleData(), From 62604068e623faf462f5dcf865daf7eae0143274 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juan=20Juli=C3=A1n=20=28JJ=29=20Merelo?= Date: Mon, 17 Oct 2022 10:25:30 +0200 Subject: [PATCH 2/5] :recycle: also in this case --- .../test/ministory/json-file-names-analysis.test.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/features/facebookImport/test/ministory/json-file-names-analysis.test.js b/features/facebookImport/test/ministory/json-file-names-analysis.test.js index e738751cad..ebe09209b2 100644 --- a/features/facebookImport/test/ministory/json-file-names-analysis.test.js +++ b/features/facebookImport/test/ministory/json-file-names-analysis.test.js @@ -11,12 +11,13 @@ const commonJsonFiles = commonStructure }); async function analyzeZipWithFiles(files) { - const zipFile = new ZipFileMock(); + let dataFilePairs = []; if (files.length > 0) { files.forEach((jsonPath) => { - zipFile.addJsonEntry(jsonPath, { foo: "bar" }); + dataFilePairs.push([jsonPath, { foo: "bar" }]); }); } + const zipFile = new ZipFileMock(dataFilePairs); const { analysisResult } = await runAnalysisForExport( JSONFileNamesAnalysis, zipFile From 20095c9f4e0251fb138306ba6b5739904510de44 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juan=20Juli=C3=A1n=20=28JJ=29=20Merelo?= Date: Mon, 17 Oct 2022 10:29:53 +0200 Subject: [PATCH 3/5] :rotating_light: --- features/facebookImport/test/ministory/report-metadata.test.js | 1 - 1 file changed, 1 deletion(-) diff --git a/features/facebookImport/test/ministory/report-metadata.test.js b/features/facebookImport/test/ministory/report-metadata.test.js index 8d7953892e..f82f9489f4 100644 --- a/features/facebookImport/test/ministory/report-metadata.test.js +++ b/features/facebookImport/test/ministory/report-metadata.test.js @@ -13,7 +13,6 @@ import { expectActiveAnalysis, expectAnalysisSuccessStatus, } from "../utils/analysis-assertions"; -import { createMockedZip } from "../utils/data-creation"; describe("Report metadata analysis", () => { const preferedLanguage = { From aa76a495eddbdda1702fe88e5ad3529d3e3aa8da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juan=20Juli=C3=A1n=20=28JJ=29=20Merelo?= Date: Tue, 18 Oct 2022 08:47:30 +0200 Subject: [PATCH 4/5] Address comments --- .../test/ministory/json-file-names-analysis.test.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/features/facebookImport/test/ministory/json-file-names-analysis.test.js b/features/facebookImport/test/ministory/json-file-names-analysis.test.js index ebe09209b2..26b4065dd7 100644 --- a/features/facebookImport/test/ministory/json-file-names-analysis.test.js +++ b/features/facebookImport/test/ministory/json-file-names-analysis.test.js @@ -11,7 +11,7 @@ const commonJsonFiles = commonStructure }); async function analyzeZipWithFiles(files) { - let dataFilePairs = []; + const dataFilePairs = []; if (files.length > 0) { files.forEach((jsonPath) => { dataFilePairs.push([jsonPath, { foo: "bar" }]); From f7c9dfdf5033e92247879b4a371e1133adcb7579 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juan=20Juli=C3=A1n=20=28JJ=29=20Merelo?= Date: Tue, 18 Oct 2022 08:52:25 +0200 Subject: [PATCH 5/5] :recycle: temporarily, should be eventually removed... It's not needed with the new constructor, only it's all over... --- features/facebookImport/test/utils/data-creation.js | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/features/facebookImport/test/utils/data-creation.js b/features/facebookImport/test/utils/data-creation.js index df4b12e9c6..76cb79b90f 100644 --- a/features/facebookImport/test/utils/data-creation.js +++ b/features/facebookImport/test/utils/data-creation.js @@ -1,9 +1,7 @@ import { ZipFileMock } from "@polypoly-eu/poly-import"; export function createMockedZip(datasets) { - let zipFile = new ZipFileMock(); - datasets.forEach(([path, dataset]) => zipFile.addJsonEntry(path, dataset)); - return zipFile; + return new ZipFileMock(datasets); } export function zipWithWrongDatasetKey(filePath) {