diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 80b4dfbfcc8fcbe2973469bc488628fce0febcc7..30f7c157bab9534f4e1754e072de57338e18dbd2 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -65,8 +65,8 @@ jobs: python-version: '3.10' - run: | cd backend + echo "hello world" >> index.html + export PATH_TO_PUBLIC=$(pwd) pip install -r requirements.txt pip install pytest pytest - - diff --git a/backend/pytest.ini b/backend/pytest.ini index 0d140f30bd8a273c44e012aece65633d75736870..bf8e4ff582ba9bad8361a33d53a8dcbd74aad89b 100644 --- a/backend/pytest.ini +++ b/backend/pytest.ini @@ -1,4 +1,4 @@ [pytest] pythonpath = . testpaths = - test_app \ No newline at end of file + test_app diff --git a/src/atlasComponents/sapi/sapi.service.spec.ts b/src/atlasComponents/sapi/sapi.service.spec.ts index 7232406894823ca0f75994ac0fbb2536e26b08e4..ba9a8bfca5540076b45c795c9a4156ece347a79a 100644 --- a/src/atlasComponents/sapi/sapi.service.spec.ts +++ b/src/atlasComponents/sapi/sapi.service.spec.ts @@ -53,12 +53,11 @@ describe("> sapi.service.ts", () => { }) }) it("> should call fetch twice", async () => { - expect(fetchSpy).toHaveBeenCalledTimes(2) + expect(fetchSpy).toHaveBeenCalledTimes(1) const allArgs = fetchSpy.calls.allArgs() - expect(allArgs.length).toEqual(2) + expect(allArgs.length).toEqual(1) expect(atlasEndpts).toContain(allArgs[0][0]) - expect(atlasEndpts).toContain(allArgs[1][0]) }) it("> endpoint should be set", async () => { @@ -67,11 +66,11 @@ describe("> sapi.service.ts", () => { it("> additional calls should return cached observable", () => { - expect(fetchSpy).toHaveBeenCalledTimes(2) + expect(fetchSpy).toHaveBeenCalledTimes(1) SAPI.BsEndpoint$.subscribe() SAPI.BsEndpoint$.subscribe() - expect(fetchSpy).toHaveBeenCalledTimes(2) + expect(fetchSpy).toHaveBeenCalledTimes(1) }) }) diff --git a/src/atlasComponents/sapi/sapi.service.ts b/src/atlasComponents/sapi/sapi.service.ts index 932b6bcb4115d7e02b4a3672cbedef4abbc7497f..c3543e08c2ed155d20de261fc0eb74321dcf9bfd 100644 --- a/src/atlasComponents/sapi/sapi.service.ts +++ b/src/atlasComponents/sapi/sapi.service.ts @@ -11,7 +11,7 @@ import { translateV3Entities } from "./translateV3" import { FeatureType, PathReturn, RouteParam, SapiRoute } from "./typeV3"; -import { BoundingBox, SxplrAtlas, SxplrParcellation, SxplrRegion, SxplrTemplate, VoiFeature, Feature } from "./sxplrTypes"; +import { BoundingBox, SxplrAtlas, SxplrParcellation, SxplrRegion, SxplrTemplate, VoiFeature } from "./sxplrTypes"; import { parcBanList, speciesOrder } from "src/util/constants"; import { CONST } from "common/constants"