Skip to content

Commit 56c6cb6

Browse files
manuhabitelamanuhabitela
committed
(tests) update tests after dom changes in filters config
1 parent 51cfd1b commit 56c6cb6

11 files changed

+46
-36
lines changed

‎app/client/ui/ColumnFilterMenu.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -308,7 +308,7 @@ export function columnFilterMenu(owner: IDisposableOwner, opts: IFilterMenuOptio
308308
(elem) => { elem.checked = columnFilter.includes(key); checkboxMap.set(key, elem); },
309309
dom.style('position', 'relative'),
310310
),
311-
renderValue(key, value),
311+
dom('span', renderValue(key, value), testId('value')),
312312
cssItemCount(value.count.toLocaleString(), testId('count'))
313313
),
314314
)

‎app/client/ui/RightPanel.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -869,7 +869,7 @@ export class RightPanel extends Disposable {
869869
// TODO: sections should be listed following the order of appearance in the view layout (ie:
870870
// left/right - top/bottom);
871871
return selectorFor.length ? [
872-
cssGroupLabel(t("SELECTOR FOR"), {id: 'data-selector-for-label'}),
872+
cssGroupLabel(t("SELECTOR FOR"), {id: 'data-selector-for-label'}, testId('selector-for')),
873873
cssRow(cssList(
874874
{'aria-labelledby': 'data-selector-for-label'},
875875
selectorFor.map((sec) => this._buildSectionItem(sec)),

‎test/nbrowser/ColumnFilterMenu.ts‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ describe('ColumnFilterMenu', function() {
184184
await gu.findOpenMenuItem('li', /Count/).click();
185185

186186
// Check that there's only 5 values left ('3' is missing)
187-
assert.deepEqual(await driver.findAll('.test-filter-menu-list label', (e) => e.getText()),
187+
assert.deepEqual(await driver.findAll('.test-filter-menu-list .test-filter-menu-value', (e) => e.getText()),
188188
['n/a', '-1', '1', '2', '5']);
189189

190190
// Check `Others` shows unique count
@@ -207,7 +207,7 @@ describe('ColumnFilterMenu', function() {
207207
await driver.findContent('.test-filter-field', /Name/).click();
208208

209209
// Check there's only 4 values left
210-
assert.deepEqual(await driver.findAll('.test-filter-menu-list label', (e) => e.getText()),
210+
assert.deepEqual(await driver.findAll('.test-filter-menu-list .test-filter-menu-value', (e) => e.getText()),
211211
['Bananas', 'Clementines', 'Grapefruit', 'Grapes']);
212212

213213
// check `Others` shows 2 unique values
@@ -246,7 +246,7 @@ describe('ColumnFilterMenu', function() {
246246
await driver.findContent('.test-filter-field', /Name/).click();
247247

248248
// Check Apples and Oranges are unchecked
249-
assert.deepEqual(await driver.findAll('.test-filter-menu-list label', (e) => e.getText()),
249+
assert.deepEqual(await driver.findAll('.test-filter-menu-list .test-filter-menu-value', (e) => e.getText()),
250250
['Apples', 'Bananas', 'Clementines', 'Grapefruit', 'Grapes', 'Oranges']);
251251
assert.equal(await findByName('Apples').find('input').matches(':checked'), false);
252252
assert.equal(await findByName('Oranges').find('input').matches(':checked'), false);
@@ -258,7 +258,7 @@ describe('ColumnFilterMenu', function() {
258258
await driver.findContent('.test-filter-field', /Count/).click();
259259

260260
// Check there's only 4 values left
261-
assert.deepEqual(await driver.findAll('.test-filter-menu-list label', (e) => e.getText()),
261+
assert.deepEqual(await driver.findAll('.test-filter-menu-list .test-filter-menu-value', (e) => e.getText()),
262262
['n/a', '-1', '2', '5']);
263263

264264
// Click Others
@@ -333,7 +333,7 @@ describe('ColumnFilterMenu', function() {
333333
await driver.findContent('.test-filter-field', /Name/).click();
334334

335335
// check Apples is missing
336-
assert.deepEqual(await driver.findAll('.test-filter-menu-list label', (e) => e.getText()),
336+
assert.deepEqual(await driver.findAll('.test-filter-menu-list .test-filter-menu-value', (e) => e.getText()),
337337
['Bananas', 'Clementines', 'Grapefruit', 'Grapes', 'Oranges']);
338338

339339
// check count is (1)

‎test/nbrowser/ColumnFilterMenu2.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ import { assert, driver, Key } from 'mocha-webdriver';
66
function getItems() {
77
return driver.findAll('.test-filter-menu-list label', async (e) => ({
88
checked: await e.find('input').isSelected(),
9-
label: await e.getText(),
10-
count: await e.findClosest('div').find('.test-filter-menu-count').getText()
9+
label: await e.find('.test-filter-menu-value').getText(),
10+
count: await e.find('.test-filter-menu-count').getText()
1111
}));
1212
}
1313

‎test/nbrowser/ColumnFilterMenu3.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ void(driver);
66
void(Key);
77

88
async function getValues() {
9-
return driver.findAll('.test-filter-menu-list label', e => e.getText());
9+
return driver.findAll('.test-filter-menu-list .test-filter-menu-value', e => e.getText());
1010
}
1111

1212
describe('ColumnFilterMenu3', function() {
@@ -172,7 +172,7 @@ describe('ColumnFilterMenu3', function() {
172172

173173
async function assertEmptyRowCount(count: number) {
174174
assert.deepEqual(
175-
await driver.findAll('.test-filter-menu-list label', (e) => e.getText()),
175+
await driver.findAll('.test-filter-menu-list .test-filter-menu-value', (e) => e.getText()),
176176
['']
177177
);
178178
assert.deepEqual(

‎test/nbrowser/DuplicatePage.ts‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,9 @@ describe('DuplicatePage', async function() {
135135
const selectedFilters = async () =>
136136
(
137137
await driver.findAll(".test-filter-menu-list label",
138-
async (e) => (await e.find("input").matches(":checked")) ? (await e.getText()) : "")
138+
async (e) => (await e.find("input").matches(":checked"))
139+
? (await e.find(".test-filter-menu-value").getText())
140+
: "")
139141
).filter(x=>x);
140142
const selectColumn = (name: string) => driver.findContent('.grist-floating-menu li', name).click();
141143
const clickNone = () => driver.findContent('.test-filter-menu-bulk-action', /None/).click();

‎test/nbrowser/RightPanel.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import * as gu from 'test/nbrowser/gristUtils';
33
import {server, setupTestSuite} from 'test/nbrowser/testUtils';
44

55
describe('RightPanel', function() {
6-
this.timeout(20000);
6+
this.timeout(60000);
77
const cleanup = setupTestSuite();
88

99
afterEach(() => gu.checkForErrors());

‎test/nbrowser/SectionFilter.ts‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -91,11 +91,11 @@ describe('SectionFilter', function() {
9191

9292
// Put the filter into the "inclusion" state, with nothing selected initially.
9393
assert.deepEqual(
94-
await driver.findAll('.test-filter-menu-bulk-action:not(:disabled)', (e) => e.getText()),
94+
await driver.findAll('.test-filter-menu-bulk-action:not([aria-disabled="true"])', (e) => e.getText()),
9595
['None']);
9696
await driver.findContent('.test-filter-menu-bulk-action', /None/).click();
9797
assert.deepEqual(
98-
await driver.findAll('.test-filter-menu-bulk-action:not(:disabled)', (e) => e.getText()),
98+
await driver.findAll('.test-filter-menu-bulk-action:not([aria-disabled="true"])', (e) => e.getText()),
9999
['All']);
100100

101101
// Include only "Apples".
@@ -233,7 +233,7 @@ describe('SectionFilter', function() {
233233
{ checked: true, value: 'Bar', count: 1},
234234
{ checked: true, value: 'Foo', count: 1}
235235
]);
236-
await menu.findContent('label', /^$/).click();
236+
await menu.findContent('label .test-filter-menu-value', /^$/).click();
237237
await menu.findContent('label', /Bar/).click();
238238
assert.deepEqual(await gu.getVisibleGridCells(0, [1, 2, 3, 4, 5, 6, 7]),
239239
['Foo', '1', '2.0', '2016-01-01', '5+6', '', undefined]);
@@ -255,7 +255,7 @@ describe('SectionFilter', function() {
255255
{ checked: true, value: '6.00', count: 1},
256256
{ checked: true, value: '7.00', count: 1},
257257
]);
258-
await menu.findContent('label', /^$/).click();
258+
await menu.findContent('label .test-filter-menu-value', /^$/).click();
259259
await menu.findContent('label', /7/).click();
260260
await menu.findContent('label', /foo/).click();
261261
assert.deepEqual(await gu.getVisibleGridCells(1, [1, 2, 3, 4, 5, 6]),
@@ -277,7 +277,7 @@ describe('SectionFilter', function() {
277277
{ checked: true, value: '2019-06-05', count: 1},
278278
{ checked: true, value: '2019-06-07', count: 1},
279279
]);
280-
await menu.findContent('label', /^$/).click();
280+
await menu.findContent('label .test-filter-menu-value', /^$/).click();
281281
await menu.findContent('label', /2019-06-05/).click();
282282
await menu.findContent('label', /bar/).click();
283283
assert.deepEqual(await gu.getVisibleGridCells(2, [1, 2, 3, 4, 5, 6]),
@@ -293,7 +293,7 @@ describe('SectionFilter', function() {
293293
{ checked: true, value: '2019-06-07', count: 1}
294294
]);
295295
assert.deepEqual(
296-
await menu.findAll('.test-filter-menu-list label', (e) => e.getText()),
296+
await menu.findAll('.test-filter-menu-list .test-filter-menu-value', (e) => e.getText()),
297297
['2019-06-07']
298298
);
299299
await menu.findContent('.test-filter-menu-bulk-action', /All Shown/).click();
@@ -341,7 +341,7 @@ describe('SectionFilter', function() {
341341
{ checked: true, value: 'carol', count: 1},
342342
]);
343343

344-
await menu.findContent('label', /^$/).click();
344+
await menu.findContent('label .test-filter-menu-value', /^$/).click();
345345
await menu.findContent('label', /#Invalid Ref: denis/).click();
346346
await menu.findContent('label', /bob/).click();
347347

@@ -387,7 +387,7 @@ describe('SectionFilter', function() {
387387

388388
assert.deepEqual(boldFonts, ['Foo']);
389389

390-
await menu.findContent('label', /^$/).click();
390+
await menu.findContent('label .test-filter-menu-value', /^$/).click();
391391
await menu.findContent('label', /Bar/).click();
392392
await menu.findContent('label', /Baz/).click();
393393

@@ -415,7 +415,7 @@ describe('SectionFilter', function() {
415415
{ checked: true, value: 'D', count: 0},
416416
]);
417417

418-
await menu.findContent('label', /^$/).click();
418+
await menu.findContent('label .test-filter-menu-value', /^$/).click();
419419
await menu.findContent('label', /#TypeError/).click();
420420
await menu.findContent('label', /25\.0/).click();
421421
await menu.findContent('label', /36\.0/).click();
@@ -495,7 +495,7 @@ describe('SectionFilter', function() {
495495
{ checked: true, value: 'carol', count: 2 }
496496
]);
497497

498-
await menu.findContent('label', /^$/).click();
498+
await menu.findContent('label .test-filter-menu-value', /^$/).click();
499499
await menu.findContent('label', /bob/).click();
500500
await menu.findContent('label', /#Invalid RefList: \[u'0'\]/).click();
501501

‎test/nbrowser/gristUtils.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3229,7 +3229,7 @@ const filterController = {
32293229
return this;
32303230
},
32313231
async labels() {
3232-
return await driver.findAll('.test-filter-menu-list label', el => el.getText());
3232+
return await driver.findAll('.test-filter-menu-list .test-filter-menu-value', el => el.getText());
32333233
},
32343234
async allShown() {
32353235
await driver.findContent('.test-filter-menu-bulk-action', /All Shown/).click();
@@ -3334,8 +3334,8 @@ export async function getFilterMenuState(): Promise<FilterMenuValue[]> {
33343334
const items = await driver.findAll('.test-filter-menu-list > *');
33353335
return await Promise.all(items.map(async item => {
33363336
const checked = (await item.find('input').getAttribute('checked')) === null ? false : true;
3337-
const value = await item.find('label').getText();
3338-
const count = parseInt(await item.find('label + div').getText(), 10);
3337+
const value = await item.find('.test-filter-menu-value').getText();
3338+
const count = parseInt(await item.find('.test-filter-menu-count').getText(), 10);
33393339
return {checked, value, count};
33403340
}));
33413341
}

‎test/projects/ColumnFilterMenu.ts‎

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -252,7 +252,7 @@ describe('ColumnFilterMenu', function() {
252252
it('should filter items by search value', async () => {
253253
// Check that all items are displayed in the list
254254
assert.equal(await driver.find('.fixture-json').getText(), JSON.stringify({excluded: []}));
255-
assert.lengthOf(await driver.findAll('.test-filter-menu-list label'), 17);
255+
assert.lengthOf(await driver.findAll('.test-filter-menu-list .test-filter-menu-value'), 17);
256256

257257
// Enter 'App'
258258
const searchInput = await driver.find('.test-filter-menu-search-input');
@@ -262,7 +262,7 @@ describe('ColumnFilterMenu', function() {
262262
assert.equal(await searchInput.value(), 'App');
263263

264264
// Check that only Apples and Knapples are in the list
265-
const elems = await driver.findAll('.test-filter-menu-list label');
265+
const elems = await driver.findAll('.test-filter-menu-list .test-filter-menu-value');
266266
assert.lengthOf(elems, 2);
267267
assert.deepEqual(await Promise.all(elems.map(el => el.getText())), ['Apples', 'Knapples']);
268268

@@ -292,7 +292,9 @@ describe('ColumnFilterMenu', function() {
292292
await driver.sendKeys('Oranges');
293293

294294
// check only one matching value
295-
assert.deepEqual(await driver.findAll('.test-filter-menu-list label', (e) => e.getText()), ['Oranges']);
295+
assert.deepEqual(
296+
await driver.findAll('.test-filter-menu-list .test-filter-menu-value', (e) => e.getText()), ['Oranges']
297+
);
296298

297299
// check 'Oranges' count is 14
298300
assert.deepEqual(await driver.findAll('.test-filter-menu-list .test-filter-menu-count', (e) => e.getText()),
@@ -313,7 +315,9 @@ describe('ColumnFilterMenu', function() {
313315
await driver.sendKeys('App');
314316

315317
// check Apples and Knapples are visible
316-
assert.deepEqual(await driver.findAll('.test-filter-menu-list label', (e) => e.getText()), ['Apples', 'Knapples']);
318+
assert.deepEqual(
319+
await driver.findAll('.test-filter-menu-list .test-filter-menu-value', (e) => e.getText()), ['Apples', 'Knapples']
320+
);
317321

318322
// check Others is checked
319323
assert.isTrue(await driver.findContent('.test-filter-menu-summary', /Others/).find('input').isSelected());
@@ -339,7 +343,9 @@ describe('ColumnFilterMenu', function() {
339343
await driver.sendKeys('App');
340344

341345
// check Apples and Knapples are visible
342-
assert.deepEqual(await driver.findAll('.test-filter-menu-list label', (e) => e.getText()), ['Apples', 'Knapples']);
346+
assert.deepEqual(
347+
await driver.findAll('.test-filter-menu-list .test-filter-menu-value', (e) => e.getText()), ['Apples', 'Knapples']
348+
);
343349

344350
// check others is checked
345351
assert.isTrue(await driver.findContent('.test-filter-menu-summary', /Others/).find('input').isSelected());
@@ -409,7 +415,9 @@ describe('ColumnFilterMenu', function() {
409415
await driver.sendKeys('App');
410416

411417
// check values are filtered
412-
assert.deepEqual(await menu.findAll('.test-filter-menu-list label', (e) => e.getText()), ['Apples', 'Knapples']);
418+
assert.deepEqual(
419+
await menu.findAll('.test-filter-menu-list .test-filter-menu-value', (e) => e.getText()), ['Apples', 'Knapples']
420+
);
413421
});
414422

415423
it('should properly escape search and filter menu', async () => {

0 commit comments

Comments
 (0)