Skip to content

Commit

Permalink
Fix iWaitForTestElementToDisappear and support v-combobox in iClickOn…
Browse files Browse the repository at this point in the history
…TestElement #248
  • Loading branch information
robertfausk committed Jan 2, 2025

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
1 parent 455bad8 commit c69adf5
Showing 27 changed files with 98 additions and 79 deletions.
3 changes: 2 additions & 1 deletion web/assets/js/components/ContentCollapse.vue
Original file line number Diff line number Diff line change
@@ -69,6 +69,7 @@ export default {
const visibleState = ref<boolean>(false);
const title = computed(() => props.title);
const isLoading = computed(() => props.isLoading);
const getCollapseId = computed(() => `collapse-${props.collapseKey}`);
const getTitleLengthId = computed(() => `${getCollapseId.value}-title-width-in-px`);
const titleWidth = computed(() => (titleLengthState.value ? titleLengthState.value : '100'));
@@ -110,7 +111,7 @@ export default {
getCollapseId,
titleWidth,
title,
isLoading: props.isLoading,
isLoading,
};
},
};
8 changes: 6 additions & 2 deletions web/assets/js/components/WalkPrologue.vue
Original file line number Diff line number Diff line change
@@ -65,7 +65,7 @@
</v-combobox>
</v-col>
<v-col>
<v-autocomplete
<v-combobox
v-model="form.name"
:items="walkNameSuggestions"
clearable
@@ -76,7 +76,8 @@
:loading="isLoading"
no-data-text="Achtung - diese Rundenname ist nicht hinterlegt."
hide-details
></v-autocomplete>
data-test="Name"
></v-combobox>
</v-col>
<v-col>
<v-combobox
@@ -88,6 +89,7 @@
outlined
multiple
label="Tageskonzept"
data-test="Tageskonzept"
placeholder="Tageskonzept eintragen..."
:disabled="isLoading"
:loading="isLoading"
@@ -147,6 +149,7 @@
v-model="form.weather"
:items="weatherOptions"
label="Wetter"
data-test="Wetter"
outlined
:disabled="isLoading"
></v-select>
@@ -157,6 +160,7 @@
:disabled="isFormInvalid"
block
color="secondary"
data-test="btn-Runde beginnen"
>
Runde beginnen
</v-btn>
2 changes: 1 addition & 1 deletion web/tests/Acceptance/features/Dashboard/walk_list.feature
Original file line number Diff line number Diff line change
@@ -60,7 +60,7 @@ Feature: An administrator can change a walk
Then I wait for "Klippe1 " to appear


When I click on element "reset-walk-filter"
When I click on test element "reset-walk-filter"
Then I wait for "Klippe6" to appear
Then I wait for "Klippe1 " to disappear

Original file line number Diff line number Diff line change
@@ -66,6 +66,6 @@ Feature: An user can use way point list
Then I wait for "Assieck8 " to appear
And I wait for aria label "Go to page 2" to be active

When I click on element "reset-way-point-filter"
When I click on test element "reset-way-point-filter"
Then I wait for "Assieck17" to appear
Then I wait for "Assieck8 " to disappear
Original file line number Diff line number Diff line change
@@ -35,12 +35,12 @@ Feature: An user can toggle table rows on walk detail to see all
Then I wait for "Alle Details verbergen" to disappear
Then I wait for "Drogen" to disappear
Then I wait for "Gewalt" to disappear
Then I click on element "toggle-waypoint-details"
Then I click on test element "toggle-waypoint-details"
Then I wait for "Drogen" to appear
Then I wait for "Gewalt" to appear
Then I wait for "Alle Details anzeigen" to disappear
Then I wait for "Alle Details verbergen" to appear
Then I click on element "toggle-waypoint-details"
Then I click on test element "toggle-waypoint-details"
Then I wait for "Alle Details anzeigen" to appear
Then I wait for "Alle Details verbergen" to disappear
Then I wait for "Drogen" to disappear
4 changes: 2 additions & 2 deletions web/tests/Acceptance/features/password_reset.feature
Original file line number Diff line number Diff line change
@@ -59,8 +59,8 @@ Feature: A user can get a new password on his own
Then I should see "Passwort ändern" appear
When I fill in "password" with "Dumpfbacke18"
And I fill in "passwordRepeat" with "Dumpfbacke18"
Then I wait for field "btn-change-password" to be not disabled
And I click on element "btn-change-password"
Then I wait for test element "btn-change-password" to be not disabled
And I click on test element "btn-change-password"
Then I should see "Herzlichen Glückwunsch!" appear
And I should see "Du hast erfolgreich dein Passwort geändert." appear
And I should see "Melde dich jetzt an:" disappear
12 changes: 6 additions & 6 deletions web/tests/Acceptance/features/switch_user.feature
Original file line number Diff line number Diff line change
@@ -20,21 +20,21 @@ Feature: An superadmin can impersonate any user
Given I am on "/benutzer"
And I wait for "Nutzer wechseln" to appear

