Skip to content

Commit 6291a3f

Browse files
committed
Merge branch 'alpha' into remove-browserify
2 parents b9639d7 + 86eadbd commit 6291a3f

File tree

12 files changed

+3387
-2717
lines changed

12 files changed

+3387
-2717
lines changed

.gitattributes

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
* text=auto eol=lf
22

33
*.js text
4+
*.ts text
5+
*.mjs text
46
*.html text
57
*.less text
68
*.json text

changelogs/CHANGELOG_alpha.md

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,17 @@
1+
# [6.2.0-alpha.2](https://github.com/parse-community/Parse-SDK-JS/compare/6.2.0-alpha.1...6.2.0-alpha.2) (2025-04-07)
2+
3+
4+
### Bug Fixes
5+
6+
* Missing error message when returning an internal server error ([#2543](https://github.com/parse-community/Parse-SDK-JS/issues/2543)) ([f91f3f1](https://github.com/parse-community/Parse-SDK-JS/commit/f91f3f10f645acf22d6e54379ad21a1701b5ccba))
7+
8+
# [6.2.0-alpha.1](https://github.com/parse-community/Parse-SDK-JS/compare/6.1.1...6.2.0-alpha.1) (2025-04-07)
9+
10+
11+
### Features
12+
13+
* Add `Uint8Array` support for `Parse.File` data ([#2548](https://github.com/parse-community/Parse-SDK-JS/issues/2548)) ([6f6bb66](https://github.com/parse-community/Parse-SDK-JS/commit/6f6bb660204f3b102f8e4167297327bf12e2e2be))
14+
115
# [6.1.0-alpha.5](https://github.com/parse-community/Parse-SDK-JS/compare/6.1.0-alpha.4...6.1.0-alpha.5) (2025-04-02)
216

317

integration/test/ParseDistTest.js

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ for (const fileName of ['parse.js', 'parse.min.js']) {
88
beforeEach(async () => {
99
browser = await puppeteer.launch({
1010
args: ['--disable-web-security', '--incognito', '--no-sandbox'],
11+
devtools: false,
1112
});
1213
const context = await browser.createBrowserContext();
1314
page = await context.newPage();
@@ -42,7 +43,7 @@ for (const fileName of ['parse.js', 'parse.min.js']) {
4243
expect(obj.id).toEqual(response);
4344
});
4445

45-
it('can cancel save file with uri', async () => {
46+
it('can cancel save file', async () => {
4647
let requestsCount = 0;
4748
let abortedCount = 0;
4849
const promise = resolvingPromise();
@@ -63,11 +64,11 @@ for (const fileName of ['parse.js', 'parse.min.js']) {
6364
}
6465
});
6566
await page.evaluate(async () => {
66-
const parseLogo =
67-
'https://raw.githubusercontent.com/parse-community/parse-server/master/.github/parse-server-logo.png';
68-
const file = new Parse.File('parse-server-logo', { uri: parseLogo });
69-
file.save().then(() => {});
70-
67+
const SIZE_10_MB = 10 * 1024 * 1024;
68+
const file = new Parse.File('test_file.txt', new Uint8Array(SIZE_10_MB));
69+
file.save().then(() => {
70+
fail('should not save');
71+
});
7172
return new Promise(resolve => {
7273
const intervalId = setInterval(() => {
7374
if (file._requestTask && typeof file._requestTask.abort === 'function') {

integration/test/ParseSchemaTest.js

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,12 @@ const defaultCLPS = {
2323
delete: { '*': true },
2424
addField: { '*': true },
2525
protectedFields: { '*': [] },
26+
ACL: {
27+
'*': {
28+
read: true,
29+
write: true
30+
}
31+
},
2632
};
2733

2834
describe('Schema', () => {
@@ -320,6 +326,12 @@ describe('Schema', () => {
320326
delete: {},
321327
addField: {},
322328
protectedFields: {},
329+
ACL: {
330+
'*': {
331+
read: true,
332+
write: true
333+
}
334+
},
323335
};
324336
const testSchema = new Parse.Schema('SchemaTest');
325337
let schema = await testSchema.save();

integration/test/ParseUserTest.js

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1047,6 +1047,11 @@ describe('Parse User', () => {
10471047
});
10481048

10491049
it('can link with twitter', async () => {
1050+
const twitterAdapter = require('../../node_modules/parse-server/lib/Adapters/Auth/twitter').default;
1051+
spyOn(twitterAdapter, 'beforeFind').and.callFake(() => {
1052+
return Promise.resolve();
1053+
});
1054+
10501055
const server = await reconfigureServer();
10511056
const twitter = server.config.auth.twitter;
10521057
const spy = spyOn(twitter, 'validateAuthData').and.callThrough();
@@ -1067,6 +1072,11 @@ describe('Parse User', () => {
10671072
});
10681073

10691074
it('can link with twitter and facebook', async () => {
1075+
const twitterAdapter = require('../../node_modules/parse-server/lib/Adapters/Auth/twitter').default;
1076+
spyOn(twitterAdapter, 'beforeFind').and.callFake(() => {
1077+
return Promise.resolve();
1078+
});
1079+
10701080
const server = await reconfigureServer();
10711081
const twitter = server.config.auth.twitter;
10721082
const spy = spyOn(twitter, 'validateAuthData').and.callThrough();

0 commit comments

Comments
 (0)