Skip to content

Commit

Permalink
desktop test and linter
Browse files Browse the repository at this point in the history
  • Loading branch information
@Kacper-RF
Kacper-RF committed Sep 27, 2023
1 parent 9ce135e commit c91d0fc
Show file tree
Hide file tree
Showing 3 changed files with 203 additions and 5 deletions.
2 changes: 1 addition & 1 deletion packages/backend/src/nest/registration/registration.functions.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ export interface RegistrationResponse {
data: ErrorPayload | SuccessfullRegistrarionResponse
}

export const extractPendingCsrs = async (payload: { csrs: string[], certificates: string[] }) => {
export const extractPendingCsrs = async (payload: { csrs: string[]; certificates: string[] }) => {
const certNames: string[] = []
const pendingNames: string[] = []

Expand Down
4 changes: 1 addition & 3 deletions packages/backend/src/nest/registration/registration.service.spec.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,9 +66,7 @@ describe('RegistrationService', () => {
})

// Extract pending csrs should return all csrs if there are no certificates
it('extractPendingCsrs should return all csrs if there are no certificates and csrs do not contain duplicate usernames', () => {

})
it('extractPendingCsrs should return all csrs if there are no certificates and csrs do not contain duplicate usernames', () => {})
// Extract pending csrs should return all csrs if there are certificates, but they do not contain any name that's in csr
// Extract pending csrs should return filtered csrs, excluding those that try to register name that is already in certificate
// Extrand pending csrs should return all csrs if there are no duplicates in requested usernames
Expand Down
202 changes: 201 additions & 1 deletion packages/desktop/src/renderer/components/CreateUsername/CreateUsername.test.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,10 @@ import userEvent from '@testing-library/user-event'
import { screen, waitFor } from '@testing-library/dom'
import { renderComponent } from '../../testUtils/renderComponent'

import CreateUsernameComponent from './CreateUsernameComponent'
import CreateUsernameComponent, { UsernameVariant } from './CreateUsernameComponent'
import { FieldErrors, UsernameErrors } from '../../forms/fieldsErrors'
import { keyFromCertificate, parseCertificate } from '@quiet/identity'
import { UserData } from '@quiet/types'

describe('Create username', () => {
it.each([
Expand Down Expand Up @@ -48,3 +50,201 @@ describe('Create username', () => {
expect(message).toBeVisible()
})
})

describe('Username taken', () => {
const userCertData = {
username: 'userName',
onionAddress: 'nqnw4kc4c77fb47lk52m5l57h4tcxceo7ymxekfn7yh5m66t4jv2olad.onion',
peerId: 'Qmf3ySkYqLET9xtAtDzvAr5Pp3egK1H3C5iJAZm1SpLEp6',
dmPublicKey: '0bfb475810c0e26c9fab590d47c3d60ec533bb3c451596acc3cd4f21602e9ad9',
}

const userCertString =
'MIICaDCCAg6gAwIBAgIGAYBqyuV2MAoGCCqGSM49BAMCMBkxFzAVBgNVBAMTDnF1aWV0Y29tbXVuaXR5MB4XDTEwMTIyODEwMTAxMFoXDTMwMTIyODEwMTAxMFowSTFHMEUGA1UEAxM+bnFudzRrYzRjNzdmYjQ3bGs1Mm01bDU3aDR0Y3hjZW83eW14ZWtmbjd5aDVtNjZ0NGp2Mm9sYWQub25pb24wWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAQZBMmiVmRBRvw+QiL5DYg7WGFUVgA7u90KMpJg4qCaCJJNh7wH2tl0EDsN4FeGmR9AkvtCGd+5vYL0nGcX/oLdo4IBEDCCAQwwCQYDVR0TBAIwADALBgNVHQ8EBAMCAIAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMC8GCSqGSIb3DQEJDAQiBCAL+0dYEMDibJ+rWQ1Hw9YOxTO7PEUVlqzDzU8hYC6a2TAYBgorBgEEAYOMGwIBBAoTCHVzZXJOYW1lMD0GCSsGAQIBDwMBAQQwEy5RbWYzeVNrWXFMRVQ5eHRBdER6dkFyNVBwM2VnSzFIM0M1aUpBWm0xU3BMRXA2MEkGA1UdEQRCMECCPm5xbnc0a2M0Yzc3ZmI0N2xrNTJtNWw1N2g0dGN4Y2VvN3lteGVrZm43eWg1bTY2dDRqdjJvbGFkLm9uaW9uMAoGCCqGSM49BAMCA0gAMEUCIF63rnIq8vd86NT9RHSFj7borwwODqyfE7Pw64tGElpIAiEA5ZDSdrDd8OGf+kv7wxByM1Xgmc5m/aydUk+WorbO3Gg='
const parsedCert = parseCertificate(userCertString)
const userPubKey = keyFromCertificate(parsedCert)

const registeredUsers: Record<string, UserData> = {
[userPubKey]: userCertData,
}
it('renders component ', () => {
const result = renderComponent(
<CreateUsernameComponent
handleClose={() => {}}
open={true}
currentUsername={'jack'}
variant={UsernameVariant.TAKEN}
registeredUsers={registeredUsers}
registerUsername={() => {}}
/>
)
expect(result.baseElement).toMatchInlineSnapshot(`
<body
style="padding-right: 1024px; overflow: hidden;"
>
<div
aria-hidden="true"
/>
<div
class="MuiModal-root css-1vjugmr-MuiModal-root"
role="presentation"
zindex="1300"
>
<div
aria-hidden="true"
class="MuiBackdrop-root css-i9fmh8-MuiBackdrop-root-MuiModal-backdrop"
style="opacity: 1; webkit-transition: opacity 225ms cubic-bezier(0.4, 0, 0.2, 1) 0ms; transition: opacity 225ms cubic-bezier(0.4, 0, 0.2, 1) 0ms;"
/>
<div
data-testid="sentinelStart"
tabindex="0"
/>
<div
class="MuiGrid-root MuiGrid-container MuiGrid-direction-xs-column Modalcentered css-6gh8l0-MuiGrid-root"
tabindex="-1"
>
<div
class="MuiGrid-root MuiGrid-container MuiGrid-item Modalheader ModalheaderBorder css-lx31tv-MuiGrid-root"
>
<div
class="MuiGrid-root MuiGrid-container MuiGrid-item MuiGrid-grid-xs-true css-1r61agb-MuiGrid-root"
>
<div
class="MuiGrid-root MuiGrid-item MuiGrid-grid-xs-true css-1vd824g-MuiGrid-root"
>
<h6
class="MuiTypography-root MuiTypography-subtitle1 MuiTypography-alignCenter Modaltitle Modalbold css-jxzupi-MuiTypography-root"
style="margin-left: 36px;"
>
Username taken
</h6>
</div>
<div
class="MuiGrid-root MuiGrid-item css-13i4rnv-MuiGrid-root"
>
<div
class="MuiGrid-root MuiGrid-container MuiGrid-item Modalactions css-hoc6b0-MuiGrid-root"
data-testid="createUsernameModalActions"
>
<button
class="MuiButtonBase-root MuiIconButton-root IconButtonroot MuiIconButton-sizeMedium css-c8hoqc-MuiButtonBase-root-MuiIconButton-root"
tabindex="0"
type="button"
>
<svg
aria-hidden="true"
class="MuiSvgIcon-root MuiSvgIcon-fontSizeMedium css-i4bv87-MuiSvgIcon-root"
data-testid="ClearIcon"
focusable="false"
viewBox="0 0 24 24"
>
<path
d="M19 6.41 17.59 5 12 10.59 6.41 5 5 6.41 10.59 12 5 17.59 6.41 19 12 13.41 17.59 19 19 17.59 13.41 12z"
/>
</svg>
<span
class="MuiTouchRipple-root css-8je8zh-MuiTouchRipple-root"
/>
</button>
</div>
</div>
</div>
</div>
<div
class="MuiGrid-root MuiGrid-container MuiGrid-item ModalfullPage css-1h16bbz-MuiGrid-root"
>
<div
class="MuiGrid-root MuiGrid-container MuiGrid-item Modalcontent css-1f064cs-MuiGrid-root"
style="width: 600px;"
>
<div
class="MuiGrid-root MuiGrid-container MuiGrid-direction-xs-column css-1j6kke6-MuiGrid-root"
>
<form>
<div
class="MuiGrid-root MuiGrid-container MuiGrid-direction-xs-column CreateUsernameComponent-fullContainer css-1e5jxqd-MuiGrid-root"
>
<p
class="MuiTypography-root MuiTypography-body2 CreateUsernameComponent-marginMedium css-16d47hw-MuiTypography-root"
>
We’re sorry, but the username
<strong>
@jack
</strong>
was already claimed by someone else.
<br />
Can you choose another name?
</p>
<p
class="MuiTypography-root MuiTypography-body2 CreateUsernameComponent-inputLabel css-16d47hw-MuiTypography-root"
>
Enter username
</p>
<div
class="MuiFormControl-root MuiFormControl-fullWidth MuiTextField-root CreateUsernameComponent-focus CreateUsernameComponent-margin css-wb57ya-MuiFormControl-root-MuiTextField-root"
>
<div
class="MuiInputBase-root MuiOutlinedInput-root MuiInputBase-colorPrimary MuiInputBase-fullWidth MuiInputBase-formControl css-143wfni-MuiInputBase-root-MuiOutlinedInput-root"
>
<input
aria-invalid="false"
class="MuiInputBase-input MuiOutlinedInput-input css-24rejj-MuiInputBase-input-MuiOutlinedInput-input"
id=":ra:"
name="userName"
placeholder="Username"
type="text"
value=""
/>
<fieldset
aria-hidden="true"
class="MuiOutlinedInput-notchedOutline css-1d3z3hw-MuiOutlinedInput-notchedOutline"
>
<legend
class="css-ihdtdm"
>
<span
class="notranslate"
>
​
</span>
</legend>
</fieldset>
</div>
</div>
<p
class="MuiTypography-root MuiTypography-body2 css-xseqde-MuiTypography-root"
/>
<span
class="MuiTypography-root MuiTypography-caption css-1d4bzk2-MuiTypography-root"
style="margin-top: 8px;"
>
Your username will be public, but you can choose any name you like. No spaces or special characters. Lowercase letters and numbers only.
</span>
<div
class="CreateUsernameComponent-gutter"
/>
<button
class="MuiButtonBase-root MuiButton-root MuiButton-contained MuiButton-containedPrimary MuiButton-sizeMedium MuiButton-containedSizeMedium MuiButton-root MuiButton-contained MuiButton-containedPrimary MuiButton-sizeMedium MuiButton-containedSizeMedium CreateUsernameComponent-button CreateUsernameComponent-buttonModern css-1fotjar-MuiButtonBase-root-MuiButton-root"
tabindex="0"
type="submit"
>
Continue
<span
class="MuiTouchRipple-root css-8je8zh-MuiTouchRipple-root"
/>
</button>
</div>
</form>
</div>
</div>
</div>
</div>
<div
data-testid="sentinelEnd"
tabindex="0"
/>
</div>
</body>
`)
})
})

0 comments on commit c91d0fc

Please sign in to comment.