Skip to content

Commit

Permalink
Post-merge fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
@david-mears-2
david-mears-2 committed Nov 15, 2024
1 parent e0381e5 commit 9b857d9
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 23 deletions.
2 changes: 1 addition & 1 deletion components/Globe.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@ const setUpBackgroundSeries = () => {
};
const setUpAntarcticaSeries = () => {
initializeSeries({ ...backgroundSeriesSettings, geoJSON: worldLow, include: ["AQ"] });
initializeSeries(root, chart, { ...backgroundSeriesSettings, geoJSON: worldLow, include: ["AQ"] });
};
const setUpSelectableCountriesSeries = () => {
Expand Down
45 changes: 23 additions & 22 deletions tests/unit/components/Globe.spec.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,19 +30,20 @@ describe("globe", () => {
it("initially creates the chart, with series whose layers are correct, without any 'highlighted country' series", async () => {
const component = await mountSuspended(Globe);

const chart = component.vm.setUpChart();
const chart = (component.vm as any).setUpChart();

expect(chart.get("rotationX")).toBe(-100);
expect(chart.get("rotationY")).toBe(-25);

expect(chart.series._values.length).toBe(7);
expect(chart.series._values[0]._settings.layer).toBe(24);
expect(chart.series._values[1]._settings.layer).toBe(25);
expect(chart.series._values[2]._settings.layer).toBe(28);
expect(chart.series._values[3]._settings.layer).toBe(28);
expect(chart.series._values[4]._settings.layer).toBe(28);
expect(chart.series._values[5]._settings.layer).toBe(28);
expect(chart.series._values[6]._settings.layer).toBe(29);
expect(chart.series._values.length).toBe(8);
expect(chart.series._values[0]._settings.layer).toBe(24); // Background series
expect(chart.series._values[1]._settings.layer).toBe(24); // Antarctica
expect(chart.series._values[2]._settings.layer).toBe(25); // Selectable countries
expect(chart.series._values[3]._settings.layer).toBe(28); // Disputed land 1
expect(chart.series._values[4]._settings.layer).toBe(28); // Disputed land 2
expect(chart.series._values[5]._settings.layer).toBe(28); // Disputed land 3
expect(chart.series._values[6]._settings.layer).toBe(28); // Disputed land 4
expect(chart.series._values[7]._settings.layer).toBe(29); // Disputed bodies of water
});

it("updating highlightedCountry in store (as when a country is selected from the drop-down) should trigger a 'highlighted country' series to be added, which is disposed of when a new highlightedCountry is set", async () => {
Expand All @@ -61,20 +62,20 @@ describe("globe", () => {
global: { plugins: [testPinia] },
});

const chart = component.vm.setUpChart();
const chart = (component.vm as any).setUpChart();

appStore.globe.highlightedCountry = "GBR";

await component.vm.$nextTick();

expect(chart.series._values.length).toBe(8);
const gbrSeries = chart.series._values[7];
expect(chart.series._values.length).toBe(9);
const gbrSeries = chart.series._values[8];

// Ensure that the name has been updated from 'United Kingdom of Great Britain and Northern Ireland' to 'United Kingdom'
// Name is used for tooltips.
expect(gbrSeries._settings.geoJSON.properties.name).toBe("United Kingdom");

const selectableCountrySeries = chart.series._values[1];
const selectableCountrySeries = chart.series._values[2];

// These expectations won't pass until the data has been validated by amcharts
await waitFor(() => {
Expand All @@ -92,9 +93,9 @@ describe("globe", () => {
expect(gbrSeries._disposed).toBe(true);
}, { timeout: 3000 /* >= geoPointZoomDuration */ });

expect(chart.series._values.length).toBe(8);
expect(chart.series._values[7]._settings.geoJSON.properties.name).toBe("United States");
expect(chart.series._values[7].mapPolygons._values[0]._dataItem?.dataContext?.name).toBe("United States");
expect(chart.series._values.length).toBe(9);
expect(chart.series._values[8]._settings.geoJSON.properties.name).toBe("United States");
expect(chart.series._values[8].mapPolygons._values[0]._dataItem?.dataContext?.name).toBe("United States");
});

it("updating highlightedCountry in store (as when a country is selected from the drop-down) should trigger a recolouring of and a rotation to that country", async () => {
Expand All @@ -104,15 +105,15 @@ describe("globe", () => {
global: { plugins: [testPinia] },
});

const chart = component.vm.setUpChart();
const chart = (component.vm as any).setUpChart();

appStore.globe.highlightedCountry = "GBR";

await component.vm.$nextTick();

expect(component.vm.gentleRotateAnimation.stopped).toBe(true);

const gbrSeries = chart.series._values[7];
const gbrSeries = chart.series._values[8];
const originalColor = gbrSeries._settings.fill;

await waitFor(() => {
Expand All @@ -135,7 +136,7 @@ describe("globe", () => {
global: { plugins: [testPinia] },
});

const chart = component.vm.setUpChart();
const chart = (component.vm as any).setUpChart();
expect(chart._settings.zoomLevel).toBe(1);

const zoomToGeoBoundsSpy = vi.spyOn(chart, "zoomToGeoBounds");
Expand Down Expand Up @@ -164,7 +165,7 @@ describe("globe", () => {
global: { plugins: [testPinia] },
});

const chart = component.vm.setUpChart();
const chart = (component.vm as any).setUpChart();

const zoomToGeoBoundsSpy = vi.spyOn(chart, "zoomToGeoBounds");
const goHomeSpy = vi.spyOn(chart, "goHome");
Expand Down Expand Up @@ -206,13 +207,13 @@ describe("globe", () => {
global: { plugins: [testPinia] },
});

const chart = component.vm.setUpChart();
const chart = (component.vm as any).setUpChart();

appStore.globe.highlightedCountry = "GBR";

await component.vm.$nextTick();

const gbrSeries = chart.series._values[7];
const gbrSeries = chart.series._values[8];
const originalColor = gbrSeries._settings.fill;
const originalX = chart.get("rotationX");
const originalY = chart.get("rotationY");
Expand Down

0 comments on commit 9b857d9

Please sign in to comment.