diff options
| author | RyotaK <49341894+Ry0taK@users.noreply.github.com> | 2023-03-07 16:07:13 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-03-07 16:07:13 +0900 |
| commit | 6feead51853d8319b5df11af13fd2765cb510723 (patch) | |
| tree | 8f527e0cf9d47c3cbae018a6f460437e780c7564 | |
| parent | chore(client): tweak default sound setting (diff) | |
| download | misskey-6feead51853d8319b5df11af13fd2765cb510723.tar.gz misskey-6feead51853d8319b5df11af13fd2765cb510723.tar.bz2 misskey-6feead51853d8319b5df11af13fd2765cb510723.zip | |
fix: 登録時のフォームにおいて送信できる条件を修正 (#10238)
* fix: 登録時のフォームにおいて送信できる条件を修正
* テストを追加
Diffstat (limited to '')
| -rw-r--r-- | cypress/e2e/basic.cy.js | 13 | ||||
| -rw-r--r-- | packages/frontend/src/components/MkSignup.vue | 4 |
2 files changed, 16 insertions, 1 deletions
diff --git a/cypress/e2e/basic.cy.js b/cypress/e2e/basic.cy.js index b1b856119c..5a0a767ed5 100644 --- a/cypress/e2e/basic.cy.js +++ b/cypress/e2e/basic.cy.js @@ -52,12 +52,25 @@ describe('After setup instance', () => { cy.intercept('POST', '/api/signup').as('signup'); cy.get('[data-cy-signup]').click(); + cy.get('[data-cy-signup-submit]').should('be.disabled'); cy.get('[data-cy-signup-username] input').type('alice'); + cy.get('[data-cy-signup-submit]').should('be.disabled'); cy.get('[data-cy-signup-password] input').type('alice1234'); + cy.get('[data-cy-signup-submit]').should('be.disabled'); cy.get('[data-cy-signup-password-retype] input').type('alice1234'); + cy.get('[data-cy-signup-submit]').should('not.be.disabled'); cy.get('[data-cy-signup-submit]').click(); cy.wait('@signup'); + + cy.visitHome(); + + // ユーザー名が重複している場合の挙動確認 + cy.get('[data-cy-signup]').click(); + cy.get('[data-cy-signup-username] input').type('alice'); + cy.get('[data-cy-signup-password] input').type('alice1234'); + cy.get('[data-cy-signup-password-retype] input').type('alice1234'); + cy.get('[data-cy-signup-submit]').should('be.disabled'); }); }); diff --git a/packages/frontend/src/components/MkSignup.vue b/packages/frontend/src/components/MkSignup.vue index 62ada6b736..fa69481394 100644 --- a/packages/frontend/src/components/MkSignup.vue +++ b/packages/frontend/src/components/MkSignup.vue @@ -117,7 +117,9 @@ const shouldDisableSubmitting = $computed((): boolean => { instance.enableHcaptcha && !hCaptchaResponse || instance.enableRecaptcha && !reCaptchaResponse || instance.enableTurnstile && !turnstileResponse || - passwordRetypeState === 'not-match'; + instance.emailRequiredForSignup && emailState !== 'ok' || + usernameState !== 'ok' || + passwordRetypeState !== 'match'; }); function onChangeUsername(): void { |