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.

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

Refactor MTE-3854 Integrate menu refactor work and xcode 16 #23381

Open
wants to merge 15 commits into
base: main
Choose a base branch
from

Conversation

clarmso
Copy link
Collaborator

@clarmso clarmso commented Nov 25, 2024

📜 Tickets

Jira ticket

💡 Description

Cherry pick menu refactor work after Xcode 16 is in use.

TODO

  • Changes required for full functional tests

📝 Checklist

You have to check all boxes before merging

  • Filled in the above information (tickets numbers and description of your work)
  • Updated the PR name to follow our PR naming guidelines
  • Wrote unit tests and/or ensured the tests suite is passing
  • When working on UI, I checked and implemented accessibility (minimum Dynamic Text and VoiceOver)
  • If needed, I updated documentation / comments for complex code and public methods
  • If needed, added a backport comment (example @Mergifyio backport release/v120)

@mobiletest-ci-bot
Copy link

mobiletest-ci-bot commented Nov 25, 2024

Messages
📖 Edited 20 files
📖 Created 0 files

Generated by 🚫 Danger Swift against 609d794

@@ -119,6 +119,7 @@
"ShortcutRouteTests\/testOpenLastBookmarkShortcutWithInvalidUrl()",
"TabManagerTests\/testDeleteSelectedTab()",
"TabManagerTests\/testPrivatePreference_togglePBMDeletesPrivate()",
"TabToolbarHelperTests\/testTelemetryForSiteMenu()",
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This test fails with the menu refactor turned on. 😞

@clarmso
Copy link
Collaborator Author

clarmso commented Nov 26, 2024

@isabelrios Should we merge this PR just with the changes for smoke tests? 🙂 Please approve this PR if it's the case. We can address the full functional tests in a subsequent PR.
(cc @thatswinnie)

Copy link
Contributor

mergify bot commented Nov 26, 2024

This pull request has conflicts when rebasing. Could you fix it @clarmso? 🙏

@mdotb-moz mdotb-moz force-pushed the cs/MTE-3854-menu-refactor-xcode-16 branch from 334372c to f8c6e01 Compare November 28, 2024 12:27
XCUIDevice.shared.orientation = .landscapeLeft
mozWaitForElementToExist(hamburgerMenu)
mozWaitForElementToNotExist(app.tables["Context Menu"])
// mozWaitForElementToNotExist(app.tables["Context Menu"])
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can we add a comment why we comment these lines?

@@ -58,25 +61,25 @@ class ToolbarMenuTests: BaseTestCase {
"Menu button is not below the pocket cells area"
)
hamburgerMenu.tap()
mozWaitForElementToExist(app.tables["Context Menu"])
mozWaitForElementToExist(app.images[StandardImageIdentifiers.Large.avatarCircle])
// mozWaitForElementToExist(app.tables["Context Menu"])
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same as above

[
app.staticTexts["mozilla.org"],
app.staticTexts["Secure connection"]
]
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please do not change the indentation (unless it's swiftlint related).

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants