Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

v9: Fixing flaky cypress test "Macro in Grid" #11485

Merged
merged 9 commits into from
Oct 26, 2021
Merged

v9: Fixing flaky cypress test "Macro in Grid" #11485

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
d4d2bbf
fixed flaky macro test and updated cypress version
Oct 25, 2021
447ba39
fixed flaky macro test and updated cypress version
Oct 25, 2021
2284701
Merge branch 'v9/bugfix/fix_flaky_cypress_test' of https://github.com…
Oct 25, 2021
f474a66
Update package.json
Oct 25, 2021
3348825
Fixed failing tabs test
Oct 25, 2021
84d622b
Amend magic numbers with actual wait
Zeegaan Oct 26, 2021
c194f06
Update tests/Umbraco.Tests.AcceptanceTest/cypress/integration/Content…
Zeegaan Oct 26, 2021
f100ee0
Updated UI to click on button instead of icon
Zeegaan Oct 26, 2021
9ce0e96
Make macro test click bottom to ensure we're not clicking on icon
Zeegaan Oct 26, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/macropicker/macropicker.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,12 @@
<p ng-bind="a11yInfo" role="alert"></p>
<ul class="umb-card-grid -three-in-row">
<li ng-repeat="availableItem in macros | orderBy:'name' | filter:model.searchTerm">
<button class="btn-reset umb-card-grid-item" title="{{availableItem.name}}" ng-click="selectMacro(availableItem)">
<button class="btn-reset umb-card-grid-item" title="{{availableItem.name}}" ng-click="selectMacro(availableItem)">
<span>
<umb-icon icon="icon-settings-alt"></umb-icon>
{{availableItem.name}}
</span>
</button>
</button>
</li>
</ul>

Expand Down
3 changes: 2 additions & 1 deletion tests/Umbraco.Tests.AcceptanceTest/cypress/integration/Content/content.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -759,7 +759,8 @@ context('Content', () => {
// Click macro
cy.get(':nth-child(4) > .umb-card-grid-item > :nth-child(1)').click();
// Select the macro
cy.get('.umb-card-grid-item').contains(macroName).click();
cy.get(`.umb-card-grid-item[title='${macroName}']`).click('bottom');


// Save and publish
cy.umbracoButtonByLabelKey('buttons_saveAndPublish').click();
Expand Down
2 changes: 1 addition & 1 deletion tests/Umbraco.Tests.AcceptanceTest/cypress/integration/Tabs/tabs.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ import {
//Check if tab is there, else if it wasnt created, this test would always pass
cy.get('[title="aTab 1"]').should('be.visible');
//Delete a tab
cy.get('.btn-reset > [icon="icon-trash"]').click();
cy.get('.btn-reset > [icon="icon-trash"]').first().click();
cy.get('.umb-button > .btn').last().click();
cy.umbracoButtonByLabelKey('buttons_save').click();
//Assert
Expand Down