OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix comparing MB -> bytes

pull/21833/head
Jaiwanth 2021-08-03 14:53:23 +05:30
parent 4824c93707
commit b333612dea
2 changed files with 31 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/utils/exportUtils/Exporter.ts
View File

@ -42,7 +42,9 @@ export default abstract class Exporter {
protected exportOptions: IExportOptions, protected exportOptions: IExportOptions,
protected exportProgressRef: MutableRefObject<HTMLParagraphElement>, protected exportProgressRef: MutableRefObject<HTMLParagraphElement>,
) { ) {
if (exportOptions.maxSize < 1 || exportOptions.maxSize > 2000 || exportOptions.numberOfMessages > 10**8) { if (exportOptions.maxSize < 1 * 1024 * 1024||
exportOptions.maxSize > 2000 * 1024 * 1024||
exportOptions.numberOfMessages > 10**8) {
throw new Error("Invalid export options"); throw new Error("Invalid export options");
} }
this.cancelled = false; this.cancelled = false;

49
test/utils/export-test.tsx
View File

@ -16,9 +16,9 @@ limitations under the License.
import { MatrixClient, Room } from "matrix-js-sdk"; import { MatrixClient, Room } from "matrix-js-sdk";
import { MatrixClientPeg } from "../../src/MatrixClientPeg"; import { MatrixClientPeg } from "../../src/MatrixClientPeg";
import { textForFormat } from "../../src/utils/exportUtils/exportUtils"; import { textForFormat, IExportOptions, ExportTypes } from "../../src/utils/exportUtils/exportUtils";
// import HTMLExporter from "../../src/utils/exportUtils/HtmlExport"; import '../skinned-sdk';
// import PlainTextExporter from "../../src/utils/exportUtils/PlainTextExport"; import PlainTextExporter from "../../src/utils/exportUtils/PlainTextExport";
import * as TestUtilsMatrix from '../test-utils'; import * as TestUtilsMatrix from '../test-utils';
import { stubClient } from '../test-utils'; import { stubClient } from '../test-utils';
@ -37,23 +37,23 @@ describe('export', function() {
return MY_USER_ID; return MY_USER_ID;
}; };
// const invalidExportOptions: IExportOptions[] = [ const invalidExportOptions: IExportOptions[] = [
// { {
// numberOfMessages: 10**9, numberOfMessages: 10**9,
// maxSize: 1024, maxSize: 1024 * 1024 * 1024,
// attachmentsIncluded: false, attachmentsIncluded: false,
// }, },
// { {
// numberOfMessages: -1, numberOfMessages: -1,
// maxSize: 4096, maxSize: 4096 * 1024 * 1024,
// attachmentsIncluded: false, attachmentsIncluded: false,
// }, },
// { {
// numberOfMessages: 0, numberOfMessages: 0,
// maxSize: 1024, maxSize: 0,
// attachmentsIncluded: false, attachmentsIncluded: false,
// }, },
// ]; ];
const events = mkEvents(); const events = mkEvents();
const room = createRoom(); const room = createRoom();
@ -88,7 +88,14 @@ describe('export', function() {
}); });
it('checks if the export options are valid', function() { it('checks if the export options are valid', function() {
// const html = new PlainTextExporter(room, ExportTypes.BEGINNING, invalidExportOptions[0], null); for (const exportOption of invalidExportOptions) {
try {
new PlainTextExporter(room, ExportTypes.BEGINNING, exportOption, null);
throw new Error("Expected to throw an error");
} catch (e) {
expect(e.message).toBe("Invalid export options");
}
}
}); });
}); });