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

chore: Move new OAuth e2e tests into 'core' directory #9307

Merged
merged 3 commits into from
Jun 26, 2023
Merged

chore: Move new OAuth e2e tests into 'core' directory #9307

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4e7a8ee
Move OAuth tests to core/account
Jun 23, 2023
4e7a91d
Make '<REDACTED>' default value for OAuth factory, assert secret is s…
Jun 23, 2023
3df02b8
Merge branch 'develop' into move-oauth-tests
Jun 23, 2023
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
11 changes: 8 additions & 3 deletions ...cypress/e2e/profile/add-oauth-app.spec.ts → ...ss/e2e/core/account/add-oauth-app.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import {
mockGetOAuthApps,
} from 'support/intercepts/profile';
import { ui } from 'support/ui';
import { randomLabel } from 'support/util/random';
import { randomLabel, randomSecret } from 'support/util/random';
import { OAuthClient } from '@linode/api-v4/types';

/**
Expand Down Expand Up @@ -104,6 +104,10 @@ const createOAuthApp = (oauthApp: OAuthClient) => {
.findByTitle('Client Secret')
.should('be.visible')
.within(() => {
cy.get('input[id="client-secret"]')
.should('be.visible')
.should('have.value', oauthApp.secret);

ui.button
.findByTitle('I Have Saved My Client Secret')
.should('be.visible')
Expand All @@ -127,9 +131,11 @@ describe('Add OAuth Apps', () => {
const oauthApps = oauthClientFactory.buildList(2);
const privateOauthApp = oauthApps[0];
privateOauthApp.label = randomLabel(5);
privateOauthApp.secret = randomSecret(64);
const publicOauthApp = oauthApps[1];
publicOauthApp.label = randomLabel(5);
publicOauthApp.public = true;
publicOauthApp.secret = randomSecret(64);

interceptGetProfile().as('getProfile');
cy.visitWithLogin('/profile/clients');
Expand All @@ -145,8 +151,7 @@ describe('Add OAuth Apps', () => {
interceptGetProfile().as('getProfile');
mockGetOAuthApps(oauthApps).as('getOAuthApps');
cy.visitWithLogin('/profile/clients');
cy.wait('@getProfile');
cy.wait('@getOAuthApps');
cy.wait(['@getProfile', '@getOAuthApps']);
cy.findByText(privateOauthApp.label)
.closest('tr')
.within(() => {
Expand Down
0 ...ress/e2e/profile/delete-oauth-app.spec.ts → ...e2e/core/account/delete-oauth-app.spec.ts
View file
Open in desktop
File renamed without changes.
0 ...ypress/e2e/profile/edit-oauth-app.spec.ts → ...s/e2e/core/account/edit-oauth-app.spec.ts
View file
Open in desktop
File renamed without changes.
0 ...press/e2e/profile/reset-oauth-app.spec.ts → .../e2e/core/account/reset-oauth-app.spec.ts
View file
Open in desktop
File renamed without changes.
2 changes: 0 additions & 2 deletions packages/manager/cypress/support/api/profile.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,6 @@ export const deleteAllTestOAuthApps = async (): Promise<void> => {
getOAuthClients({ page_size: pageSize, page })
);

console.log(`oauth apps: ${JSON.stringify(oauthApps)}`);

const deletionPromises = oauthApps
.filter((oauthApp: OAuthClient) => isTestLabel(oauthApp.label))
.map(async (oauthApp: OAuthClient) => {
Expand Down
2 changes: 1 addition & 1 deletion packages/manager/src/factories/accountOAuth.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@ export const oauthClientFactory = Factory.Sync.makeFactory<OAuthClient>({
redirect_uri: 'http://localhost:3000/api/auth/callback/linode',
status: 'active',
thumbnail_url: null,
secret: Factory.each((id) => `1a2b3c4d5e6f0123456789abcdef${id}`),
secret: '<REDACTED>',
});