Skip to content

Refactor in a wait period for eager uploads #355

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Mar 16, 2020
Merged

Refactor in a wait period for eager uploads #355

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4a39a28
Refactor in a wait period for eager uploads
patrick-tolosa Mar 10, 2020
3b6f4e9
Add wait for another function
patrick-tolosa Mar 11, 2020
8054704
delete created upload preset in api-spec
patrick-tolosa Mar 11, 2020
32dc395
fix tests
patrick-tolosa Mar 11, 2020
fbc878d
Increase timeout for a test
patrick-tolosa Mar 11, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 16 additions & 2 deletions test/api_spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,14 @@ const LABEL_INT_1 = 'metadata_label_1_' + TEST_ID;
const LABEL_INT_2 = 'metadata_label_2_' + TEST_ID;
const LABEL_INT_3 = 'metadata_label_3_' + TEST_ID;

function wait(ms = 0) {
return new Promise((resolve) => {
setTimeout(() => {
resolve();
}, ms);
});
}

sharedExamples("a list with a cursor", function (testFunc, ...args) {
specify(":max_results", function () {
return helper.mockPromise(function (xhr, writeSpy, requestSpy) {
Expand Down Expand Up @@ -330,7 +338,7 @@ describe("api", function () {
crop: "scale",
},
],
}).then(
}).then(wait(2000)).then(
({ public_id }) => cloudinary.v2.api.resource(public_id)
.then(resource => [public_id, resource])
).then(([public_id, resource]) => {
Expand Down Expand Up @@ -365,7 +373,7 @@ describe("api", function () {
tags: UPLOAD_TAGS,
eager: [EXPLICIT_TRANSFORMATION, EXPLICIT_TRANSFORMATION2],
}),
]).then(() => cloudinary.v2.api.delete_derived_by_transformation(
]).then(wait(4000)).then(() => cloudinary.v2.api.delete_derived_by_transformation(
[PUBLIC_ID_1, PUBLIC_ID_3], [EXPLICIT_TRANSFORMATION, EXPLICIT_TRANSFORMATION2]
)).then(
() => cloudinary.v2.api.resource(PUBLIC_ID_1)
Expand Down Expand Up @@ -671,7 +679,13 @@ describe("api", function () {
unsigned: true,
tags: UPLOAD_TAGS,
live: true
}).then((preset) => {
cloudinary.v2.api.delete_upload_preset(preset.name).catch((err) => {
console.log(err);
// we don't fail the test if the delete fails
});
});

sinon.assert.calledWith(write, sinon.match(helper.apiParamMatcher('unsigned', true, "unsigned=true")));
sinon.assert.calledWith(write, sinon.match(helper.apiParamMatcher('live', true, "live=true")));
});
Expand Down