Skip to content

Commit

Permalink
Fix lint warnings in Spec files
Browse files Browse the repository at this point in the history
- remove unneeded console.logs
  • Loading branch information
ljowen committed Sep 3, 2024
1 parent a40b0ef commit 2f90f38
Show file tree
Hide file tree
Showing 30 changed files with 67 additions and 124 deletions.
6 changes: 0 additions & 6 deletions test/Core/markdownToHtmlSpec.ts
Original file line number Diff line number Diff line change
@@ -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 () {
Expand Down
14 changes: 10 additions & 4 deletions test/ModelMixins/TileErrorHandlerMixinSpec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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 */
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ describe("YDYRCatalogFunction", function () {
});

// A few reactions will happen, while setting default values for functionParameters
await new Promise<void>((resolve, reject) => {
await new Promise<void>((resolve) => {
reaction(
() => ydyr.functionParameters,
() => {
Expand Down
3 changes: 0 additions & 3 deletions test/Models/Catalog/CatalogGroupSpec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down Expand Up @@ -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"]);
Expand Down Expand Up @@ -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 &&
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ describe("OpenDataSoftCatalogGroup", function () {
});

afterEach(function () {
console.log(fetchMock.calls());
fetchMock.restore();
});

Expand Down
4 changes: 0 additions & 4 deletions test/Models/Catalog/CatalogGroups/ThreddsCatalogGroupSpec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ configure({
describe("ThreddsCatalogGroup", function () {
let terria: Terria;
let threddsCatalogGroup: ThreddsCatalogGroup;
let threddsStratum: ThreddsStratum;

beforeEach(async function () {
terria = new Terria({
Expand All @@ -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 () {
Expand Down
2 changes: 0 additions & 2 deletions test/Models/Catalog/CatalogItems/ApiTableCatalogItemSpec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions test/Models/Catalog/CatalogItems/GeoJsonCatalogItemSpec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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]
]
]
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
});
Expand Down
1 change: 0 additions & 1 deletion test/Models/Catalog/Ckan/CkanCatalogGroupSpec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
17 changes: 1 addition & 16 deletions test/Models/Catalog/Ckan/CkanItemReferenceSpec.ts
Original file line number Diff line number Diff line change
@@ -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";
Expand All @@ -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 () {
Expand Down Expand Up @@ -75,9 +72,6 @@ describe("CkanItemReference", function () {
);
});
(await ckanItemReference.loadReference()).throwIfError();
ckanDatasetStratum = ckanItemReference.strata.get(
CkanDatasetStratum.stratumName
) as CkanDatasetStratum;
ckanItemTarget = ckanItemReference.target;
});

Expand Down Expand Up @@ -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();
Expand Down Expand Up @@ -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();
Expand Down Expand Up @@ -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 () {
Expand Down
5 changes: 3 additions & 2 deletions test/Models/Catalog/Ows/WebMapServiceCatalogItemSpec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ describe("WebProcessingServiceCatalogFunction", function () {
let dispose: any;
job = (await wps.submitJob()) as WebProcessingServiceCatalogFunctionJob;

await new Promise<void>((resolve, reject) => {
await new Promise<void>((resolve, _reject) => {
dispose = reaction(
() => job.downloadedResults,
() => {
Expand Down Expand Up @@ -220,7 +220,7 @@ describe("WebProcessingServiceCatalogFunction", function () {
let dispose2: any;

// Wait for job to finish polling, then check if finished
await new Promise<void>((resolve, reject) => {
await new Promise<void>((resolve, _reject) => {
dispose2 = reaction(
() => job.refreshEnabled,
() => {
Expand Down Expand Up @@ -307,7 +307,7 @@ describe("WebProcessingServiceCatalogFunction", function () {
let dispose2: any;

// Wait for job to finish polling, then check if failed
await new Promise<void>((resolve, reject) => {
await new Promise<void>((resolve, _reject) => {
dispose2 = reaction(
() => job.refreshEnabled,
() => {
Expand Down
2 changes: 1 addition & 1 deletion test/Models/Catalog/allCatalogModelsSpec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
3 changes: 0 additions & 3 deletions test/Models/Catalog/esri/ArcGisImageServerCatalogItemSpec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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"
);
Expand Down
9 changes: 1 addition & 8 deletions test/Models/Catalog/esri/ArcGisPortalReferenceItemSpec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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({
Expand All @@ -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 () {
Expand Down Expand Up @@ -75,10 +72,6 @@ describe("ArcGisPortalItemReference", function () {
});
await arcGisPortalItemReference.loadReference();

arcGisPortalItemStratum = arcGisPortalItemReference.strata.get(
ArcGisPortalItemStratum.stratumName
) as ArcGisPortalItemStratum;

portalItemTarget = arcGisPortalItemReference.target;
});

Expand Down
2 changes: 1 addition & 1 deletion test/Models/Experiment.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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)) {
Expand Down
6 changes: 0 additions & 6 deletions test/Models/MapNavigation/MapNavigationModelSpec.ts
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -18,10 +16,6 @@ describe("MapNavigationModel", function () {
terria = new Terria({
baseUrl: "./"
});
viewState = new ViewState({
terria: terria,
catalogSearchProvider: undefined
});
item1 = {
id: "item1",
name: "item1",
Expand Down
4 changes: 2 additions & 2 deletions test/Models/SearchProviders/BingMapsSearchProviderSpec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ describe("BingMapsSearchProvider", function () {
})
);

const searchResult = bingMapsSearchProvider.search("test");
bingMapsSearchProvider.search("test");

expect(test).toHaveBeenCalledWith(
new Resource({
Expand Down Expand Up @@ -86,7 +86,7 @@ describe("BingMapsSearchProvider", function () {
false
);
});
const test = spyOn(loadJsonp, "loadJsonp").and.returnValue(
spyOn(loadJsonp, "loadJsonp").and.returnValue(
Promise.resolve({
resourceSets: [
{
Expand Down
1 change: 0 additions & 1 deletion test/Models/SearchProviders/CesiumIonSearchProviderSpec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Loading

0 comments on commit 2f90f38

Please sign in to comment.