From 2f90f38e7e0fc37019f49bdb65626a6c9227decd Mon Sep 17 00:00:00 2001 From: Lawrence Owen Date: Tue, 3 Sep 2024 15:56:30 +1000 Subject: [PATCH] Fix lint warnings in Spec files - remove unneeded console.logs --- test/Core/markdownToHtmlSpec.ts | 6 ---- test/ModelMixins/TileErrorHandlerMixinSpec.ts | 14 +++++--- .../YDYRCatalogFunctionSpec.ts | 2 +- test/Models/Catalog/CatalogGroupSpec.ts | 3 -- .../OpenDataSoftCatalogGroupSpec.ts | 1 - .../CatalogGroups/ThreddsCatalogGroupSpec.ts | 4 --- .../CatalogItems/ApiTableCatalogItemSpec.ts | 2 -- .../Cesium3DTilesCatalogItemSpec.ts | 2 +- .../CatalogItems/GeoJsonCatalogItemSpec.ts | 6 ++-- ...SensorObservationServiceCatalogItemSpec.ts | 2 +- .../Catalog/Ckan/CkanCatalogGroupSpec.ts | 1 - .../Catalog/Ckan/CkanItemReferenceSpec.ts | 17 +-------- .../Ows/WebMapServiceCatalogItemSpec.ts | 5 +-- ...WebProcessingServiceCatalogFunctionSpec.ts | 6 ++-- test/Models/Catalog/allCatalogModelsSpec.ts | 2 +- .../esri/ArcGisImageServerCatalogItemSpec.ts | 3 -- .../esri/ArcGisPortalReferenceItemSpec.ts | 9 +---- test/Models/Experiment.ts | 2 +- .../MapNavigation/MapNavigationModelSpec.ts | 6 ---- .../BingMapsSearchProviderSpec.ts | 4 +-- .../CesiumIonSearchProviderSpec.ts | 1 - test/Models/TerriaSpec.ts | 22 +++++++----- .../parseCustomMarkdownToReactTsSpec.ts | 6 ---- .../Custom/Chart/BottomDockChartSpec.tsx | 36 +++++++++---------- .../Custom/Chart/ChartCustomComponentSpec.tsx | 5 +-- .../DimensionSelectorSectionSpec.tsx | 8 ++--- .../Map/Panels/LangPanel/LangPanelSpec.tsx | 7 ---- .../Tools/ItemSearchTool/SearchFormSpec.tsx | 2 +- .../ItemSearchTool/SearchResultsSpec.tsx | 3 +- .../Workbench/Controls/LegendSpec.tsx | 4 +-- 30 files changed, 67 insertions(+), 124 deletions(-) diff --git a/test/Core/markdownToHtmlSpec.ts b/test/Core/markdownToHtmlSpec.ts index 57d03723a42..4050bf8adcd 100644 --- a/test/Core/markdownToHtmlSpec.ts +++ b/test/Core/markdownToHtmlSpec.ts @@ -1,15 +1,9 @@ import registerCustomComponentTypes from "../../lib/ReactViews/Custom/registerCustomComponentTypes"; import markdownToHtml from "../../lib/Core/markdownToHtml"; -import Terria from "../../lib/Models/Terria"; import CustomComponent from "../../lib/ReactViews/Custom/CustomComponent"; describe("markdownToHtml", function () { - let terria: Terria; - beforeEach(function () { - terria = new Terria({ - baseUrl: "./" - }); registerCustomComponentTypes(); }); it("correctly injects terria's custom tooltips", function () { diff --git a/test/ModelMixins/TileErrorHandlerMixinSpec.ts b/test/ModelMixins/TileErrorHandlerMixinSpec.ts index 93ecc5525ff..58f3be67c66 100644 --- a/test/ModelMixins/TileErrorHandlerMixinSpec.ts +++ b/test/ModelMixins/TileErrorHandlerMixinSpec.ts @@ -62,7 +62,10 @@ describe("TileErrorHandlerMixin", function () { let item: TestCatalogItem; let imageryProvider: ImageryProvider; - const newError = (statusCode: number | undefined, timesRetried = 0) => { + const newError = ( + statusCode: number | undefined, + timesRetried = 0 + ): TileProviderError => { const httpError = new RequestErrorEvent(statusCode) as any as Error; return new TileProviderError( imageryProvider, @@ -210,9 +213,12 @@ describe("TileErrorHandlerMixin", function () { it("fails with bad image error if the error defines a target element", async function () { try { - const tileProviderError = newError(undefined); - // @ts-expect-error - tileProviderError.error = { ...tileProviderError.error, target: {} }; + const tileProviderError: TileProviderError = newError(undefined); + + tileProviderError.error = { + ...tileProviderError.error, + target: {} + } as Error; await onTileLoadError(item, tileProviderError); } catch { /* eslint-disable-line no-empty */ diff --git a/test/Models/Catalog/CatalogFunctions/YDYRCatalogFunctionSpec.ts b/test/Models/Catalog/CatalogFunctions/YDYRCatalogFunctionSpec.ts index 5aad831de83..6a346d7f737 100644 --- a/test/Models/Catalog/CatalogFunctions/YDYRCatalogFunctionSpec.ts +++ b/test/Models/Catalog/CatalogFunctions/YDYRCatalogFunctionSpec.ts @@ -92,7 +92,7 @@ describe("YDYRCatalogFunction", function () { }); // A few reactions will happen, while setting default values for functionParameters - await new Promise((resolve, reject) => { + await new Promise((resolve) => { reaction( () => ydyr.functionParameters, () => { diff --git a/test/Models/Catalog/CatalogGroupSpec.ts b/test/Models/Catalog/CatalogGroupSpec.ts index 08c2db64ece..4c473886baf 100644 --- a/test/Models/Catalog/CatalogGroupSpec.ts +++ b/test/Models/Catalog/CatalogGroupSpec.ts @@ -7,7 +7,6 @@ import StubCatalogItem from "../../../lib/Models/Catalog/CatalogItems/StubCatalo import CatalogMemberFactory from "../../../lib/Models/Catalog/CatalogMemberFactory"; import SplitItemReference from "../../../lib/Models/Catalog/CatalogReferences/SplitItemReference"; import WebMapServiceCatalogItem from "../../../lib/Models/Catalog/Ows/WebMapServiceCatalogItem"; -import { getUniqueStubName } from "../../../lib/Models/Catalog/createStubCatalogItem"; import CommonStrata from "../../../lib/Models/Definition/CommonStrata"; import upsertModelFromJson from "../../../lib/Models/Definition/upsertModelFromJson"; import Terria from "../../../lib/Models/Terria"; @@ -74,7 +73,6 @@ describe("CatalogGroup", function () { const item = terria.getModelById(CatalogGroup, "mama") as CatalogGroup; const child1 = terria.getModelById(CatalogGroup, "child1") as CatalogGroup; - const child2 = terria.getModelById(CatalogGroup, "child2") as CatalogGroup; expect(item).toBeDefined(); expect(item.type).toBe("group"); expect(item.members).toEqual(["child1", "child2", "child3"]); @@ -138,7 +136,6 @@ describe("CatalogGroup", function () { expect(invalidType).toBeDefined(); expect(noType).toBeDefined(); expect(nothingness).toBeDefined(); - const stubName = getUniqueStubName(terria); if ( member0 !== undefined && member1 !== undefined && diff --git a/test/Models/Catalog/CatalogGroups/OpenDataSoftCatalogGroupSpec.ts b/test/Models/Catalog/CatalogGroups/OpenDataSoftCatalogGroupSpec.ts index 93f2fe70f68..5dc0aa03af4 100644 --- a/test/Models/Catalog/CatalogGroups/OpenDataSoftCatalogGroupSpec.ts +++ b/test/Models/Catalog/CatalogGroups/OpenDataSoftCatalogGroupSpec.ts @@ -34,7 +34,6 @@ describe("OpenDataSoftCatalogGroup", function () { }); afterEach(function () { - console.log(fetchMock.calls()); fetchMock.restore(); }); diff --git a/test/Models/Catalog/CatalogGroups/ThreddsCatalogGroupSpec.ts b/test/Models/Catalog/CatalogGroups/ThreddsCatalogGroupSpec.ts index 3608c265b61..31768328f3b 100644 --- a/test/Models/Catalog/CatalogGroups/ThreddsCatalogGroupSpec.ts +++ b/test/Models/Catalog/CatalogGroups/ThreddsCatalogGroupSpec.ts @@ -15,7 +15,6 @@ configure({ describe("ThreddsCatalogGroup", function () { let terria: Terria; let threddsCatalogGroup: ThreddsCatalogGroup; - let threddsStratum: ThreddsStratum; beforeEach(async function () { terria = new Terria({ @@ -26,9 +25,6 @@ describe("ThreddsCatalogGroup", function () { threddsCatalogGroup.setTrait("definition", "url", url); await threddsCatalogGroup.loadMembers(); - threddsStratum = threddsCatalogGroup.strata.get( - ThreddsStratum.stratumName - ) as ThreddsStratum; }); it("has a type and typeName", function () { diff --git a/test/Models/Catalog/CatalogItems/ApiTableCatalogItemSpec.ts b/test/Models/Catalog/CatalogItems/ApiTableCatalogItemSpec.ts index f5c3e130e32..d7c5a1f682e 100644 --- a/test/Models/Catalog/CatalogItems/ApiTableCatalogItemSpec.ts +++ b/test/Models/Catalog/CatalogItems/ApiTableCatalogItemSpec.ts @@ -31,8 +31,6 @@ describe("ApiTableCatalogItem", function () { }); it("creates a table from api calls", async function () { - const valueApiIdx = 0; - const positionApiIdx = 1; runInAction(() => { updateModelFromJson(apiCatalogItem, CommonStrata.definition, { idKey: "id", diff --git a/test/Models/Catalog/CatalogItems/Cesium3DTilesCatalogItemSpec.ts b/test/Models/Catalog/CatalogItems/Cesium3DTilesCatalogItemSpec.ts index 4a879123791..5e39179b1cb 100644 --- a/test/Models/Catalog/CatalogItems/Cesium3DTilesCatalogItemSpec.ts +++ b/test/Models/Catalog/CatalogItems/Cesium3DTilesCatalogItemSpec.ts @@ -340,7 +340,7 @@ describe("Cesium3DTilesCatalogItemSpec", function () { "color" ]); item.setFeatureVisibility(feature, false); - // @ts-expect-error + // @ts-expect-error JsonValue expect(item.style.show.conditions).toEqual([ ['${color} === "red" && ${doorNumber} === 10', false], ["true", true] // fallback rule diff --git a/test/Models/Catalog/CatalogItems/GeoJsonCatalogItemSpec.ts b/test/Models/Catalog/CatalogItems/GeoJsonCatalogItemSpec.ts index 8ae0bc472ca..bf5edb5f51b 100644 --- a/test/Models/Catalog/CatalogItems/GeoJsonCatalogItemSpec.ts +++ b/test/Models/Catalog/CatalogItems/GeoJsonCatalogItemSpec.ts @@ -73,12 +73,12 @@ describe("GeoJsonCatalogItemSpec", () => { type: "Polygon", coordinates: [ [ - [144.80667114257812, -32.96258644191746], + [144.806671142578125, -32.96258644191746], [145.008544921875, -33.19273094190691], [145.557861328125, -32.659031913817685], - [145.04287719726562, -32.375322284319346], + [145.042877197265625, -32.375322284319346], [144.7998046875, -32.96719522935591], - [144.80667114257812, -32.96258644191746] + [144.806671142578125, -32.96258644191746] ] ] } diff --git a/test/Models/Catalog/CatalogItems/SensorObservationServiceCatalogItemSpec.ts b/test/Models/Catalog/CatalogItems/SensorObservationServiceCatalogItemSpec.ts index 6e641df2606..3399b6c45f7 100644 --- a/test/Models/Catalog/CatalogItems/SensorObservationServiceCatalogItemSpec.ts +++ b/test/Models/Catalog/CatalogItems/SensorObservationServiceCatalogItemSpec.ts @@ -21,7 +21,7 @@ describe("SensorObservationServiceCatalogItem", function () { beforeEach(function () { jasmine.Ajax.install(); jasmine.Ajax.addCustomParamParser({ - // @ts-expect-error + // @ts-expect-error mock xhr object test: (xhr) => /^application\/soap\+xml/.test(xhr.contentType()), parse: (paramString) => paramString }); diff --git a/test/Models/Catalog/Ckan/CkanCatalogGroupSpec.ts b/test/Models/Catalog/Ckan/CkanCatalogGroupSpec.ts index a3f22dd32fe..1ece1d358de 100644 --- a/test/Models/Catalog/Ckan/CkanCatalogGroupSpec.ts +++ b/test/Models/Catalog/Ckan/CkanCatalogGroupSpec.ts @@ -29,7 +29,6 @@ interface ExtendedLoadWithXhr { const loadWithXhr: ExtendedLoadWithXhr = _loadWithXhr as any; describe("CkanCatalogGroup", function () { - const ckanServerUrl = "http://data.gov.au"; let terria: Terria; let ckanCatalogGroup: CkanCatalogGroup; let ckanServerStratum: CkanServerStratum; diff --git a/test/Models/Catalog/Ckan/CkanItemReferenceSpec.ts b/test/Models/Catalog/Ckan/CkanItemReferenceSpec.ts index f15fca0d4cd..9b5b45c132d 100644 --- a/test/Models/Catalog/Ckan/CkanItemReferenceSpec.ts +++ b/test/Models/Catalog/Ckan/CkanItemReferenceSpec.ts @@ -1,8 +1,6 @@ import i18next from "i18next"; import { runInAction } from "mobx"; -import CkanItemReference, { - CkanDatasetStratum -} from "../../../../lib/Models/Catalog/Ckan/CkanItemReference"; +import CkanItemReference from "../../../../lib/Models/Catalog/Ckan/CkanItemReference"; import WebMapServiceCatalogItem from "../../../../lib/Models/Catalog/Ows/WebMapServiceCatalogItem"; import Terria from "../../../../lib/Models/Terria"; import WebMapServiceCatalogGroup from "../../../../lib/Models/Catalog/Ows/WebMapServiceCatalogGroup"; @@ -15,7 +13,6 @@ const wmsNoLayerResource = require("../../../../wwwroot/test/CKAN/wms-no-layer-r describe("CkanItemReference", function () { let terria: Terria; let ckanItemReference: CkanItemReference; - let ckanDatasetStratum: CkanDatasetStratum; let ckanItemTarget: any; beforeEach(async function () { @@ -75,9 +72,6 @@ describe("CkanItemReference", function () { ); }); (await ckanItemReference.loadReference()).throwIfError(); - ckanDatasetStratum = ckanItemReference.strata.get( - CkanDatasetStratum.stratumName - ) as CkanDatasetStratum; ckanItemTarget = ckanItemReference.target; }); @@ -161,9 +155,6 @@ describe("CkanItemReference", function () { "tax-stats-wms-resource" ); await ckanItemReference.loadReference(); - ckanDatasetStratum = ckanItemReference.strata.get( - CkanDatasetStratum.stratumName - ) as CkanDatasetStratum; ckanItemTarget = ckanItemReference.target; expect(ckanItemReference._ckanResource).toBeDefined(); @@ -191,9 +182,6 @@ describe("CkanItemReference", function () { "wms-no-layers-resource" ); await ckanItemReference.loadReference(); - ckanDatasetStratum = ckanItemReference.strata.get( - CkanDatasetStratum.stratumName - ) as CkanDatasetStratum; ckanItemTarget = ckanItemReference.target; expect(ckanItemReference._ckanResource).toBeDefined(); @@ -229,9 +217,6 @@ describe("CkanItemReference", function () { ); }); await ckanItemReference.loadReference(); - ckanDatasetStratum = ckanItemReference.strata.get( - CkanDatasetStratum.stratumName - ) as CkanDatasetStratum; ckanItemTarget = ckanItemReference.target; }); it("uses LAYERS from url query string for WMS item", function () { diff --git a/test/Models/Catalog/Ows/WebMapServiceCatalogItemSpec.ts b/test/Models/Catalog/Ows/WebMapServiceCatalogItemSpec.ts index ad896a1f5b9..e748448a353 100644 --- a/test/Models/Catalog/Ows/WebMapServiceCatalogItemSpec.ts +++ b/test/Models/Catalog/Ows/WebMapServiceCatalogItemSpec.ts @@ -460,8 +460,9 @@ describe("WebMapServiceCatalogItem", function () { }); try { await wms.loadMetadata(); - //@ts-expect-error - expect(mapItems[0].imageryProvider.layers).toBe("landsat_barest_earth"); + expect( + (mapItems[0].imageryProvider as WebMapServiceImageryProvider).layers + ).toBe("landsat_barest_earth"); } finally { cleanup(); } diff --git a/test/Models/Catalog/Ows/WebProcessingServiceCatalogFunctionSpec.ts b/test/Models/Catalog/Ows/WebProcessingServiceCatalogFunctionSpec.ts index 55c3d9208a4..97ca0406afb 100644 --- a/test/Models/Catalog/Ows/WebProcessingServiceCatalogFunctionSpec.ts +++ b/test/Models/Catalog/Ows/WebProcessingServiceCatalogFunctionSpec.ts @@ -148,7 +148,7 @@ describe("WebProcessingServiceCatalogFunction", function () { let dispose: any; job = (await wps.submitJob()) as WebProcessingServiceCatalogFunctionJob; - await new Promise((resolve, reject) => { + await new Promise((resolve, _reject) => { dispose = reaction( () => job.downloadedResults, () => { @@ -220,7 +220,7 @@ describe("WebProcessingServiceCatalogFunction", function () { let dispose2: any; // Wait for job to finish polling, then check if finished - await new Promise((resolve, reject) => { + await new Promise((resolve, _reject) => { dispose2 = reaction( () => job.refreshEnabled, () => { @@ -307,7 +307,7 @@ describe("WebProcessingServiceCatalogFunction", function () { let dispose2: any; // Wait for job to finish polling, then check if failed - await new Promise((resolve, reject) => { + await new Promise((resolve, _reject) => { dispose2 = reaction( () => job.refreshEnabled, () => { diff --git a/test/Models/Catalog/allCatalogModelsSpec.ts b/test/Models/Catalog/allCatalogModelsSpec.ts index c676620df9d..addf1abf5a9 100644 --- a/test/Models/Catalog/allCatalogModelsSpec.ts +++ b/test/Models/Catalog/allCatalogModelsSpec.ts @@ -48,7 +48,7 @@ describe("All Catalog models", () => { // The only correct way to provide a legend is through legendOwnerTraits. models .filter( - ([modelName, model]) => !hasTraits(model, LegendOwnerTraits, "legends") + ([_modelName, model]) => !hasTraits(model, LegendOwnerTraits, "legends") ) .forEach(([modelName, model]) => { expect((model as any).legends).toBeUndefined( diff --git a/test/Models/Catalog/esri/ArcGisImageServerCatalogItemSpec.ts b/test/Models/Catalog/esri/ArcGisImageServerCatalogItemSpec.ts index f8c8a9dde78..55b7ba2870c 100644 --- a/test/Models/Catalog/esri/ArcGisImageServerCatalogItemSpec.ts +++ b/test/Models/Catalog/esri/ArcGisImageServerCatalogItemSpec.ts @@ -150,19 +150,16 @@ describe("ArcGisImageServer", function () { it("adds the token to subsequent requests", async function () { await imageServerItem.loadMapItems(); - console.log(spyOnLoad.calls); const tokenre = /token=fakeToken/; expect(tokenre.test(spyOnLoad.calls.argsFor(1)[0])).toBeTruthy(); expect(tokenre.test(spyOnLoad.calls.argsFor(2)[0])).toBeTruthy(); }); it("passes the token to the imageryProvider", async function () { - console.log(imageServerItem); await imageServerItem.loadMapItems(); const imageryProvider = imageServerItem.mapItems[0] .imageryProvider as ArcGisImageServerImageryProvider; - console.log(imageryProvider.baseResource); expect(imageryProvider.baseResource.queryParameters.token).toBe( "fakeToken" ); diff --git a/test/Models/Catalog/esri/ArcGisPortalReferenceItemSpec.ts b/test/Models/Catalog/esri/ArcGisPortalReferenceItemSpec.ts index 20358256b0a..fe5528b615b 100644 --- a/test/Models/Catalog/esri/ArcGisPortalReferenceItemSpec.ts +++ b/test/Models/Catalog/esri/ArcGisPortalReferenceItemSpec.ts @@ -4,9 +4,7 @@ import Terria from "../../../../lib/Models/Terria"; import registerCatalogMembers from "../../../../lib/Models/Catalog/registerCatalogMembers"; import i18next from "i18next"; -import ArcGisPortalItemReference, { - ArcGisPortalItemStratum -} from "../../../../lib/Models/Catalog/Esri/ArcGisPortalItemReference"; +import ArcGisPortalItemReference from "../../../../lib/Models/Catalog/Esri/ArcGisPortalItemReference"; import ArcGisFeatureServerCatalogItem from "../../../../lib/Models/Catalog/Esri/ArcGisFeatureServerCatalogItem"; configure({ @@ -24,7 +22,6 @@ const loadWithXhr: ExtendedLoadWithXhr = _loadWithXhr as any; describe("ArcGisPortalItemReference", function () { let terria: Terria; let arcGisPortalItemReference: ArcGisPortalItemReference; - let arcGisPortalItemStratum: ArcGisPortalItemStratum; let portalItemTarget: any; beforeEach(async function () { @@ -75,10 +72,6 @@ describe("ArcGisPortalItemReference", function () { }); await arcGisPortalItemReference.loadReference(); - arcGisPortalItemStratum = arcGisPortalItemReference.strata.get( - ArcGisPortalItemStratum.stratumName - ) as ArcGisPortalItemStratum; - portalItemTarget = arcGisPortalItemReference.target; }); diff --git a/test/Models/Experiment.ts b/test/Models/Experiment.ts index 0a52cab527e..b781c42321d 100644 --- a/test/Models/Experiment.ts +++ b/test/Models/Experiment.ts @@ -49,7 +49,7 @@ describe("NewStuff", function () { ); }); - autorun((dispose) => { + autorun((_dispose) => { console.log("Run: " + wms.memberModels.length); wms.memberModels.forEach((model) => { if (CatalogMemberMixin.isMixedInto(model)) { diff --git a/test/Models/MapNavigation/MapNavigationModelSpec.ts b/test/Models/MapNavigation/MapNavigationModelSpec.ts index d322e497c72..1d231f13466 100644 --- a/test/Models/MapNavigation/MapNavigationModelSpec.ts +++ b/test/Models/MapNavigation/MapNavigationModelSpec.ts @@ -1,12 +1,10 @@ import Terria from "../../../lib/Models/Terria"; -import ViewState from "../../../lib/ReactViewModels/ViewState"; import MapNavigationModel from "../../../lib/ViewModels/MapNavigation/MapNavigationModel"; import { IMapNavigationItem } from "../../../lib/ViewModels/MapNavigation/MapNavigationModel"; import { GenericMapNavigationItemController } from "../../../lib/ViewModels/MapNavigation/MapNavigationItemController"; describe("MapNavigationModel", function () { let terria: Terria; - let viewState: ViewState; let item1: IMapNavigationItem; let item2: IMapNavigationItem; let item3: IMapNavigationItem; @@ -18,10 +16,6 @@ describe("MapNavigationModel", function () { terria = new Terria({ baseUrl: "./" }); - viewState = new ViewState({ - terria: terria, - catalogSearchProvider: undefined - }); item1 = { id: "item1", name: "item1", diff --git a/test/Models/SearchProviders/BingMapsSearchProviderSpec.ts b/test/Models/SearchProviders/BingMapsSearchProviderSpec.ts index 557fe5b848e..a5f9b35d7cb 100644 --- a/test/Models/SearchProviders/BingMapsSearchProviderSpec.ts +++ b/test/Models/SearchProviders/BingMapsSearchProviderSpec.ts @@ -52,7 +52,7 @@ describe("BingMapsSearchProvider", function () { }) ); - const searchResult = bingMapsSearchProvider.search("test"); + bingMapsSearchProvider.search("test"); expect(test).toHaveBeenCalledWith( new Resource({ @@ -86,7 +86,7 @@ describe("BingMapsSearchProvider", function () { false ); }); - const test = spyOn(loadJsonp, "loadJsonp").and.returnValue( + spyOn(loadJsonp, "loadJsonp").and.returnValue( Promise.resolve({ resourceSets: [ { diff --git a/test/Models/SearchProviders/CesiumIonSearchProviderSpec.ts b/test/Models/SearchProviders/CesiumIonSearchProviderSpec.ts index e0858fc3542..49365eca40e 100644 --- a/test/Models/SearchProviders/CesiumIonSearchProviderSpec.ts +++ b/test/Models/SearchProviders/CesiumIonSearchProviderSpec.ts @@ -49,7 +49,6 @@ describe("CesiumIonSearchProvider", () => { new Promise((resolve) => resolve([])) ); const result = await searchProvider.search("test"); - console.log(result); expect(result.results.length).toBe(0); expect(result.message?.content).toBe( "translate#viewModels.searchNoLocations" diff --git a/test/Models/TerriaSpec.ts b/test/Models/TerriaSpec.ts index 65d8a67d295..ea41ef46f2a 100644 --- a/test/Models/TerriaSpec.ts +++ b/test/Models/TerriaSpec.ts @@ -1148,7 +1148,7 @@ describe("Terria", function () { ]); done(); }) - .catch((error) => { + .catch((_error) => { done.fail(); }); }); @@ -1526,11 +1526,13 @@ describe("Terria", function () { describe("mapSettings", function () { it("properly interprets map hash parameter", async () => { const getLocalPropertySpy = spyOn(terria, "getLocalProperty"); - //@ts-expect-error - const location: Location = { + const location = { href: "http://test.com/#map=2d" - }; - await terria.start({ configUrl: "", applicationUrl: location }); + } as Location; + await terria.start({ + configUrl: "", + applicationUrl: location + }); await terria.loadPersistedMapSettings(); expect(terria.mainViewer.viewerMode).toBe(ViewerMode.Leaflet); expect(getLocalPropertySpy).not.toHaveBeenCalledWith("viewermode"); @@ -1552,11 +1554,13 @@ describe("Terria", function () { terria, "getLocalProperty" ).and.returnValue("3dsmooth"); - //@ts-expect-error - const location: Location = { + const location = { href: "http://test.com/#map=4d" - }; - await terria.start({ configUrl: "", applicationUrl: location }); + } as Location; + await terria.start({ + configUrl: "", + applicationUrl: location + }); await terria.loadPersistedMapSettings(); expect(terria.mainViewer.viewerMode).toBe(ViewerMode.Cesium); expect(terria.mainViewer.viewerOptions.useTerrain).toBe(false); diff --git a/test/Models/parseCustomMarkdownToReactTsSpec.ts b/test/Models/parseCustomMarkdownToReactTsSpec.ts index 10b4c7128b2..55a2693ce76 100644 --- a/test/Models/parseCustomMarkdownToReactTsSpec.ts +++ b/test/Models/parseCustomMarkdownToReactTsSpec.ts @@ -1,6 +1,5 @@ import { parseCustomMarkdownToReactWithOptions } from "../../lib/ReactViews/Custom/parseCustomMarkdownToReact"; import registerCustomComponentTypes from "../../lib/ReactViews/Custom/registerCustomComponentTypes"; -import Terria from "../../lib/Models/Terria"; import { TooltipWithButtonLauncher } from "../../lib/ReactViews/Generic/TooltipWrapper"; const isComponentOfType: any = @@ -8,12 +7,7 @@ const isComponentOfType: any = const findAll: any = require("react-shallow-testutils").findAll; describe("parseCustomMarkdownToReactTs", function () { - let terria: Terria; - beforeEach(function () { - terria = new Terria({ - baseUrl: "./" - }); registerCustomComponentTypes(); }); it("correctly parses tooltip terms", function () { diff --git a/test/ReactViews/Custom/Chart/BottomDockChartSpec.tsx b/test/ReactViews/Custom/Chart/BottomDockChartSpec.tsx index 3851c078098..f2e71fe67fd 100644 --- a/test/ReactViews/Custom/Chart/BottomDockChartSpec.tsx +++ b/test/ReactViews/Custom/Chart/BottomDockChartSpec.tsx @@ -1,6 +1,8 @@ -import { ReactTestRenderer } from "react-test-renderer"; +import TestRenderer, { act, ReactTestRenderer } from "react-test-renderer"; import { ChartItem } from "../../../../lib/ModelMixins/ChartableMixin"; import Terria from "../../../../lib/Models/Terria"; +import BottomDockChart from "../../../../lib/ReactViews/Custom/Chart/BottomDockChart"; +import PointOnMap from "../../../../lib/ReactViews/Custom/Chart/PointOnMap"; describe("BottomDockChart", function () { let terria: Terria; @@ -49,21 +51,19 @@ describe("BottomDockChart", function () { ]; }); - // FIXME: disabling because the new version of `withParentSize` from - // `@vx/responsive` uses ResizeObserver to trigger render which doesn't seem to - // work correctly in tests - // - /* it("renders all points on map for active chart items", function() { - * act(() => { - * testRenderer = TestRenderer.create( - * - * ); - * }); - * const pointsOnMap = testRenderer.root.findAllByType(PointOnMap); - * expect(pointsOnMap.length).toBe(2); - * }); */ + it("renders all points on map for active chart items", function () { + act(() => { + testRenderer = TestRenderer.create( + + ); + }); + const pointsOnMap = testRenderer.root.findAllByType(PointOnMap); + expect(pointsOnMap.length).toBe(2); + }); }); diff --git a/test/ReactViews/Custom/Chart/ChartCustomComponentSpec.tsx b/test/ReactViews/Custom/Chart/ChartCustomComponentSpec.tsx index 1eb3a58f81b..4f42bf8e580 100644 --- a/test/ReactViews/Custom/Chart/ChartCustomComponentSpec.tsx +++ b/test/ReactViews/Custom/Chart/ChartCustomComponentSpec.tsx @@ -81,10 +81,7 @@ describe("ChartCustomComponent", function () { sources: "a, b" } }; - const spy = spyOn( - component, - "constructShareableCatalogItem" - ).and.callThrough(); + spyOn(component, "constructShareableCatalogItem").and.callThrough(); component.processNode(context, node, [], 0); expect(component.constructShareableCatalogItem).toHaveBeenCalledTimes(2); // Make sure the id is dependent on parent, title & source name diff --git a/test/ReactViews/DimensionSelectorSectionSpec.tsx b/test/ReactViews/DimensionSelectorSectionSpec.tsx index 6a73decb1cf..e0469918cf7 100644 --- a/test/ReactViews/DimensionSelectorSectionSpec.tsx +++ b/test/ReactViews/DimensionSelectorSectionSpec.tsx @@ -43,7 +43,7 @@ export default class TestCatalogItem ], selectedId: "option-2", allowUndefined: true, - setDimensionValue: (stratumId: string, newStyle: string) => {} + setDimensionValue: (_stratumId: string, _newStyle: string) => {} }, { id: "some-id-2", @@ -55,7 +55,7 @@ export default class TestCatalogItem ], selectedId: "option-3", allowUndefined: false, - setDimensionValue: (stratumId: string, newStyle: string) => {} + setDimensionValue: (_stratumId: string, _newStyle: string) => {} }, { id: "some-id-3", @@ -67,7 +67,7 @@ export default class TestCatalogItem ], selectedId: "option-8", allowUndefined: false, - setDimensionValue: (stratumId: string, newStyle: string) => {}, + setDimensionValue: (_stratumId: string, _newStyle: string) => {}, disable: true }, { @@ -79,7 +79,7 @@ export default class TestCatalogItem ], selectedId: "false", type: "checkbox", - setDimensionValue: (stratumId, newStyle) => {} + setDimensionValue: (_stratumId, _newStyle) => {} } ]; } diff --git a/test/ReactViews/Map/Panels/LangPanel/LangPanelSpec.tsx b/test/ReactViews/Map/Panels/LangPanel/LangPanelSpec.tsx index 2003f843a51..e1b298084cf 100644 --- a/test/ReactViews/Map/Panels/LangPanel/LangPanelSpec.tsx +++ b/test/ReactViews/Map/Panels/LangPanel/LangPanelSpec.tsx @@ -3,13 +3,11 @@ import React from "react"; import { act } from "react-dom/test-utils"; import Terria from "../../../../../lib/Models/Terria"; -import ViewState from "../../../../../lib/ReactViewModels/ViewState"; import LangPanel from "../../../../../lib/ReactViews/Map/Panels/LangPanel/LangPanel"; describe("LangPanel", function () { let terria: Terria; - let viewState: ViewState; let testRenderer: any; @@ -17,11 +15,6 @@ describe("LangPanel", function () { terria = new Terria({ baseUrl: "./" }); - - viewState = new ViewState({ - terria: terria, - catalogSearchProvider: undefined - }); }); it("should not render if there is no langauge config", function () { diff --git a/test/ReactViews/Tools/ItemSearchTool/SearchFormSpec.tsx b/test/ReactViews/Tools/ItemSearchTool/SearchFormSpec.tsx index ff4fdaa7ed1..d2c928bb864 100644 --- a/test/ReactViews/Tools/ItemSearchTool/SearchFormSpec.tsx +++ b/test/ReactViews/Tools/ItemSearchTool/SearchFormSpec.tsx @@ -63,6 +63,6 @@ function render( act(() => { rendered = create(); }); - // @ts-expect-error + // @ts-expect-error assigned in callback return rendered; } diff --git a/test/ReactViews/Tools/ItemSearchTool/SearchResultsSpec.tsx b/test/ReactViews/Tools/ItemSearchTool/SearchResultsSpec.tsx index 734da60a44a..6e98364b89e 100644 --- a/test/ReactViews/Tools/ItemSearchTool/SearchResultsSpec.tsx +++ b/test/ReactViews/Tools/ItemSearchTool/SearchResultsSpec.tsx @@ -1,4 +1,3 @@ -import React from "react"; import { act, create, ReactTestRenderer } from "react-test-renderer"; import { ItemSearchResult } from "../../../../lib/Models/ItemSearchProviders/ItemSearchProvider"; import Terria from "../../../../lib/Models/Terria"; @@ -30,7 +29,7 @@ async function render( act(() => { rendered = create(); }); - // @ts-expect-error + // @ts-expect-error assigned in callback return rendered; } diff --git a/test/ReactViews/Workbench/Controls/LegendSpec.tsx b/test/ReactViews/Workbench/Controls/LegendSpec.tsx index b3f5b6e7ce0..06bdc4ad71e 100644 --- a/test/ReactViews/Workbench/Controls/LegendSpec.tsx +++ b/test/ReactViews/Workbench/Controls/LegendSpec.tsx @@ -1,6 +1,5 @@ const findAllWithClass = require("react-shallow-testutils").findAllWithClass; -import React from "react"; import TestRenderer from "react-test-renderer"; import CsvCatalogItem from "../../../../lib/Models/Catalog/CatalogItems/CsvCatalogItem"; import WebMapServiceCatalogItem from "../../../../lib/Models/Catalog/Ows/WebMapServiceCatalogItem"; @@ -49,8 +48,7 @@ describe("Legend", function () { .then(() => { const legendSection = ; const result = getShallowRenderedOutput(legendSection); - // @ts-expect-error - expect(result).toEqual(null); + expect(result).toBeNull(); }) .then(done); });