rebase from main

jhipster · Sep 12, 2022 · 51a9d41 · 51a9d41
1 parent 139747f
commit 51a9d41
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/...client/templates/angular/src/main/webapp/app/account/settings/settings.component.html.ejs b/...client/templates/angular/src/main/webapp/app/account/settings/settings.component.html.ejs
@@ -39,7 +39,7 @@
  name="firstName"
  placeholder="{{ 'settings.form.firstname.placeholder' | translate }}"
  formControlName="firstName"
- data-cy="firstname"
+ data-cy="firstName"
  />
 
  <div
@@ -83,7 +83,7 @@
  name="lastName"
  placeholder="{{ 'settings.form.lastname.placeholder' | translate }}"
  formControlName="lastName"
- data-cy="lastname"
+ data-cy="lastName"
  />
 
  <div

diff --git a/generators/client/templates/vue/src/main/webapp/app/account/settings/settings.vue.ejs b/generators/client/templates/vue/src/main/webapp/app/account/settings/settings.vue.ejs
@@ -27,7 +27,7 @@
  <input type="text" class="form-control" id="firstName" name="firstName"
  v-bind:placeholder="$t('settings.form[\'firstname.placeholder\']')"
  :class="{ valid: !$v.settingsAccount.firstName.$invalid, invalid: $v.settingsAccount.firstName.$invalid }"
- v-model="$v.settingsAccount.firstName.$model" minlength="1" maxlength="50" required data-cy="firstname" />
+ v-model="$v.settingsAccount.firstName.$model" minlength="1" maxlength="50" required data-cy="firstName" />
  <div v-if="$v.settingsAccount.firstName.$anyDirty && $v.settingsAccount.firstName.$invalid">
  <small class="form-text text-danger" v-if="!$v.settingsAccount.firstName.required"
  v-text="$t('settings.messages.validate.firstname.required')">
@@ -48,7 +48,7 @@
  <input type="text" class="form-control" id="lastName" name="lastName"
  v-bind:placeholder="$t('settings.form[\'lastname.placeholder\']')"
  :class="{ valid: !$v.settingsAccount.lastName.$invalid, invalid: $v.settingsAccount.lastName.$invalid }"
- v-model="$v.settingsAccount.lastName.$model" minlength="1" maxlength="50" required data-cy="lastname" />
+ v-model="$v.settingsAccount.lastName.$model" minlength="1" maxlength="50" required data-cy="lastName" />
  <div v-if="$v.settingsAccount.lastName.$anyDirty && $v.settingsAccount.lastName.$invalid">
  <small class="form-text text-danger" v-if="!$v.settingsAccount.lastName.required"
  v-text="$t('settings.messages.validate.lastname.required')">

diff --git a/generators/cypress/templates/src/test/javascript/cypress/support/commands.ts.ejs b/generators/cypress/templates/src/test/javascript/cypress/support/commands.ts.ejs
@@ -64,8 +64,8 @@ export const secondPasswordRegisterSelector = '[data-cy="secondPassword"]';
 export const submitRegisterSelector = '[data-cy="submit"]';
 
 // Settings
-export const firstNameSettingsSelector = '[data-cy="firstname"]';
-export const lastNameSettingsSelector = '[data-cy="lastname"]';
+export const firstNameSettingsSelector = '[data-cy="firstName"]';
+export const lastNameSettingsSelector = '[data-cy="lastName"]';
 export const emailSettingsSelector = '[data-cy="email"]';
 export const languageSettingsSelector = '[data-cy="langKey"]';
 export const submitSettingsSelector = '[data-cy="submit"]';