summaryrefslogtreecommitdiffhomepage
path: root/gui/src
diff options
context:
space:
mode:
authorOskar Nyberg <oskar@mullvad.net>2022-12-15 16:34:38 +0100
committerOskar Nyberg <oskar@mullvad.net>2022-12-15 16:34:38 +0100
commitd719c03f546d64284a8a4898aa04500d5677abd7 (patch)
treedd346890d9bc75d66775868c6250e32b2d7f6f38 /gui/src
parent0982a4a55e692797cee18f82cd1ffe753e02da33 (diff)
parentc9beb24e50a52b5941a731b6fb456e41ebcdc55e (diff)
downloadmullvadvpn-d719c03f546d64284a8a4898aa04500d5677abd7.tar.xz
mullvadvpn-d719c03f546d64284a8a4898aa04500d5677abd7.zip
Merge branch 'add-more-e2e-tests'
Diffstat (limited to 'gui/src')
-rw-r--r--gui/src/renderer/app.tsx9
1 files changed, 9 insertions, 0 deletions
diff --git a/gui/src/renderer/app.tsx b/gui/src/renderer/app.tsx
index e78462041b..afdda1d401 100644
--- a/gui/src/renderer/app.tsx
+++ b/gui/src/renderer/app.tsx
@@ -253,6 +253,11 @@ export default class AppRenderer {
const navigationBase = this.getNavigationBase();
this.history = new History(navigationBase);
}
+
+ if (window.env.e2e) {
+ // Make the current location available to the tests if running e2e tests
+ window.e2e = { location: this.history.location.pathname };
+ }
}
public renderView() {
@@ -507,6 +512,10 @@ export default class AppRenderer {
public setNavigationHistory(history: IHistoryObject) {
IpcRendererEventChannel.navigation.setHistory(history);
+
+ if (window.env.e2e) {
+ window.e2e.location = history.entries[history.index].pathname;
+ }
}
private isLoggedIn(): boolean {