Paul Fitzpatrick
10 months ago
commit
7256e0c245
@ -0,0 +1,223 @@
|
||||
/**
|
||||
* Utilities that simplify writing browser tests against Grist, which
|
||||
* have only mocha-webdriver as a code dependency. Separated out to
|
||||
* make easier to borrow for grist-widget repo.
|
||||
*
|
||||
* If you are seeing this code outside the grist-core repo, please don't
|
||||
* edit it, it is just a copy and local changes will prevent updating it
|
||||
* easily.
|
||||
*/
|
||||
|
||||
import { WebDriver, WebElement } from 'mocha-webdriver';
|
||||
|
||||
type SectionTypes = 'Table'|'Card'|'Card List'|'Chart'|'Custom';
|
||||
|
||||
export class GristWebDriverUtils {
|
||||
public constructor(public driver: WebDriver) {
|
||||
}
|
||||
|
||||
public isSidePanelOpen(which: 'right'|'left'): Promise<boolean> {
|
||||
return this.driver.find(`.test-${which}-panel`).matches('[class*=-open]');
|
||||
}
|
||||
|
||||
/**
|
||||
* Waits for all pending comm requests from the client to the doc worker to complete. This taps into
|
||||
* Grist's communication object in the browser to get the count of pending requests.
|
||||
*
|
||||
* Simply call this after some request has been made, and when it resolves, you know that request
|
||||
* has been processed.
|
||||
* @param optTimeout: Timeout in ms, defaults to 2000.
|
||||
*/
|
||||
public async waitForServer(optTimeout: number = 2000) {
|
||||
await this.driver.wait(() => this.driver.executeScript(
|
||||
"return window.gristApp && (!window.gristApp.comm || !window.gristApp.comm.hasActiveRequests())"
|
||||
+ " && window.gristApp.testNumPendingApiRequests() === 0",
|
||||
optTimeout,
|
||||
"Timed out waiting for server requests to complete"
|
||||
));
|
||||
}
|
||||
|
||||
public async waitForSidePanel() {
|
||||
// 0.4 is the duration of the transition setup in app/client/ui/PagePanels.ts for opening the
|
||||
// side panes
|
||||
const transitionDuration = 0.4;
|
||||
|
||||
// let's add an extra delay of 0.1 for even more robustness
|
||||
const delta = 0.1;
|
||||
await this.driver.sleep((transitionDuration + delta) * 1000);
|
||||
}
|
||||
|
||||
/*
|
||||
* Toggles (opens or closes) the right or left panel and wait for the transition to complete. An optional
|
||||
* argument can specify the desired state.
|
||||
*/
|
||||
public async toggleSidePanel(which: 'right'|'left', goal: 'open'|'close'|'toggle' = 'toggle') {
|
||||
if ((goal === 'open' && await this.isSidePanelOpen(which)) ||
|
||||
(goal === 'close' && !await this.isSidePanelOpen(which))) {
|
||||
return;
|
||||
}
|
||||
|
||||
// Adds '-ns' when narrow screen
|
||||
const suffix = (await this.getWindowDimensions()).width < 768 ? '-ns' : '';
|
||||
|
||||
// click the opener and wait for the duration of the transition
|
||||
await this.driver.find(`.test-${which}-opener${suffix}`).doClick();
|
||||
await this.waitForSidePanel();
|
||||
}
|
||||
|
||||
/**
|
||||
* Gets browser window dimensions.
|
||||
*/
|
||||
public async getWindowDimensions(): Promise<WindowDimensions> {
|
||||
const {width, height} = await this.driver.manage().window().getRect();
|
||||
return {width, height};
|
||||
}
|
||||
|
||||
|
||||
// Add a new widget to the current page using the 'Add New' menu.
|
||||
public async addNewSection(
|
||||
typeRe: RegExp|SectionTypes, tableRe: RegExp|string, options?: PageWidgetPickerOptions
|
||||
) {
|
||||
// Click the 'Add widget to page' entry in the 'Add New' menu
|
||||
await this.driver.findWait('.test-dp-add-new', 2000).doClick();
|
||||
await this.driver.findWait('.test-dp-add-widget-to-page', 500).doClick();
|
||||
|
||||
// add widget
|
||||
await this.selectWidget(typeRe, tableRe, options);
|
||||
}
|
||||
|
||||
// Select type and table that matches respectively typeRe and tableRe and save. The widget picker
|
||||
// must be already opened when calling this function.
|
||||
public async selectWidget(
|
||||
typeRe: RegExp|string,
|
||||
tableRe: RegExp|string = '',
|
||||
options: PageWidgetPickerOptions = {}
|
||||
) {
|
||||
const driver = this.driver;
|
||||
if (options.dismissTips) { await this.dismissBehavioralPrompts(); }
|
||||
|
||||
// select right type
|
||||
await driver.findContent('.test-wselect-type', typeRe).doClick();
|
||||
|
||||
if (options.dismissTips) { await this.dismissBehavioralPrompts(); }
|
||||
|
||||
if (tableRe) {
|
||||
const tableEl = driver.findContent('.test-wselect-table', tableRe);
|
||||
|
||||
// unselect all selected columns
|
||||
for (const col of (await driver.findAll('.test-wselect-column[class*=-selected]'))) {
|
||||
await col.click();
|
||||
}
|
||||
|
||||
// let's select table
|
||||
await tableEl.click();
|
||||
|
||||
if (options.dismissTips) { await this.dismissBehavioralPrompts(); }
|
||||
|
||||
const pivotEl = tableEl.find('.test-wselect-pivot');
|
||||
if (await pivotEl.isPresent()) {
|
||||
await this.toggleSelectable(pivotEl, Boolean(options.summarize));
|
||||
}
|
||||
|
||||
if (options.summarize) {
|
||||
for (const columnEl of await driver.findAll('.test-wselect-column')) {
|
||||
const label = await columnEl.getText();
|
||||
// TODO: Matching cols with regexp calls for trouble and adds no value. I think function should be
|
||||
// rewritten using string matching only.
|
||||
const goal = Boolean(options.summarize.find(r => label.match(r)));
|
||||
await this.toggleSelectable(columnEl, goal);
|
||||
}
|
||||
}
|
||||
|
||||
if (options.selectBy) {
|
||||
// select link
|
||||
await driver.find('.test-wselect-selectby').doClick();
|
||||
await driver.findContent('.test-wselect-selectby option', options.selectBy).doClick();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
if (options.dontAdd) {
|
||||
return;
|
||||
}
|
||||
|
||||
// add the widget
|
||||
await driver.find('.test-wselect-addBtn').doClick();
|
||||
|
||||
// if we selected a new table, there will be a popup for a name
|
||||
const prompts = await driver.findAll(".test-modal-prompt");
|
||||
const prompt = prompts[0];
|
||||
if (prompt) {
|
||||
if (options.tableName) {
|
||||
await prompt.doClear();
|
||||
await prompt.click();
|
||||
await driver.sendKeys(options.tableName);
|
||||
}
|
||||
await driver.find(".test-modal-confirm").click();
|
||||
}
|
||||
|
||||
await this.waitForServer();
|
||||
}
|
||||
|
||||
/**
|
||||
* Dismisses all behavioral prompts that are present.
|
||||
*/
|
||||
public async dismissBehavioralPrompts() {
|
||||
let i = 0;
|
||||
const max = 10;
|
||||
|
||||
// Keep dismissing prompts until there are no more, up to a maximum of 10 times.
|
||||
while (i < max && await this.driver.find('.test-behavioral-prompt').isPresent()) {
|
||||
await this.driver.find('.test-behavioral-prompt-dismiss').click();
|
||||
await this.waitForServer();
|
||||
i += 1;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Toggle elem if not selected. Expects elem to be clickable and to have a class ending with
|
||||
* -selected when selected.
|
||||
*/
|
||||
public async toggleSelectable(elem: WebElement, goal: boolean) {
|
||||
const isSelected = await elem.matches('[class*=-selected]');
|
||||
if (goal !== isSelected) {
|
||||
await elem.click();
|
||||
}
|
||||
}
|
||||
|
||||
public async waitToPass(check: () => Promise<void>, timeMs: number = 4000) {
|
||||
try {
|
||||
let delay: number = 10;
|
||||
await this.driver.wait(async () => {
|
||||
try {
|
||||
await check();
|
||||
} catch (e) {
|
||||
// Throttle operations a little bit.
|
||||
await this.driver.sleep(delay);
|
||||
if (delay < 50) { delay += 10; }
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
}, timeMs);
|
||||
} catch (e) {
|
||||
await check();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
export interface WindowDimensions {
|
||||
width: number;
|
||||
height: number;
|
||||
}
|
||||
|
||||
export interface PageWidgetPickerOptions {
|
||||
tableName?: string;
|
||||
/** Optional pattern of SELECT BY option to pick. */
|
||||
selectBy?: RegExp|string;
|
||||
/** Optional list of patterns to match Group By columns. */
|
||||
summarize?: (RegExp|string)[];
|
||||
/** If true, configure the widget selection without actually adding to the page. */
|
||||
dontAdd?: boolean;
|
||||
/** If true, dismiss any tooltips that are shown. */
|
||||
dismissTips?: boolean;
|
||||
}
|
||||
@ -0,0 +1,157 @@
|
||||
import * as minio from "minio";
|
||||
import sinon from "sinon";
|
||||
import * as stream from "node:stream";
|
||||
|
||||
import {MinIOExternalStorage} from "app/server/lib/MinIOExternalStorage";
|
||||
import {assert} from "chai";
|
||||
|
||||
describe("MinIOExternalStorage", function () {
|
||||
const sandbox = sinon.createSandbox();
|
||||
const FakeClientClass = class extends minio.Client {
|
||||
public listObjects(
|
||||
bucket: string,
|
||||
key: string,
|
||||
recursive: boolean,
|
||||
options?: {IncludeVersion?: boolean}
|
||||
): minio.BucketStream<minio.BucketItem> {
|
||||
return new stream.Readable();
|
||||
}
|
||||
};
|
||||
const dummyBucket = 'some-bucket';
|
||||
const dummyOptions = {
|
||||
endPoint: 'some-endpoint',
|
||||
accessKey: 'some-accessKey',
|
||||
secretKey: 'some-secretKey',
|
||||
region: 'some-region',
|
||||
};
|
||||
afterEach(function () {
|
||||
sandbox.restore();
|
||||
});
|
||||
|
||||
describe('versions()', function () {
|
||||
function makeFakeStream(listedObjects: object[]) {
|
||||
const fakeStream = new stream.Readable({objectMode: true});
|
||||
const readSpy = sandbox.stub(fakeStream, "_read");
|
||||
for (const [index, obj] of listedObjects.entries()) {
|
||||
readSpy.onCall(index).callsFake(() => fakeStream.push(obj));
|
||||
}
|
||||
readSpy.onCall(listedObjects.length).callsFake(() => fakeStream.push(null));
|
||||
return {fakeStream, readSpy};
|
||||
}
|
||||
|
||||
it("should call listObjects with the right arguments", async function () {
|
||||
const s3 = sandbox.createStubInstance(FakeClientClass);
|
||||
const key = "some-key";
|
||||
const expectedRecursive = false;
|
||||
const expectedOptions = {IncludeVersion: true};
|
||||
const {fakeStream} = makeFakeStream([]);
|
||||
|
||||
s3.listObjects.returns(fakeStream);
|
||||
|
||||
const extStorage = new MinIOExternalStorage(dummyBucket, dummyOptions, 42, s3);
|
||||
const result = await extStorage.versions(key);
|
||||
|
||||
assert.deepEqual(result, []);
|
||||
assert.isTrue(s3.listObjects.calledWith(dummyBucket, key, expectedRecursive, expectedOptions));
|
||||
});
|
||||
|
||||
// This test can be removed once this PR is merged: https://github.com/minio/minio-js/pull/1193
|
||||
// and when the minio-js version used as a dependency includes that patch.
|
||||
//
|
||||
// For more context: https://github.com/gristlabs/grist-core/pull/577
|
||||
it("should return versionId's as string when return snapshotId is an integer", async function () {
|
||||
// given
|
||||
const s3 = sandbox.createStubInstance(FakeClientClass);
|
||||
const key = "some-key";
|
||||
const versionId = 123;
|
||||
const lastModified = new Date();
|
||||
const {fakeStream, readSpy} = makeFakeStream([
|
||||
{
|
||||
name: key,
|
||||
lastModified,
|
||||
versionId,
|
||||
}
|
||||
]);
|
||||
|
||||
s3.listObjects.returns(fakeStream);
|
||||
const extStorage = new MinIOExternalStorage(dummyBucket, dummyOptions, 42, s3);
|
||||
// when
|
||||
const result = await extStorage.versions(key);
|
||||
// then
|
||||
assert.equal(readSpy.callCount, 2);
|
||||
assert.deepEqual(result, [{
|
||||
lastModified: lastModified.toISOString(),
|
||||
snapshotId: String(versionId)
|
||||
}]);
|
||||
});
|
||||
|
||||
it("should include markers only when asked through options", async function () {
|
||||
// given
|
||||
const s3 = sandbox.createStubInstance(FakeClientClass);
|
||||
const key = "some-key";
|
||||
const lastModified = new Date();
|
||||
const objectsFromS3 = [
|
||||
{
|
||||
name: key,
|
||||
lastModified,
|
||||
versionId: 'regular-version-uuid',
|
||||
isDeleteMarker: false
|
||||
},
|
||||
{
|
||||
name: key,
|
||||
lastModified,
|
||||
versionId: 'delete-marker-version-uuid',
|
||||
isDeleteMarker: true
|
||||
}
|
||||
];
|
||||
let {fakeStream} = makeFakeStream(objectsFromS3);
|
||||
|
||||
s3.listObjects.returns(fakeStream);
|
||||
const extStorage = new MinIOExternalStorage(dummyBucket, dummyOptions, 42, s3);
|
||||
|
||||
// when
|
||||
const result = await extStorage.versions(key);
|
||||
|
||||
// then
|
||||
assert.deepEqual(result, [{
|
||||
lastModified: lastModified.toISOString(),
|
||||
snapshotId: objectsFromS3[0].versionId
|
||||
}]);
|
||||
|
||||
// given
|
||||
fakeStream = makeFakeStream(objectsFromS3).fakeStream;
|
||||
s3.listObjects.returns(fakeStream);
|
||||
|
||||
// when
|
||||
const resultWithDeleteMarkers = await extStorage.versions(key, {includeDeleteMarkers: true});
|
||||
|
||||
// then
|
||||
assert.deepEqual(resultWithDeleteMarkers, [{
|
||||
lastModified: lastModified.toISOString(),
|
||||
snapshotId: objectsFromS3[0].versionId
|
||||
}, {
|
||||
lastModified: lastModified.toISOString(),
|
||||
snapshotId: objectsFromS3[1].versionId
|
||||
}]);
|
||||
});
|
||||
|
||||
it("should reject when an error occurs while listing objects", function () {
|
||||
// given
|
||||
const s3 = sandbox.createStubInstance(FakeClientClass);
|
||||
const key = "some-key";
|
||||
const fakeStream = new stream.Readable({objectMode: true});
|
||||
const error = new Error("dummy-error");
|
||||
sandbox.stub(fakeStream, "_read")
|
||||
.returns(fakeStream)
|
||||
.callsFake(() => fakeStream.emit('error', error));
|
||||
s3.listObjects.returns(fakeStream);
|
||||
const extStorage = new MinIOExternalStorage(dummyBucket, dummyOptions, 42, s3);
|
||||
|
||||
// when
|
||||
const result = extStorage.versions(key);
|
||||
|
||||
// then
|
||||
return assert.isRejected(result, error);
|
||||
});
|
||||
});
|
||||
});
|
||||
Loading…
Reference in new issue