When I click on element "[email protected]"
When I click on test element "[email protected]"
And I wait 1 second
Then I should be on "/dashboard"

And I wait for "Neue Streetwork-Runde" to appear
And I should see "[email protected]" appear

When I click on element "nav-user-item"
When I click on test element "nav-user-item"
Then I should see "Nutzerwechsel beenden" appear

When I click on element "exit-switch-user"
When I click on test element "exit-switch-user"
Then I should see "[email protected]" disappear
And I should see "[email protected]" appear

When I click on element "nav-user-item"
When I click on test element "nav-user-item"
Then I should see "Nutzerwechsel beenden" disappear
Then I should see "Nutzerwechsel" appear

@@ -47,7 +47,7 @@ Feature: An superadmin can impersonate any user
Then I wait for "[email protected]" to appear
And I wait for "Nutzer wechseln" to appear

When I click on element "[email protected]"
When I click on test element "[email protected]"
And I wait 1 second
Then I should be on "/benutzer"

@@ -60,6 +60,6 @@ Feature: An superadmin can impersonate any user
Given I am authenticated as "[email protected]"
Given I am on "/dashboard"

When I click on element "nav-user-item"
When I click on test element "nav-user-item"
Then I should see "Was ist Swapp?" appear
Then I should see "Nutzerwechsel" disappear
12 changes: 6 additions & 6 deletions web/tests/Acceptance/features/tag_create.feature
Original file line number Diff line number Diff line change
@@ -35,18 +35,18 @@ Feature: An user can create a tag
And I wait for "Drogen" to disappear

# open
And I click on element "header-tag-create"
And I click on test element "header-tag-create"
Then I wait for "Name" to appear

Then the element "button-tag-create" should be disabled
When I enter "Religion" in "name" field
When I click on text "MediumAquaMarine"
Then the element "button-tag-create" should be enabled
Then I click on element "button-tag-create"
Then I click on test element "button-tag-create"

And I click on text "Liste der Tags"
# close create collapse
And I click on element "header-tag-create"
And I click on test element "header-tag-create"
And I wait for "Liste der Tags" to appear
And I wait for "ID" to appear
And I wait for "Name" to appear
@@ -67,17 +67,17 @@ Feature: An user can create a tag
And I wait for "ID" to disappear

# open
And I click on element "header-tag-create"
And I click on test element "header-tag-create"

Then the element "button-tag-create" should be disabled
When I enter "Religion" in "name" field
When I click on text "MediumAquaMarine"
Then the element "button-tag-create" should be enabled
Then I click on element "button-tag-create"
Then I click on test element "button-tag-create"

And I click on text "Liste der Tags"
# close create collapse
And I click on element "header-tag-create"
And I click on test element "header-tag-create"
And I wait for "Liste der Tags" to appear
And I wait for "ID" to appear
And I wait for "Name" to appear
4 changes: 2 additions & 2 deletions web/tests/Acceptance/features/tag_list.feature
Original file line number Diff line number Diff line change
@@ -49,7 +49,7 @@ Feature: A user can do a walk

