Skip to content

Commit 58c91c8

Browse files
HuulivoideHuulivoide
committed
E2E: Cleanup code
1 parent 3ebf795 commit 58c91c8

2 files changed

Lines changed: 217 additions & 229 deletions

File tree

‎cypress/e2e/map/mapFiltering.cy.ts‎

Lines changed: 136 additions & 142 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import { UUID } from '../../types';
2323
import { SupportedResources, insertToDbHelper } from '../../utils';
2424
import { InsertedStopRegistryIds } from '../utils';
2525

26-
describe('Stop area details', { tags: [Tag.StopAreas, Tag.Map] }, () => {
26+
describe('Filter map entities', { tags: [Tag.Map] }, () => {
2727
let dbResources: SupportedResources;
2828

2929
const baseDbResources = getClonedBaseDbResources();
@@ -77,171 +77,165 @@ describe('Stop area details', { tags: [Tag.StopAreas, Tag.Map] }, () => {
7777
});
7878
});
7979

80-
describe('Filter map entities', { tags: [Tag.Map] }, () => {
81-
function assertStopsAreVisible() {
82-
Map.getStopByStopLabelAndPriority(
83-
'E2E001',
84-
Priority.Standard,
85-
).shouldBeVisible();
86-
Map.getStopByStopLabelAndPriority(
87-
'E2E009',
88-
Priority.Standard,
89-
).shouldBeVisible();
90-
}
91-
92-
function assertStopsAreNotOnMap() {
93-
Map.getStopByStopLabelAndPriority('E2E001', Priority.Standard).should(
94-
'not.exist',
80+
function assertStopsAreVisible() {
81+
Map.getStopByStopLabelAndPriority(
82+
'E2E001',
83+
Priority.Standard,
84+
).shouldBeVisible();
85+
Map.getStopByStopLabelAndPriority(
86+
'E2E009',
87+
Priority.Standard,
88+
).shouldBeVisible();
89+
}
90+
91+
function assertStopsAreNotOnMap() {
92+
Map.getStopByStopLabelAndPriority('E2E001', Priority.Standard).should(
93+
'not.exist',
94+
);
95+
Map.getStopByStopLabelAndPriority('E2E009', Priority.Standard).should(
96+
'not.exist',
97+
);
98+
}
99+
100+
function assertStopLabelsAre(visible: 'visible' | 'hidden') {
101+
if (visible === 'visible') {
102+
Map.getStopByStopLabelAndPriority('E2E001', Priority.Standard).within(
103+
() =>
104+
Map.getStopMarkerLabel().shouldBeVisible().and('have.text', 'E2E001'),
95105
);
96-
Map.getStopByStopLabelAndPriority('E2E009', Priority.Standard).should(
97-
'not.exist',
106+
Map.getStopByStopLabelAndPriority('E2E009', Priority.Standard).within(
107+
() =>
108+
Map.getStopMarkerLabel().shouldBeVisible().and('have.text', 'E2E009'),
109+
);
110+
} else {
111+
Map.getStopByStopLabelAndPriority('E2E001', Priority.Standard).within(
112+
() => Map.getStopMarkerLabel().should('not.exist'),
113+
);
114+
Map.getStopByStopLabelAndPriority('E2E009', Priority.Standard).within(
115+
() => Map.getStopMarkerLabel().should('not.exist'),
98116
);
99117
}
118+
}
100119

101-
function assertStopLabelsAre(visible: 'visible' | 'hidden') {
102-
if (visible === 'visible') {
103-
Map.getStopByStopLabelAndPriority('E2E001', Priority.Standard).within(
104-
() =>
105-
Map.getStopMarkerLabel()
106-
.shouldBeVisible()
107-
.and('have.text', 'E2E001'),
108-
);
109-
Map.getStopByStopLabelAndPriority('E2E009', Priority.Standard).within(
110-
() =>
111-
Map.getStopMarkerLabel()
112-
.shouldBeVisible()
113-
.and('have.text', 'E2E009'),
114-
);
115-
} else {
116-
Map.getStopByStopLabelAndPriority('E2E001', Priority.Standard).within(
117-
() => Map.getStopMarkerLabel().should('not.exist'),
118-
);
119-
Map.getStopByStopLabelAndPriority('E2E009', Priority.Standard).within(
120-
() => Map.getStopMarkerLabel().should('not.exist'),
121-
);
122-
}
123-
}
124-
125-
it('should filter stops', { tags: [Tag.Smoke] }, () => {
126-
// Wait for map to load
127-
Map.waitForLoadToComplete();
120+
it('should filter stops', { tags: [Tag.Smoke] }, () => {
121+
// Wait for map to load
122+
Map.waitForLoadToComplete();
128123

129-
// Make sure stops are visible
130-
FilterPanel.toggleShowStops(ReusableComponentsVehicleModeEnum.Bus);
131-
assertStopsAreVisible();
124+
// Make sure stops are visible
125+
FilterPanel.toggleShowStops(ReusableComponentsVehicleModeEnum.Bus);
126+
assertStopsAreVisible();
132127

133-
// Set stops to be hidden
134-
MapObservationDateFiltersOverlay.getToggleShowFiltersButton().click();
135-
MapItemTypeFiltersOverlay.setFilters({
136-
[KnownMapItemTypeFilters.Stop]: false,
137-
});
138-
assertStopsAreNotOnMap();
128+
// Set stops to be hidden
129+
MapObservationDateFiltersOverlay.getToggleShowFiltersButton().click();
130+
MapItemTypeFiltersOverlay.setFilters({
131+
[KnownMapItemTypeFilters.Stop]: false,
132+
});
133+
assertStopsAreNotOnMap();
139134

140-
// Set stops to be shown again
141-
MapItemTypeFiltersOverlay.setFilters({
142-
[KnownMapItemTypeFilters.Stop]: true,
143-
});
144-
assertStopsAreVisible();
135+
// Set stops to be shown again
136+
MapItemTypeFiltersOverlay.setFilters({
137+
[KnownMapItemTypeFilters.Stop]: true,
138+
});
139+
assertStopsAreVisible();
145140

146-
// Stops should be hidden if observation date does not match
147-
MapObservationDateControl.setObservationDate('2000-01-01');
148-
assertStopsAreNotOnMap();
141+
// Stops should be hidden if observation date does not match
142+
MapObservationDateControl.setObservationDate('2000-01-01');
143+
assertStopsAreNotOnMap();
149144

150-
// But should come back if we disable observation date filtering
151-
// and enable future items.
152-
MapItemTypeFiltersOverlay.setFilters({
153-
[KnownMapItemTypeFilters.ShowHighestPriorityCurrentStops]: false,
154-
[KnownMapItemTypeFilters.ShowFutureStops]: true,
155-
});
156-
assertStopsAreVisible();
145+
// But should come back if we disable observation date filtering
146+
// and enable future items.
147+
MapItemTypeFiltersOverlay.setFilters({
148+
[KnownMapItemTypeFilters.ShowHighestPriorityCurrentStops]: false,
149+
[KnownMapItemTypeFilters.ShowFutureStops]: true,
150+
});
151+
assertStopsAreVisible();
157152

158-
// Should hide if future stops are not shown
159-
MapItemTypeFiltersOverlay.setFilters({
160-
[KnownMapItemTypeFilters.ShowFutureStops]: false,
161-
});
162-
assertStopsAreNotOnMap();
153+
// Should hide if future stops are not shown
154+
MapItemTypeFiltersOverlay.setFilters({
155+
[KnownMapItemTypeFilters.ShowFutureStops]: false,
156+
});
157+
assertStopsAreNotOnMap();
163158

164-
// Should hide if future stops are show but standard versions are disabled
165-
MapItemTypeFiltersOverlay.setFilters({
166-
[KnownMapItemTypeFilters.ShowFutureStops]: true,
167-
[KnownMapItemTypeFilters.ShowStandardStops]: false,
168-
});
169-
assertStopsAreNotOnMap();
159+
// Should hide if future stops are show but standard versions are disabled
160+
MapItemTypeFiltersOverlay.setFilters({
161+
[KnownMapItemTypeFilters.ShowFutureStops]: true,
162+
[KnownMapItemTypeFilters.ShowStandardStops]: false,
170163
});
164+
assertStopsAreNotOnMap();
165+
});
171166

172-
it('should filter stop areas', () => {
173-
// Wait for map to load
174-
Map.waitForLoadToComplete();
167+
it('should filter stop areas', () => {
168+
// Wait for map to load
169+
Map.waitForLoadToComplete();
175170

176-
// Make sure stop area is visible
177-
Map.getStopAreaById('X0003').shouldBeVisible();
171+
// Make sure stop area is visible
172+
Map.getStopAreaById('X0003').shouldBeVisible();
178173

179-
// Set stop areas to be hidden
180-
MapObservationDateFiltersOverlay.getToggleShowFiltersButton().click();
181-
MapItemTypeFiltersOverlay.setFilters({
182-
[KnownMapItemTypeFilters.StopArea]: false,
183-
});
184-
Map.getStopAreaById('X0003').should('not.exist');
174+
// Set stop areas to be hidden
175+
MapObservationDateFiltersOverlay.getToggleShowFiltersButton().click();
176+
MapItemTypeFiltersOverlay.setFilters({
177+
[KnownMapItemTypeFilters.StopArea]: false,
185178
});
179+
Map.getStopAreaById('X0003').should('not.exist');
180+
});
186181

187-
it('should filter terminals', () => {
188-
// Wait for map to load
189-
Map.waitForLoadToComplete();
182+
it('should filter terminals', () => {
183+
// Wait for map to load
184+
Map.waitForLoadToComplete();
190185

191-
// Hide stop areas, no effect on the tests, but they do cover up the
192-
// member stops. Also stops should be visible
193-
MapObservationDateFiltersOverlay.getToggleShowFiltersButton().click();
194-
MapItemTypeFiltersOverlay.setFilters({
195-
[KnownMapItemTypeFilters.StopArea]: false,
196-
});
197-
MapObservationDateFiltersOverlay.getToggleShowFiltersButton().click();
198-
FilterPanel.toggleShowStops(ReusableComponentsVehicleModeEnum.Bus);
199-
Map.waitForLoadToComplete();
200-
201-
// Make sure terminal is visible
202-
Map.getTerminalById('T2').shouldBeVisible();
203-
204-
// All stops should also be visible
205-
assertStopsAreVisible();
206-
207-
// But clicking the terminal infobox open, only members should be shown.
208-
Map.getTerminalById('T2').click();
209-
Map.waitForLoadToComplete();
210-
assertStopsAreNotOnMap();
211-
Map.getMemberStop('E2E008').shouldBeVisible();
212-
Map.getMemberStop('E2E010').shouldBeVisible();
213-
214-
// Set terminals to be hidden
215-
MapObservationDateFiltersOverlay.getToggleShowFiltersButton().click();
216-
MapItemTypeFiltersOverlay.setFilters({
217-
[KnownMapItemTypeFilters.Terminal]: false,
218-
});
219-
Map.getTerminalById('T2').should('not.exist');
186+
// Hide stop areas, no effect on the tests, but they do cover up the
187+
// member stops. Also stops should be visible
188+
MapObservationDateFiltersOverlay.getToggleShowFiltersButton().click();
189+
MapItemTypeFiltersOverlay.setFilters({
190+
[KnownMapItemTypeFilters.StopArea]: false,
191+
});
192+
MapObservationDateFiltersOverlay.getToggleShowFiltersButton().click();
193+
FilterPanel.toggleShowStops(ReusableComponentsVehicleModeEnum.Bus);
194+
Map.waitForLoadToComplete();
195+
196+
// Make sure terminal is visible
197+
Map.getTerminalById('T2').shouldBeVisible();
198+
199+
// All stops should also be visible
200+
assertStopsAreVisible();
201+
202+
// But clicking the terminal infobox open, only members should be shown.
203+
Map.getTerminalById('T2').click();
204+
Map.waitForLoadToComplete();
205+
assertStopsAreNotOnMap();
206+
Map.getMemberStop('E2E008').shouldBeVisible();
207+
Map.getMemberStop('E2E010').shouldBeVisible();
208+
209+
// Set terminals to be hidden
210+
MapObservationDateFiltersOverlay.getToggleShowFiltersButton().click();
211+
MapItemTypeFiltersOverlay.setFilters({
212+
[KnownMapItemTypeFilters.Terminal]: false,
220213
});
214+
Map.getTerminalById('T2').should('not.exist');
215+
});
221216

222-
it('should show & hide stops labels', () => {
223-
// Wait for map to load
224-
Map.waitForLoadToComplete();
217+
it('should show & hide stops labels', () => {
218+
// Wait for map to load
219+
Map.waitForLoadToComplete();
225220

226-
// Make sure stops are visible
227-
FilterPanel.toggleShowStops(ReusableComponentsVehicleModeEnum.Bus);
228-
assertStopsAreVisible();
221+
// Make sure stops are visible
222+
FilterPanel.toggleShowStops(ReusableComponentsVehicleModeEnum.Bus);
223+
assertStopsAreVisible();
229224

230-
// Labels should off by default
231-
assertStopLabelsAre('hidden');
225+
// Labels should off by default
226+
assertStopLabelsAre('hidden');
232227

233-
// Set labels to be visible
234-
MapObservationDateFiltersOverlay.getToggleShowFiltersButton().click();
235-
MapItemTypeFiltersOverlay.setFilters({
236-
[KnownMapItemTypeFilters.StopLabel]: true,
237-
});
238-
assertStopLabelsAre('visible');
228+
// Set labels to be visible
229+
MapObservationDateFiltersOverlay.getToggleShowFiltersButton().click();
230+
MapItemTypeFiltersOverlay.setFilters({
231+
[KnownMapItemTypeFilters.StopLabel]: true,
232+
});
233+
assertStopLabelsAre('visible');
239234

240-
// Toggle back to hidden
241-
MapItemTypeFiltersOverlay.setFilters({
242-
[KnownMapItemTypeFilters.StopLabel]: false,
243-
});
244-
assertStopLabelsAre('hidden');
235+
// Toggle back to hidden
236+
MapItemTypeFiltersOverlay.setFilters({
237+
[KnownMapItemTypeFilters.StopLabel]: false,
245238
});
239+
assertStopLabelsAre('hidden');
246240
});
247241
});

0 commit comments

Comments
 (0)