Skip to content
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

Refactor/improve provisioning api tests #354

Merged
merged 7 commits into from
Mar 18, 2020
Merged

Refactor/improve provisioning api tests #354

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
71cebb2
Refactor out a duplicate test
patrick-tolosa Mar 10, 2020
01430b9
improve provisioning api tests for GET sub_accounts
patrick-tolosa Mar 10, 2020
10f4098
Merge branch 'master' into refactor/improve-provisioning-api-tests
patrick-tolosa Mar 10, 2020
2dc8343
Merge branch 'master' into refactor/improve-provisioning-api-tests
patrick-tolosa Mar 10, 2020
40c1c98
Fix prefix name in update sub account
patrick-tolosa Mar 10, 2020
0094a4f
improve the atomic-ness of the provisioning test
patrick-tolosa Mar 11, 2020
82ea837
refactor test file - extract cloud_name and name to a variable
patrick-tolosa Mar 12, 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
24 changes: 21 additions & 3 deletions test/provisioning/account_spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ describe('account API - Provisioning', function () {
let USER_ROLE = 'billing';
let USER_ID;
let GROUP_ID;
let CLOUD_NAME_PREFIX = `justaname${process.hrtime()[1] % 10000}`;
this.timeout(helper.TIMEOUT_LONG);

before("Setup the required test", async function () {
Expand All @@ -24,14 +25,15 @@ describe('account API - Provisioning', function () {
expect().fail("Missing key and secret. Please set CLOUDINARY_ACCOUNT_URL.");
}

let CLOUD_TO_CREATE = CLOUD_NAME_PREFIX + Date.now();
// Create a sub account(sub cloud)
let res = await cloudinary.provisioning.account.create_sub_account('jutaname' + Date.now(), 'jutaname' + Date.now(), {}, true).catch((err) => {
let res = await cloudinary.provisioning.account.create_sub_account(CLOUD_TO_CREATE, CLOUD_TO_CREATE, {}, true).catch((err) => {
throw err;
});

CLOUD_API = res.api_access_keys[0].key;
CLOUD_SECRET = res.api_access_keys[0].secret;
CLOUD_NAME = res.api_access_keys.cloud_name;
CLOUD_NAME = res.cloud_name;
CLOUD_ID = res.id;

let createUser = await cloudinary.provisioning.account.create_user(USER_NAME, USER_EMAIL, USER_ROLE, []).catch((err) => {
Expand Down Expand Up @@ -73,7 +75,7 @@ describe('account API - Provisioning', function () {
});

it('Updates a sub account', async () => {
let NEW_NAME = 'new-test-name';
let NEW_NAME = CLOUD_NAME_PREFIX + Date.now();
await cloudinary.provisioning.account.update_sub_account(CLOUD_ID, NEW_NAME);

let subAccRes = await cloudinary.provisioning.account.sub_account(CLOUD_ID);
Expand All @@ -93,6 +95,22 @@ describe('account API - Provisioning', function () {
});
});

it('Get a specific subAccount', async function () {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@patrick-tolosa , minor, but consistency is important.
In the previous test, it's called 'sub account' in this one 'subAccount' and the in the next 'sub-account'

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like a mistake in the original, I'll open a PR to address it

return cloudinary.provisioning.account.sub_accounts(true, [CLOUD_ID]).then((res) => {
expect(res.sub_accounts.length).to.eql(1);
}).catch((err) => {
throw err;
});
});

it('Get sub-accounts by prefix', async function () {
return cloudinary.provisioning.account.sub_accounts(true, [], CLOUD_NAME_PREFIX).then((res) => {
expect(res.sub_accounts.length).to.eql(1);
}).catch((err) => {
throw err;
});
});

it('Gets a specific subAccount', async function () {
return cloudinary.provisioning.account.sub_account(CLOUD_ID).then((res) => {
expect(res.id).to.eql(CLOUD_ID);
Expand Down