And I wait for "Neuen Tag erstellen" to appear
# open
And I click on element "header-tag-create"
And I click on test element "header-tag-create"
And I wait for "PowderBlue" to appear
And I wait for "[email protected]" to disappear

@@ -72,7 +72,7 @@ Feature: A user can do a walk

And I wait for "Neuen Tag erstellen" to appear
# open
And I click on element "header-tag-create"
And I click on test element "header-tag-create"
And I wait for "PowderBlue" to appear
And I wait for "[email protected]" to appear
And I wait for "[email protected]" to appear
6 changes: 3 additions & 3 deletions web/tests/Acceptance/features/team_change_minimal.feature
Original file line number Diff line number Diff line change
@@ -32,10 +32,10 @@ Feature: An admin can change a team

Then the element "button-team-form-change" should be enabled
When I enter "Superteam" in "name-change" field
When I click on element "[email protected]"
When I click on element "[email protected]"
When I click on test element "[email protected]"
When I click on test element "[email protected]"
Then the element "button-team-form-change" should be enabled
Then I click on element "button-team-form-change"
Then I click on test element "button-team-form-change"
Then I wait for "Das Team Superteam wurde erfolgreich geändert." to appear

And I can find the following teams in database:
12 changes: 6 additions & 6 deletions web/tests/Acceptance/features/team_create_minimal.feature
Original file line number Diff line number Diff line change
@@ -30,7 +30,7 @@ Feature: An admin can create a team
And I wait for "Westhang" to disappear

# open
And I click on element "header-team-create"
And I click on test element "header-team-create"
Then I wait for "Allgemeine Daten des Teams" to appear

When I enter "clientIri<[email protected]>" in "clients" field
@@ -43,11 +43,11 @@ Feature: An admin can create a team
When I enter "Superteam" in "name" field
When I click on text "[email protected]"
Then the element "button-team-form-create" should be enabled
Then I click on element "button-team-form-create"
Then I click on test element "button-team-form-create"

And I click on text "Liste der Teams"
# close create collapse
And I click on element "header-team-create"
And I click on test element "header-team-create"
And I wait for "Liste der Teams" to appear
And I wait for "Team bearbeiten" to appear
And I can find the following teams in database:
@@ -66,18 +66,18 @@ Feature: An admin can create a team
And I wait for "Westhang" to disappear

# open
And I click on element "header-team-create"
And I click on test element "header-team-create"
Then I wait for "Allgemeine Daten des Teams" to appear

Then the element "button-team-form-create" should be disabled
When I enter "Superteam" in "name" field
When I click on text "[email protected]"
Then the element "button-team-form-create" should be enabled
Then I click on element "button-team-form-create"
Then I click on test element "button-team-form-create"

And I click on text "Liste der Teams"
# close create collapse
And I click on element "header-team-create"
And I click on test element "header-team-create"
And I wait for "Liste der Teams" to appear
And I wait for "Team bearbeiten" to appear
And I can find the following teams in database:
2 changes: 1 addition & 1 deletion web/tests/Acceptance/features/walk_change_finished.feature
Original file line number Diff line number Diff line change
@@ -39,7 +39,7 @@ Feature: An administrator can change a finished walk

When I enter "Arschkalt" in "Wetter" field

When I click on element "button-walk-submit"
When I click on test element "button-walk-submit"

Then I wait for 'Runde "Klippe" wurde erfolgreich geändert.' to appear

Original file line number Diff line number Diff line change
@@ -40,7 +40,7 @@ Feature: An administrator can change a finished walk

When I enter "Arschkalt" in "Wetter" field

When I click on element "button-walk-submit"
When I click on test element "button-walk-submit"

Then I wait for 'Runde "Klippe" wurde erfolgreich geändert.' to appear

6 changes: 3 additions & 3 deletions web/tests/Acceptance/features/walk_change_start_time.feature
Original file line number Diff line number Diff line change
@@ -29,16 +29,16 @@ Feature: An administrator can change startTime of a walk
When I go to swapp page "/runde/walkId<Klippe>/detail"
Then I wait for 'Runde "Klippe" ändern' to appear

