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

Migrate remaining e2e tests to POP #7332

Merged
merged 1 commit into from
Dec 13, 2024
Merged

Conversation

niklasberglund
Copy link
Collaborator

@niklasberglund niklasberglund commented Dec 12, 2024

LoginTest and ConnectionTest was migrated since before. This PR migrates remaining end to end tests to use Page Object Pattern.


This change is Reviewable

@niklasberglund niklasberglund requested review from kl and Rawa December 12, 2024 08:41
@niklasberglund niklasberglund self-assigned this Dec 12, 2024
@niklasberglund niklasberglund added the Android Issues related to Android label Dec 12, 2024
Copy link
Contributor

@Pururun Pururun left a comment

Choose a reason for hiding this comment

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

Reviewed 10 of 10 files at r1, all commit messages.
Reviewable status: all files reviewed, 1 unresolved discussion (waiting on @niklasberglund)


android/test/common/src/main/kotlin/net/mullvad/mullvadvpn/test/common/page/WireGuardCustomPortModal.kt line 6 at r1 (raw file):

import net.mullvad.mullvadvpn.test.common.extension.findObjectWithTimeout

class WireGuardCustomPortModal internal constructor() : Page() {

Modal feels very iOS, but maybe it is something commonly used when using POC? Otherwise I think dialog is fine.

@niklasberglund niklasberglund force-pushed the migrate-more-test-classes-to-POP branch from 69604c2 to 830fb47 Compare December 12, 2024 10:04
Copy link
Collaborator Author

@niklasberglund niklasberglund left a comment

Choose a reason for hiding this comment

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

Reviewable status: 8 of 10 files reviewed, 1 unresolved discussion (waiting on @Pururun)


android/test/common/src/main/kotlin/net/mullvad/mullvadvpn/test/common/page/WireGuardCustomPortModal.kt line 6 at r1 (raw file):

Previously, Pururun (Jonatan Rhodin) wrote…

Modal feels very iOS, but maybe it is something commonly used when using POC? Otherwise I think dialog is fine.

Right, it is also called CustomPortDialog in the app code so that's a better name. Renamed to WireGuardCustomPortDialog.

Pururun
Pururun previously approved these changes Dec 12, 2024
Copy link
Contributor

@Pururun Pururun left a comment

Choose a reason for hiding this comment

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

:lgtm:

Reviewed 2 of 2 files at r2, all commit messages.
Reviewable status: :shipit: complete! all files reviewed, all discussions resolved


android/test/common/src/main/kotlin/net/mullvad/mullvadvpn/test/common/page/WireGuardCustomPortModal.kt line 6 at r1 (raw file):

Previously, niklasberglund (Niklas Berglund) wrote…

Right, it is also called CustomPortDialog in the app code so that's a better name. Renamed to WireGuardCustomPortDialog.

👍

Copy link
Contributor

@Rawa Rawa left a comment

Choose a reason for hiding this comment

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

Reviewed 8 of 10 files at r1, 2 of 2 files at r2, all commit messages.
Reviewable status: all files reviewed, 2 unresolved discussions (waiting on @niklasberglund)


android/test/e2e/src/main/kotlin/net/mullvad/mullvadvpn/test/e2e/WebLinkTest.kt line 20 at r2 (raw file):

        on<SettingsPage> { clickFaqAndGuides() }

        on<MullvadWebsite> {}

Same here on<MullvadWebsite>()


android/test/e2e/src/main/kotlin/net/mullvad/mullvadvpn/test/e2e/LogoutTest.kt line 24 at r2 (raw file):

        on<AccountPage> { clickLogOut() }

        on<LoginPage> {}

nit: I believe we could just write on<LoginPage>()

Copy link
Collaborator Author

@niklasberglund niklasberglund left a comment

Choose a reason for hiding this comment

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

Reviewable status: 8 of 10 files reviewed, 1 unresolved discussion (waiting on @Pururun and @Rawa)


android/test/e2e/src/main/kotlin/net/mullvad/mullvadvpn/test/e2e/LogoutTest.kt line 24 at r2 (raw file):

Previously, Rawa (David Göransson) wrote…

nit: I believe we could just write on<LoginPage>()

Removed {}


android/test/e2e/src/main/kotlin/net/mullvad/mullvadvpn/test/e2e/WebLinkTest.kt line 20 at r2 (raw file):

Previously, Rawa (David Göransson) wrote…

Same here on<MullvadWebsite>()

Removed {}

Copy link
Contributor

@Rawa Rawa left a comment

Choose a reason for hiding this comment

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

Reviewable status: 8 of 10 files reviewed, 1 unresolved discussion (waiting on @Pururun)


android/test/e2e/src/main/kotlin/net/mullvad/mullvadvpn/test/e2e/LogoutTest.kt line 24 at r2 (raw file):

Previously, niklasberglund (Niklas Berglund) wrote…

Removed {}

I believe this won't compile, you need the ()

@niklasberglund niklasberglund force-pushed the migrate-more-test-classes-to-POP branch from e9b77ad to f639950 Compare December 13, 2024 09:16
Copy link
Contributor

@Pururun Pururun left a comment

Choose a reason for hiding this comment

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

Reviewed 2 of 2 files at r4, all commit messages.
Reviewable status: all files reviewed, 1 unresolved discussion (waiting on @Rawa)

Copy link
Collaborator Author

@niklasberglund niklasberglund left a comment

Choose a reason for hiding this comment

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

Reviewable status: all files reviewed, 1 unresolved discussion (waiting on @Rawa)


android/test/e2e/src/main/kotlin/net/mullvad/mullvadvpn/test/e2e/LogoutTest.kt line 24 at r2 (raw file):

Previously, Rawa (David Göransson) wrote…

I believe this won't compile, you need the ()

You are absolutely right, now the build and tests are passing 👍

Copy link
Contributor

@Rawa Rawa left a comment

Choose a reason for hiding this comment

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

Reviewed 2 of 2 files at r4, all commit messages.
Reviewable status: :shipit: complete! all files reviewed, all discussions resolved

@Rawa Rawa force-pushed the migrate-more-test-classes-to-POP branch from f639950 to d34461a Compare December 13, 2024 14:39
@Rawa Rawa merged commit 8de6bf8 into main Dec 13, 2024
26 checks passed
@Rawa Rawa deleted the migrate-more-test-classes-to-POP branch December 13, 2024 14:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Android Issues related to Android
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants