Skip to content

Commit e831266

Browse files
committed
refactor: migrate to text inputs to primer
Signed-off-by: Adam Setch <[email protected]>
1 parent 2e1a889 commit e831266

File tree

4 files changed

+14
-26
lines changed

4 files changed

+14
-26
lines changed

src/renderer/routes/LoginWithOAuthApp.test.tsx

Lines changed: 5 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -73,11 +73,9 @@ describe('renderer/routes/LoginWithOAuthApp.tsx', () => {
7373
clientSecret: '!@£INVALID-.1' as ClientSecret,
7474
};
7575
expect(validateForm(values).hostname).toBe('Hostname format is invalid');
76-
expect(validateForm(values).clientId).toBe(
77-
'Client ID format is invalid (must be 20 characters long)',
78-
);
76+
expect(validateForm(values).clientId).toBe('Client ID format is invalid');
7977
expect(validateForm(values).clientSecret).toBe(
80-
'Client Secret format is invalid (must be 40 characters long)',
78+
'Client Secret format is invalid',
8179
);
8280
});
8381

@@ -173,17 +171,10 @@ describe('renderer/routes/LoginWithOAuthApp.tsx', () => {
173171

174172
fireEvent.click(screen.getByTestId('login-submit'));
175173

174+
expect(screen.getByTestId('login-errors')).toBeTruthy();
176175
expect(screen.getByText('Hostname format is invalid')).toBeTruthy();
177-
expect(
178-
screen.getByText(
179-
'Client ID format is invalid (must be 20 characters long)',
180-
),
181-
).toBeTruthy();
182-
expect(
183-
screen.getByText(
184-
'Client Secret format is invalid (must be 40 characters long)',
185-
),
186-
).toBeTruthy();
176+
expect(screen.getByText('Client ID format is invalid')).toBeTruthy();
177+
expect(screen.getByText('Client Secret format is invalid')).toBeTruthy();
187178
});
188179

189180
it('should open help docs in the browser', async () => {

src/renderer/routes/LoginWithOAuthApp.tsx

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,15 +60,13 @@ export const validateForm = (values: IFormData): IFormErrors => {
6060
if (!values.clientId) {
6161
errors.clientId = 'Client ID is required';
6262
} else if (!isValidClientId(values.clientId)) {
63-
errors.clientId =
64-
'Client ID format is invalid (must be 20 characters long)';
63+
errors.clientId = 'Client ID format is invalid';
6564
}
6665

6766
if (!values.clientSecret) {
6867
errors.clientSecret = 'Client Secret is required';
6968
} else if (!isValidToken(values.clientSecret as unknown as Token)) {
70-
errors.clientSecret =
71-
'Client Secret format is invalid (must be 40 characters long)';
69+
errors.clientSecret = 'Client Secret format is invalid';
7270
}
7371

7472
return errors;
@@ -148,6 +146,7 @@ export const LoginWithOAuthAppRoute: FC = () => {
148146
</Stack>
149147
</Text>
150148
}
149+
data-testid="login-errors"
151150
/>
152151
)}
153152
<Stack direction="vertical" gap="normal">

src/renderer/routes/LoginWithPersonalAccessToken.test.tsx

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -63,9 +63,7 @@ describe('renderer/routes/LoginWithPersonalAccessToken.tsx', () => {
6363
token: '!@£INVALID-.1',
6464
};
6565
expect(validateForm(values).hostname).toBe('Hostname format is invalid');
66-
expect(validateForm(values).token).toBe(
67-
'Token format is invalid (must be 40 characters long)',
68-
);
66+
expect(validateForm(values).token).toBe('Token format is invalid');
6967
});
7068

7169
describe("'Generate a PAT' button", () => {
@@ -192,10 +190,9 @@ describe('renderer/routes/LoginWithPersonalAccessToken.tsx', () => {
192190

193191
fireEvent.click(screen.getByTestId('login-submit'));
194192

195-
expect(screen.getByText('Hostname format is invalid')).toBeDefined();
196-
expect(
197-
screen.getByText('Token format is invalid (must be 40 characters long)'),
198-
).toBeDefined();
193+
expect(screen.getByTestId('login-errors')).toBeTruthy();
194+
expect(screen.getByText('Hostname format is invalid')).toBeTruthy();
195+
expect(screen.getByText('Token format is invalid')).toBeTruthy();
199196
});
200197

201198
it('should open help docs in the browser', async () => {

src/renderer/routes/LoginWithPersonalAccessToken.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ export const validateForm = (values: IFormData): IFormErrors => {
5858
if (!values.token) {
5959
errors.token = 'Token is required';
6060
} else if (!isValidToken(values.token)) {
61-
errors.token = 'Token format is invalid (must be 40 characters long)';
61+
errors.token = 'Token format is invalid';
6262
}
6363

6464
return errors;
@@ -142,6 +142,7 @@ export const LoginWithPersonalAccessTokenRoute: FC = () => {
142142
</Stack>
143143
</Text>
144144
}
145+
data-testid="login-errors"
145146
/>
146147
)}
147148
<Stack direction="vertical" gap="normal">

0 commit comments

Comments
 (0)