Archives/gristlabs_grist-core
1
0
Fork 0
mirror of https://github.com/gristlabs/grist-core.git synced 2024-10-27 20:44:07 +00:00
Code Issues Projects Releases Wiki Activity

avoid test files importing other test files (#550)

Browse Source 
There's a little nest of SelectBy tests that sometimes fail.
They are the only tests with an import of a helper function from
an other file that contains tests. Such imports have caused trouble
with mocha in the past. I'm not sure if that is the case now, but
I'd like to eliminate it as a possibility.
This commit is contained in:
Paul Fitzpatrick 2023-06-29 08:15:14 +01:00 committed by GitHub
parent 01069a69b0
commit 230e84f48a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 19 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
test/nbrowser/RightPanelSelectBy.ts
View File

@ -12,9 +12,6 @@ describe('RightPanelSelectBy', function() {
const doc = await gu.importFixturesDoc('chimpy', 'nasa', 'Horizon', 'Favorite_Films_With_Linked_Ref.grist', false); const doc = await gu.importFixturesDoc('chimpy', 'nasa', 'Horizon', 'Favorite_Films_With_Linked_Ref.grist', false);
await driver.get(`${server.getHost()}/o/nasa/doc/${doc.id}`); await driver.get(`${server.getHost()}/o/nasa/doc/${doc.id}`);
await gu.waitForDocToLoad(); await gu.waitForDocToLoad();
await gu.toggleSidePanel('right', 'open');
await driver.find('.test-config-data').click();
} }
it('should allow linking section with same table', async function() { it('should allow linking section with same table', async function() {
@ -24,7 +21,7 @@ describe('RightPanelSelectBy', function() {
await driver.findContentWait('.test-treeview-itemHeader', /All/, 2000).click(); await driver.findContentWait('.test-treeview-itemHeader', /All/, 2000).click();
await gu.waitForDocToLoad(); await gu.waitForDocToLoad();
await openSelectByForSection('PERFORMANCES DETAIL'); await gu.openSelectByForSection('PERFORMANCES DETAIL');
// the dollar in /...record$/ makes sure we match against the table main node and not a ref // the dollar in /...record$/ makes sure we match against the table main node and not a ref
// columns such as '...record.Film' // columns such as '...record.Film'
@ -52,7 +49,7 @@ describe('RightPanelSelectBy', function() {
}); });
it('should allow to remove link', async function() { it('should allow to remove link', async function() {
await openSelectByForSection('PERFORMANCES DETAIL'); await gu.openSelectByForSection('PERFORMANCES DETAIL');
await driver.findContent('.test-select-row', /Select Widget/).click(); await driver.findContent('.test-select-row', /Select Widget/).click();
await gu.waitForServer(); await gu.waitForServer();
@ -67,7 +64,7 @@ describe('RightPanelSelectBy', function() {
it('should disallow creating cycles', async function() { it('should disallow creating cycles', async function() {
await openSelectByForSection('PERFORMANCES RECORD'); await gu.openSelectByForSection('PERFORMANCES RECORD');
assert.equal(await driver.findContent('.test-select-row', /Performances detail/).isPresent(), false); assert.equal(await driver.findContent('.test-select-row', /Performances detail/).isPresent(), false);
}); });
@ -81,7 +78,7 @@ describe('RightPanelSelectBy', function() {
await gu.addNewSection(/Chart/, /Films/); await gu.addNewSection(/Chart/, /Films/);
// open `SELECT BY` // open `SELECT BY`
await openSelectByForSection('FILMS'); await gu.openSelectByForSection('FILMS');
// check that there is a chart and we cannot link from it // check that there is a chart and we cannot link from it
assert.equal(await gu.getSection('FILMS CHART').isPresent(), true); assert.equal(await gu.getSection('FILMS CHART').isPresent(), true);
@ -96,7 +93,7 @@ describe('RightPanelSelectBy', function() {
await gu.getPageItem('Friends').click(); await gu.getPageItem('Friends').click();
await gu.waitForServer(); await gu.waitForServer();
await gu.addNewSection(/Table/, /Performances/); await gu.addNewSection(/Table/, /Performances/);
await openSelectByForSection('Performances'); await gu.openSelectByForSection('Performances');
assert.equal(await driver.findContent('.test-select-row', /FRIENDS.*Favorite Film/).isPresent(), true); assert.equal(await driver.findContent('.test-select-row', /FRIENDS.*Favorite Film/).isPresent(), true);
await driver.findContent('.test-select-row', /FRIENDS.*Favorite Film/).click(); await driver.findContent('.test-select-row', /FRIENDS.*Favorite Film/).click();
await gu.waitForServer(); await gu.waitForServer();
@ -135,7 +132,7 @@ describe('RightPanelSelectBy', function() {
await gu.getPageItem('Friends').click(); await gu.getPageItem('Friends').click();
await gu.waitForServer(); await gu.waitForServer();
await gu.addNewSection(/Card/, /Films/); await gu.addNewSection(/Card/, /Films/);
await openSelectByForSection('Films Card'); await gu.openSelectByForSection('Films Card');
assert.equal(await driver.findContent('.test-select-row', /FRIENDS.*Favorite Film/).isPresent(), true); assert.equal(await driver.findContent('.test-select-row', /FRIENDS.*Favorite Film/).isPresent(), true);
await driver.findContent('.test-select-row', /FRIENDS.*Favorite Film/).click(); await driver.findContent('.test-select-row', /FRIENDS.*Favorite Film/).click();
await gu.waitForServer(); await gu.waitForServer();
@ -194,8 +191,3 @@ describe('RightPanelSelectBy', function() {
}); });
}); });
export async function openSelectByForSection(section: string) {
await gu.getSection(section).click();
await driver.find('.test-right-select-by').click();
}

6
test/nbrowser/SelectByRefList.ts
View File

@ -2,7 +2,6 @@ import * as _ from 'lodash';
import {addToRepl, assert, driver} from 'mocha-webdriver'; import {addToRepl, assert, driver} from 'mocha-webdriver';
import * as gu from 'test/nbrowser/gristUtils'; import * as gu from 'test/nbrowser/gristUtils';
import {server, setupTestSuite} from 'test/nbrowser/testUtils'; import {server, setupTestSuite} from 'test/nbrowser/testUtils';
import {openSelectByForSection} from "./RightPanelSelectBy";
describe('SelectByRefList', function() { describe('SelectByRefList', function() {
this.timeout(60000); this.timeout(60000);
@ -16,9 +15,6 @@ describe('SelectByRefList', function() {
'SelectByRefList.grist', false); 'SelectByRefList.grist', false);
await driver.get(`${server.getHost()}/o/nasa/doc/${doc.id}`); await driver.get(`${server.getHost()}/o/nasa/doc/${doc.id}`);
await gu.waitForDocToLoad(); await gu.waitForDocToLoad();
await gu.toggleSidePanel('right');
await driver.find('.test-config-data').click();
} }
it('should filter a table selected by ref and reflist columns', async function() { it('should filter a table selected by ref and reflist columns', async function() {
@ -182,7 +178,7 @@ describe('SelectByRefList', function() {
* The values will depend on the link and the last row selected in the driving table. * The values will depend on the link and the last row selected in the driving table.
*/ */
async function checkSelectingRecords(selectBy: string, sourceData: string[][], newRow: string[]) { async function checkSelectingRecords(selectBy: string, sourceData: string[][], newRow: string[]) {
await openSelectByForSection('LINKTARGET'); await gu.openSelectByForSection('LINKTARGET');
await driver.findContent('.test-select-row', new RegExp(selectBy + '$')).click(); await driver.findContent('.test-select-row', new RegExp(selectBy + '$')).click();
await gu.waitForServer(); await gu.waitForServer();

6
test/nbrowser/SelectBySummary.ts
View File

@ -3,7 +3,6 @@ import {addToRepl, assert, driver} from 'mocha-webdriver';
import {enterRulePart, findDefaultRuleSet} from 'test/nbrowser/aclTestUtils'; import {enterRulePart, findDefaultRuleSet} from 'test/nbrowser/aclTestUtils';
import * as gu from 'test/nbrowser/gristUtils'; import * as gu from 'test/nbrowser/gristUtils';
import {server, setupTestSuite} from 'test/nbrowser/testUtils'; import {server, setupTestSuite} from 'test/nbrowser/testUtils';
import {openSelectByForSection} from "./RightPanelSelectBy";
describe('SelectBySummary', function() { describe('SelectBySummary', function() {
this.timeout(50000); this.timeout(50000);
@ -17,9 +16,6 @@ describe('SelectBySummary', function() {
'SelectBySummary.grist', false); 'SelectBySummary.grist', false);
await driver.get(`${server.getHost()}/o/nasa/doc/${doc.id}`); await driver.get(`${server.getHost()}/o/nasa/doc/${doc.id}`);
await gu.waitForDocToLoad(); await gu.waitForDocToLoad();
await gu.toggleSidePanel('right', 'open');
await driver.find('.test-config-data').click();
}); });
it('should filter a source table selected by a summary table', async function() { it('should filter a source table selected by a summary table', async function() {
@ -219,7 +215,7 @@ async function checkSelectingRecords(
) { ) {
const summarySection = `TABLE1 [by ${groubyColumns.join(', ')}]`; const summarySection = `TABLE1 [by ${groubyColumns.join(', ')}]`;
await openSelectByForSection(targetSection); await gu.openSelectByForSection(targetSection);
await driver.findContent('.test-select-row', summarySection).click(); await driver.findContent('.test-select-row', summarySection).click();
await gu.waitForServer(); await gu.waitForServer();

6
test/nbrowser/SelectBySummaryRef.ts
View File

@ -1,7 +1,6 @@
import {addToRepl, assert, driver, Key} from 'mocha-webdriver'; import {addToRepl, assert, driver, Key} from 'mocha-webdriver';
import * as gu from 'test/nbrowser/gristUtils'; import * as gu from 'test/nbrowser/gristUtils';
import {server, setupTestSuite} from 'test/nbrowser/testUtils'; import {server, setupTestSuite} from 'test/nbrowser/testUtils';
import {openSelectByForSection} from "./RightPanelSelectBy";
describe('SelectBySummaryRef', function() { describe('SelectBySummaryRef', function() {
this.timeout(20000); this.timeout(20000);
@ -14,9 +13,6 @@ describe('SelectBySummaryRef', function() {
'SelectBySummaryRef.grist', false); 'SelectBySummaryRef.grist', false);
await driver.get(`${server.getHost()}/o/nasa/doc/${doc.id}`); await driver.get(`${server.getHost()}/o/nasa/doc/${doc.id}`);
await gu.waitForDocToLoad(); await gu.waitForDocToLoad();
await gu.toggleSidePanel('right', 'open');
await driver.find('.test-config-data').click();
}); });
it('should give correct options when linking with a summary table with ref/reflist columns', async () => { it('should give correct options when linking with a summary table with ref/reflist columns', async () => {
@ -174,7 +170,7 @@ describe('SelectBySummaryRef', function() {
// Check that the 'Select by' menu in the right panel for the section has the expected options // Check that the 'Select by' menu in the right panel for the section has the expected options
async function checkRightPanelSelectByOptions(section: string, expected: string[]) { async function checkRightPanelSelectByOptions(section: string, expected: string[]) {
await openSelectByForSection(section); await gu.openSelectByForSection(section);
const actual = await driver.findAll('.test-select-menu .test-select-row', (e) => e.getText()); const actual = await driver.findAll('.test-select-menu .test-select-row', (e) => e.getText());
assert.deepEqual(actual, ['Select Widget', ...expected]); assert.deepEqual(actual, ['Select Widget', ...expected]);

10
test/nbrowser/gristUtils.ts
View File

@ -1759,6 +1759,16 @@ export async function openAccessRulesDropdown(): Promise<void> {
await driver.findWait('.grist-floating-menu', 1000); await driver.findWait('.grist-floating-menu', 1000);
} }
/**
* Open "Select By" area in creator panel.
*/
export async function openSelectByForSection(section: string) {
await toggleSidePanel('right', 'open');
await driver.find('.test-config-data').click();
await getSection(section).click();
await driver.find('.test-right-select-by').click();
}
export async function editOrgAcls(): Promise<void> { export async function editOrgAcls(): Promise<void> {
// To prevent a common flakiness problem, wait for a potentially open modal dialog // To prevent a common flakiness problem, wait for a potentially open modal dialog
// to close before attempting to open the account menu. // to close before attempting to open the account menu.