When I click on element "startTimeTime"
When I click on test element "startTimeTime"
Then I wait for 'Schließen' to appear
When I click on aria label "Erhöhen"

When I click on element "startTimeDate"
When I click on test element "startTimeDate"
Then I wait for 'Mit den Pfeiltasten durch den Kalender navigieren' to appear
When I click on aria label "Sonntag, 10. Januar 2021"


When I click on element "button-walk-submit"
When I click on test element "button-walk-submit"

Then I wait for 'Runde "Klippe" wurde erfolgreich geändert.' to appear

Original file line number Diff line number Diff line change
@@ -38,7 +38,7 @@ Feature: An administrator can change an unfinished walk
Then I wait for test element "insights" to disappear
When I enter "Arschkalt" in "Wetter" field

When I click on element "button-walk-submit"
When I click on test element "button-walk-submit"

Then I wait for 'Runde "Klippe" wurde erfolgreich geändert.' to appear

Original file line number Diff line number Diff line change
@@ -39,7 +39,7 @@ Feature: An administrator can change an unfinished walk
Then I wait for test element "insights" to disappear
When I enter "Arschkalt" in "Wetter" field

When I click on element "button-walk-submit"
When I click on test element "button-walk-submit"

Then I wait for 'Runde "Klippe" wurde erfolgreich geändert.' to appear

6 changes: 4 additions & 2 deletions web/tests/Acceptance/features/walk_create.feature
Original file line number Diff line number Diff line change
@@ -58,10 +58,12 @@ Feature: A user can do a walk
Then I wait for "Ferien" to appear
Then I wait for "Wetter" to appear
When I enter "Mein erster Lauf" in "Name" field
# When I click on test element "Tageskonzept"
When I enter "Mein erster Lauf" in "Tageskonzept" field
When I enter "Arschkalt" in "Wetter" field
When I click on text "Runde beginnen"
Then I wait for "Runde beginnen" to disappear
When I wait for test element "btn-Runde beginnen" to be not disabled
When I click on test element "btn-Runde beginnen"
Then I wait for test element "btn-Runde beginnen" to disappear


Then I wait for "Wegpunkte der Runde" to appear
Original file line number Diff line number Diff line change
@@ -38,9 +38,9 @@ Feature: An user can do a walk with preset walkTeamMembers
When I enter "Freies Streetwork" in "Tageskonzept" field
When I enter "Arschkalt" in "Wetter" field

When I click on element "[email protected]"
When I click on test element "[email protected]"

When I click on element "startTimeTime"
When I click on test element "startTimeTime"
Then I wait for 'Schließen' to appear
When I click on aria label "Verringern"

@@ -65,13 +65,13 @@ Feature: An user can do a walk with preset walkTeamMembers
When I enter "Mein erster Lauf" in "Tageskonzept" field
When I enter "Arschkalt" in "Wetter" field

When I click on element "startTimeDate"
When I click on test element "startTimeDate"
Then I wait for 'Mit den Pfeiltasten durch den Kalender navigieren' to appear
When I click on aria label "Nächster Monat"
When I click on aria label "Nächster Monat"
When I click on text "26"

When I click on element "[email protected]"
When I click on test element "[email protected]"

When I click on text "Runde beginnen"
Then I wait for "Runde beginnen" to disappear
@@ -98,8 +98,8 @@ Feature: An user can do a walk with preset walkTeamMembers
Then I wait for test element "[email protected]" to be selected
Then I wait for test element "[email protected]" to be not selected

Then I wait for field 'button-walk-create' to be not disabled
When I click on element "button-walk-create"
Then I wait for test element 'button-walk-create' to be not disabled
When I click on test element "button-walk-create"
Then I wait for "Runde beginnen" to disappear
And I wait for "Wegpunkte der Runde" to appear

Loading

0 comments on commit c69adf5

Please sign in to comment.