Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
81e65744
Commit
81e65744
authored
Jan 17, 2020
by
Enrique Alcántara
Committed by
Mike Greiling
Jan 17, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: EKS credentials form doesn't "reset" after error
parent
e7cb8eec
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
11 additions
and
4 deletions
+11
-4
app/assets/javascripts/create_cluster/eks_cluster/components/service_credentials_form.vue
...uster/eks_cluster/components/service_credentials_form.vue
+2
-1
changelogs/unreleased/37449-fix-eks-authenticate-button.yml
changelogs/unreleased/37449-fix-eks-authenticate-button.yml
+5
-0
spec/frontend/create_cluster/eks_cluster/components/service_credentials_form_spec.js
...r/eks_cluster/components/service_credentials_form_spec.js
+4
-3
No files found.
app/assets/javascripts/create_cluster/eks_cluster/components/service_credentials_form.vue
View file @
81e65744
...
...
@@ -82,7 +82,7 @@ export default {
};
</
script
>
<
template
>
<form
name=
"service-credentials-form"
@
submit.prevent=
"createRole(
{ roleArn, externalId })"
>
<form
name=
"service-credentials-form"
>
<h2>
{{
s__
(
'
ClusterIntegration|Authenticate with Amazon Web Services
'
)
}}
</h2>
<p>
{{
...
...
@@ -136,6 +136,7 @@ export default {
:disabled=
"submitButtonDisabled"
:loading=
"isCreatingRole"
:label=
"submitButtonLabel"
@
click.prevent=
"createRole(
{ roleArn, externalId })"
/>
</form>
</
template
>
changelogs/unreleased/37449-fix-eks-authenticate-button.yml
0 → 100644
View file @
81e65744
---
title
:
'
fix:
EKS
credentials
form
does
not
reset
after
error'
merge_request
:
21958
author
:
type
:
other
spec/frontend/create_cluster/eks_cluster/components/service_credentials_form_spec.js
View file @
81e65744
...
...
@@ -47,7 +47,6 @@ describe('ServiceCredentialsForm', () => {
const
findCopyExternalIdButton
=
()
=>
vm
.
find
(
'
.js-copy-external-id-button
'
);
const
findInvalidCredentials
=
()
=>
vm
.
find
(
'
.js-invalid-credentials
'
);
const
findSubmitButton
=
()
=>
vm
.
find
(
LoadingButton
);
const
findForm
=
()
=>
vm
.
find
(
'
form[name="service-credentials-form"]
'
);
it
(
'
displays provided account id
'
,
()
=>
{
expect
(
findAccountIdInput
().
attributes
(
'
value
'
)).
toBe
(
accountId
);
...
...
@@ -77,8 +76,10 @@ describe('ServiceCredentialsForm', () => {
});
});
it
(
'
dispatches createRole action when form is submitted
'
,
()
=>
{
findForm
().
trigger
(
'
submit
'
);
it
(
'
dispatches createRole action when submit button is clicked
'
,
()
=>
{
vm
.
setData
({
roleArn
:
'
123
'
});
// set role ARN to enable button
findSubmitButton
().
vm
.
$emit
(
'
click
'
,
new
Event
(
'
click
'
));
expect
(
createRoleAction
).
toHaveBeenCalled
();
});
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment