Skip to content

A local-first personal finance app

[e2e] Mobile budget menu modal VRT (#3583)

Joel Jeremy Marqueza84af23e7e51
diff --git a/packages/desktop-client/e2e/budget.mobile.test.js b/packages/desktop-client/e2e/budget.mobile.test.js
index c098c8652b..b412bff747 100644
--- a/packages/desktop-client/e2e/budget.mobile.test.js
+++ b/packages/desktop-client/e2e/budget.mobile.test.js
@@ -1,10 +1,63 @@
import { test, expect } from '@playwright/test';
+import { amountToCurrency, currencyToAmount } from 'loot-core/shared/util';
import * as monthUtils from 'loot-core/src/shared/months';
import { ConfigurationPage } from './page-models/configuration-page';
import { MobileNavigation } from './page-models/mobile-navigation';
+const copyLastMonthBudget = async (budgetPage, categoryName) => {
+ const budgetMenuModal = await budgetPage.openBudgetMenu(categoryName);
+ await budgetMenuModal.copyLastMonthBudget();
+ await budgetMenuModal.close();
+};
+
+const setTo3MonthAverage = async (budgetPage, categoryName) => {
+ const budgetMenuModal = await budgetPage.openBudgetMenu(categoryName);
+ await budgetMenuModal.setTo3MonthAverage();
+ await budgetMenuModal.close();
+};
+
+const setTo6MonthAverage = async (budgetPage, categoryName) => {
+ const budgetMenuModal = await budgetPage.openBudgetMenu(categoryName);
+ await budgetMenuModal.setTo6MonthAverage();
+ await budgetMenuModal.close();
+};
+
+const setToYearlyAverage = async (budgetPage, categoryName) => {
+ const budgetMenuModal = await budgetPage.openBudgetMenu(categoryName);
+ await budgetMenuModal.setToYearlyAverage();
+ await budgetMenuModal.close();
+};
+
+async function setBudgetAverage(
+ budgetPage,
+ categoryName,
+ numberOfMonths,
+ setBudgetAverageFn,
+) {
+ let totalSpent = 0;
+
+ for (let i = 0; i < numberOfMonths; i++) {
+ await budgetPage.goToPreviousMonth();
+ const spentButton = await budgetPage.getButtonForSpent(categoryName);
+ const spent = await spentButton.textContent();
+ totalSpent += currencyToAmount(spent);
+ }
+
+ // Calculate average amount
+ const averageSpent = totalSpent / numberOfMonths;
+
+ // Go back to the current month
+ for (let i = 0; i < numberOfMonths; i++) {
+ await budgetPage.goToNextMonth();
+ }
+
+ await setBudgetAverageFn(budgetPage, categoryName, numberOfMonths);
+
+ return averageSpent;
+}
+
const budgetTypes = ['Envelope', 'Tracking'];
budgetTypes.forEach(budgetType => {
@@ -37,11 +90,8 @@ budgetTypes.forEach(budgetType => {
await page.goto('/');
await configurationPage.createTestFile();
- if (budgetType === 'Tracking') {
- // Set budget type to tracking
- const settingsPage = await navigation.goToSettingsPage();
- await settingsPage.useBudgetType('tracking');
- }
+ const settingsPage = await navigation.goToSettingsPage();
+ await settingsPage.useBudgetType(budgetType);
});
test.afterEach(async () => {
@@ -50,7 +100,6 @@ budgetTypes.forEach(budgetType => {
test('loads the budget page with budgeted amounts', async () => {
const budgetPage = await navigation.goToBudgetPage();
- await budgetPage.waitForBudgetTable();
await expect(budgetPage.categoryNames).toHaveText([
'Food',
@@ -77,7 +126,6 @@ budgetTypes.forEach(budgetType => {
test('checks that clicking the Actual logo in the page header opens the budget page menu', async () => {
const budgetPage = await navigation.goToBudgetPage();
- await budgetPage.waitForBudgetTable();
await budgetPage.openBudgetPageMenu();
@@ -89,7 +137,6 @@ budgetTypes.forEach(budgetType => {
test("checks that clicking the left arrow in the page header shows the previous month's budget", async () => {
const budgetPage = await navigation.goToBudgetPage();
- await budgetPage.waitForBudgetTable();
const selectedMonth = await budgetPage.getSelectedMonth();
const displayMonth = monthUtils.format(
@@ -111,7 +158,6 @@ budgetTypes.forEach(budgetType => {
test('checks that clicking the month in the page header opens the month menu modal', async () => {
const budgetPage = await navigation.goToBudgetPage();
- await budgetPage.waitForBudgetTable();
const selectedMonth = await budgetPage.getSelectedMonth();
@@ -130,7 +176,6 @@ budgetTypes.forEach(budgetType => {
test("checks that clicking the right arrow in the page header shows the next month's budget", async () => {
const budgetPage = await navigation.goToBudgetPage();
- await budgetPage.waitForBudgetTable();
const selectedMonth = await budgetPage.getSelectedMonth();
const displayMonth = monthUtils.format(
@@ -154,7 +199,6 @@ budgetTypes.forEach(budgetType => {
test('checks that clicking the category group name opens the category group menu modal', async () => {
const budgetPage = await navigation.goToBudgetPage();
- await budgetPage.waitForBudgetTable();
const categoryGroupName = await budgetPage.getCategoryGroupNameForRow(0);
await budgetPage.openCategoryGroupMenu(categoryGroupName);
@@ -169,16 +213,11 @@ budgetTypes.forEach(budgetType => {
test('checks that clicking the category name opens the category menu modal', async () => {
const budgetPage = await navigation.goToBudgetPage();
- await budgetPage.waitForBudgetTable();
const categoryName = await budgetPage.getCategoryNameForRow(0);
- await budgetPage.openCategoryMenu(categoryName);
+ const categoryMenuModal = await budgetPage.openCategoryMenu(categoryName);
- const categoryMenuModalHeading = page
- .getByRole('dialog')
- .getByRole('heading');
-
- await expect(categoryMenuModalHeading).toHaveText(categoryName);
+ await expect(categoryMenuModal.heading).toHaveText(categoryName);
await expect(page).toMatchThemeScreenshots();
});
@@ -186,32 +225,106 @@ budgetTypes.forEach(budgetType => {
test('checks that clicking the budgeted cell opens the budget menu modal', async () => {
const budgetPage = await navigation.goToBudgetPage();
- await budgetPage.waitForBudgetTable();
const categoryName = await budgetPage.getCategoryNameForRow(0);
- await budgetPage.openBudgetMenu(categoryName);
+ const budgetMenuModal = await budgetPage.openBudgetMenu(categoryName);
- const budgetMenuModalHeading = page
- .getByRole('dialog')
- .getByRole('heading');
-
- await expect(budgetMenuModalHeading).toHaveText(categoryName);
+ await expect(budgetMenuModal.heading).toHaveText(categoryName);
await expect(page).toMatchThemeScreenshots();
});
test('updates the budgeted amount', async () => {
const budgetPage = await navigation.goToBudgetPage();
- await budgetPage.waitForBudgetTable();
const categoryName = await budgetPage.getCategoryNameForRow(0);
+ const budgetMenuModal = await budgetPage.openBudgetMenu(categoryName);
+
+ const budgetAmount = 123;
- // Set to 100.00
- await budgetPage.setBudget(categoryName, 10000);
+ // Set to 123.00
+ await budgetMenuModal.setBudgetAmount(`${budgetAmount}00`);
const budgetedButton =
await budgetPage.getButtonForBudgeted(categoryName);
- await expect(budgetedButton).toHaveText('100.00');
+ await expect(budgetedButton).toHaveText(amountToCurrency(budgetAmount));
+ await expect(page).toMatchThemeScreenshots();
+ });
+
+ test(`copies last month's budget`, async () => {
+ const budgetPage = await navigation.goToBudgetPage();
+
+ const categoryName = await budgetPage.getCategoryNameForRow(3);
+ const budgetedButton =
+ await budgetPage.getButtonForBudgeted(categoryName);
+
+ await budgetPage.goToPreviousMonth();
+
+ const lastMonthBudget = await budgetedButton.textContent();
+
+ await budgetPage.goToNextMonth();
+
+ await copyLastMonthBudget(budgetPage, categoryName);
+
+ await expect(budgetedButton).toHaveText(lastMonthBudget);
+ await expect(page).toMatchThemeScreenshots();
+ });
+
+ [
+ [3, setTo3MonthAverage],
+ [6, setTo6MonthAverage],
+ [12, setToYearlyAverage],
+ ].forEach(([numberOfMonths, setBudgetAverageFn]) => {
+ test(`set budget to ${numberOfMonths} month average`, async () => {
+ const budgetPage = await navigation.goToBudgetPage();
+
+ const categoryName = await budgetPage.getCategoryNameForRow(3);
+
+ const averageSpent = await setBudgetAverage(
+ budgetPage,
+ categoryName,
+ numberOfMonths,
+ setBudgetAverageFn,
+ );
+
+ const budgetedButton =
+ await budgetPage.getButtonForBudgeted(categoryName);
+
+ await expect(budgetedButton).toHaveText(
+ amountToCurrency(Math.abs(averageSpent)),
+ );
+ await expect(page).toMatchThemeScreenshots();
+ });
+ });
+
+ test(`applies budget template`, async () => {
+ const settingsPage = await navigation.goToSettingsPage();
+ await settingsPage.enableExperimentalFeature('Goal templates');
+
+ const budgetPage = await navigation.goToBudgetPage();
+
+ const categoryName = await budgetPage.getCategoryNameForRow(1);
+
+ const amountToTemplate = 123;
+
+ const categoryMenuModal = await budgetPage.openCategoryMenu(categoryName);
+ const editNotesModal = await categoryMenuModal.editNotes();
+ const templateNotes = `#template ${amountToTemplate}`;
+ await editNotesModal.updateNotes(templateNotes);
+ await editNotesModal.close();
+
+ const budgetedButton =
+ await budgetPage.getButtonForBudgeted(categoryName);
+
+ const budgetMenuModal = await budgetPage.openBudgetMenu(categoryName);
+ await budgetMenuModal.applyBudgetTemplate();
+ await budgetMenuModal.close();
+
+ await expect(budgetedButton).toHaveText(
+ amountToCurrency(amountToTemplate),
+ );
+ const notification = page.getByRole('alert');
+ await expect(notification).toContainText(templateNotes);
await expect(page).toMatchThemeScreenshots();
});
@@ -219,7 +332,6 @@ budgetTypes.forEach(budgetType => {
test('checks that clicking spent cell redirects to the category transactions page', async () => {
const budgetPage = await navigation.goToBudgetPage();
- await budgetPage.waitForBudgetTable();
const categoryName = await budgetPage.getCategoryNameForRow(0);
const accountPage = await budgetPage.openSpentPage(categoryName);
@@ -233,31 +345,24 @@ budgetTypes.forEach(budgetType => {
test('checks that clicking the balance cell opens the balance menu modal', async () => {
const budgetPage = await navigation.goToBudgetPage();
- await budgetPage.waitForBudgetTable();
const categoryName = await budgetPage.getCategoryNameForRow(0);
- await budgetPage.openBalanceMenu(categoryName);
-
- const balanceMenuModalHeading = page
- .getByRole('dialog')
- .getByRole('heading');
+ const balanceMenuModal = await budgetPage.openBalanceMenu(categoryName);
- await expect(balanceMenuModalHeading).toHaveText(categoryName);
+ await expect(balanceMenuModal.heading).toHaveText(categoryName);
await expect(page).toMatchThemeScreenshots();
});
if (budgetType === 'Envelope') {
test('checks that clicking the To Budget/Overbudgeted amount opens the budget summary menu modal', async () => {
const budgetPage = await navigation.goToBudgetPage();
- await budgetPage.waitForBudgetTable();
-
- await budgetPage.openEnvelopeBudgetSummaryMenu();
- const summaryModalHeading = page
- .getByRole('dialog')
- .getByRole('heading');
+ const envelopeBudgetSummaryModal =
+ await budgetPage.openEnvelopeBudgetSummary();
- await expect(summaryModalHeading).toHaveText('Budget Summary');
+ await expect(envelopeBudgetSummaryModal.heading).toHaveText(
+ 'Budget Summary',
+ );
await expect(page).toMatchThemeScreenshots();
});
}
@@ -265,15 +370,13 @@ budgetTypes.forEach(budgetType => {
if (budgetType === 'Tracking') {
test('checks that clicking the Saved/Projected Savings/Overspent amount opens the budget summary menu modal', async () => {
const budgetPage = await navigation.goToBudgetPage();
- await budgetPage.waitForBudgetTable();
-
- await budgetPage.openTrackingBudgetSummaryMenu();
- const summaryModalHeading = page
- .getByRole('dialog')
- .getByRole('heading');
+ const trackingBudgetSummaryModal =
+ await budgetPage.openTrackingBudgetSummary();
- await expect(summaryModalHeading).toHaveText('Budget Summary');
+ await expect(trackingBudgetSummaryModal.heading).toHaveText(
+ 'Budget Summary',
+ );
await expect(page).toMatchThemeScreenshots();
});
}
diff --git a/packages/desktop-client/e2e/budget.mobile.test.js-snapshots/Mobile-Budget-Envelope-applies-budget-template-1-chromium-linux.png b/packages/desktop-client/e2e/budget.mobile.test.js-snapshots/Mobile-Budget-Envelope-applies-budget-template-1-chromium-linux.png
new file mode 100644
index 0000000000..84d59e5d88
Binary files /dev/null and b/packages/desktop-client/e2e/budget.mobile.test.js-snapshots/Mobile-Budget-Envelope-applies-budget-template-1-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/budget.mobile.test.js-snapshots/Mobile-Budget-Envelope-applies-budget-template-2-chromium-linux.png b/packages/desktop-client/e2e/budget.mobile.test.js-snapshots/Mobile-Budget-Envelope-applies-budget-template-2-chromium-linux.png
new file mode 100644
index 0000000000..4b99e6d627
Binary files /dev/null and b/packages/desktop-client/e2e/budget.mobile.test.js-snapshots/Mobile-Budget-Envelope-applies-budget-template-2-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/budget.mobile.test.js-snapshots/Mobile-Budget-Envelope-applies-budget-template-3-chromium-linux.png b/packages/desktop-client/e2e/budget.mobile.test.js-snapshots/Mobile-Budget-Envelope-applies-budget-template-3-chromium-linux.png
new file mode 100644
index 0000000000..d20da6111e
Binary files /dev/null and b/packages/desktop-client/e2e/budget.mobile.test.js-snapshots/Mobile-Budget-Envelope-applies-budget-template-3-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/budget.mobile.test.js-snapshots/Mobile-Budget-Envelope-copies-last-month-s-budget-1-chromium-linux.png b/packages/desktop-client/e2e/budget.mobile.test.js-snapshots/Mobile-Budget-Envelope-copies-last-month-s-budget-1-chromium-linux.png
new file mode 100644
index 0000000000..67c71dd087
Binary files /dev/null and b/packages/desktop-client/e2e/budget.mobile.test.js-snapshots/Mobile-Budget-Envelope-copies-last-month-s-budget-1-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/budget.mobile.test.js-snapshots/Mobile-Budget-Envelope-copies-last-month-s-budget-2-chromium-linux.png b/packages/desktop-client/e2e/budget.mobile.test.js-snapshots/Mobile-Budget-Envelope-copies-last-month-s-budget-2-chromium-linux.png
new file mode 100644
index 0000000000..137897f2a6
Binary files /dev/null and b/packages/desktop-client/e2e/budget.mobile.test.js-snapshots/Mobile-Budget-Envelope-copies-last-month-s-budget-2-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/budget.mobile.test.js-snapshots/Mobile-Budget-Envelope-copies-last-month-s-budget-3-chromium-linux.png b/packages/desktop-client/e2e/budget.mobile.test.js-snapshots/Mobile-Budget-Envelope-copies-last-month-s-budget-3-chromium-linux.png
new file mode 100644
index 0000000000..4e78aa0f65
Binary files /dev/null and b/packages/desktop-client/e2e/budget.mobile.test.js-snapshots/Mobile-Budget-Envelope-copies-last-month-s-budget-3-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/budget.mobile.test.js-snapshots/Mobile-Budget-Envelope-set-budget-to-12-month-average-1-chromium-linux.png b/packages/desktop-client/e2e/budget.mobile.test.js-snapshots/Mobile-Budget-Envelope-set-budget-to-12-month-average-1-chromium-linux.png
new file mode 100644
index 0000000000..29d854e725
Binary files /dev/null and b/packages/desktop-client/e2e/budget.mobile.test.js-snapshots/Mobile-Budget-Envelope-set-budget-to-12-month-average-1-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/budget.mobile.test.js-snapshots/Mobile-Budget-Envelope-set-budget-to-12-month-average-2-chromium-linux.png b/packages/desktop-client/e2e/budget.mobile.test.js-snapshots/Mobile-Budget-Envelope-set-budget-to-12-month-average-2-chromium-linux.png
new file mode 100644
index 0000000000..4504142695
Binary files /dev/null and b/packages/desktop-client/e2e/budget.mobile.test.js-snapshots/Mobile-Budget-Envelope-set-budget-to-12-month-average-2-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/budget.mobile.test.js-snapshots/Mobile-Budget-Envelope-set-budget-to-12-month-average-3-chromium-linux.png b/packages/desktop-client/e2e/budget.mobile.test.js-snapshots/Mobile-Budget-Envelope-set-budget-to-12-month-average-3-chromium-linux.png
new file mode 100644
index 0000000000..4a5c2c5f37
Binary files /dev/null and b/packages/desktop-client/e2e/budget.mobile.test.js-snapshots/Mobile-Budget-Envelope-set-budget-to-12-month-average-3-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/budget.mobile.test.js-snapshots/Mobile-Budget-Envelope-set-budget-to-3-month-average-1-chromium-linux.png b/packages/desktop-client/e2e/budget.mobile.test.js-snapshots/Mobile-Budget-Envelope-set-budget-to-3-month-average-1-chromium-linux.png
new file mode 100644
index 0000000000..b1a4885ec8
Binary files /dev/null and b/packages/desktop-client/e2e/budget.mobile.test.js-snapshots/Mobile-Budget-Envelope-set-budget-to-3-month-average-1-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/budget.mobile.test.js-snapshots/Mobile-Budget-Envelope-set-budget-to-3-month-average-2-chromium-linux.png b/packages/desktop-client/e2e/budget.mobile.test.js-snapshots/Mobile-Budget-Envelope-set-budget-to-3-month-average-2-chromium-linux.png
new file mode 100644
index 0000000000..ae4f551216
Binary files /dev/null and b/packages/desktop-client/e2e/budget.mobile.test.js-snapshots/Mobile-Budget-Envelope-set-budget-to-3-month-average-2-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/budget.mobile.test.js-snapshots/Mobile-Budget-Envelope-set-budget-to-3-month-average-3-chromium-linux.png b/packages/desktop-client/e2e/budget.mobile.test.js-snapshots/Mobile-Budget-Envelope-set-budget-to-3-month-average-3-chromium-linux.png
new file mode 100644
index 0000000000..c5ff17c866
Binary files /dev/null and b/packages/desktop-client/e2e/budget.mobile.test.js-snapshots/Mobile-Budget-Envelope-set-budget-to-3-month-average-3-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/budget.mobile.test.js-snapshots/Mobile-Budget-Envelope-set-budget-to-6-month-average-1-chromium-linux.png b/packages/desktop-client/e2e/budget.mobile.test.js-snapshots/Mobile-Budget-Envelope-set-budget-to-6-month-average-1-chromium-linux.png
new file mode 100644
index 0000000000..300f1cbd28
Binary files /dev/null and b/packages/desktop-client/e2e/budget.mobile.test.js-snapshots/Mobile-Budget-Envelope-set-budget-to-6-month-average-1-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/budget.mobile.test.js-snapshots/Mobile-Budget-Envelope-set-budget-to-6-month-average-2-chromium-linux.png b/packages/desktop-client/e2e/budget.mobile.test.js-snapshots/Mobile-Budget-Envelope-set-budget-to-6-month-average-2-chromium-linux.png
new file mode 100644
index 0000000000..99647b326d
Binary files /dev/null and b/packages/desktop-client/e2e/budget.mobile.test.js-snapshots/Mobile-Budget-Envelope-set-budget-to-6-month-average-2-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/budget.mobile.test.js-snapshots/Mobile-Budget-Envelope-set-budget-to-6-month-average-3-chromium-linux.png b/packages/desktop-client/e2e/budget.mobile.test.js-snapshots/Mobile-Budget-Envelope-set-budget-to-6-month-average-3-chromium-linux.png
new file mode 100644
index 0000000000..3f62126672
Binary files /dev/null and b/packages/desktop-client/e2e/budget.mobile.test.js-snapshots/Mobile-Budget-Envelope-set-budget-to-6-month-average-3-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/budget.mobile.test.js-snapshots/Mobile-Budget-Envelope-updates-the-budgeted-amount-1-chromium-linux.png b/packages/desktop-client/e2e/budget.mobile.test.js-snapshots/Mobile-Budget-Envelope-updates-the-budgeted-amount-1-chromium-linux.png
index d5c54e0103..8d1410f141 100644
Binary files a/packages/desktop-client/e2e/budget.mobile.test.js-snapshots/Mobile-Budget-Envelope-updates-the-budgeted-amount-1-chromium-linux.png and b/packages/desktop-client/e2e/budget.mobile.test.js-snapshots/Mobile-Budget-Envelope-updates-the-budgeted-amount-1-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/budget.mobile.test.js-snapshots/Mobile-Budget-Envelope-updates-the-budgeted-amount-2-chromium-linux.png b/packages/desktop-client/e2e/budget.mobile.test.js-snapshots/Mobile-Budget-Envelope-updates-the-budgeted-amount-2-chromium-linux.png
index 49dd860f92..5eee10c8c0 100644
Binary files a/packages/desktop-client/e2e/budget.mobile.test.js-snapshots/Mobile-Budget-Envelope-updates-the-budgeted-amount-2-chromium-linux.png and b/packages/desktop-client/e2e/budget.mobile.test.js-snapshots/Mobile-Budget-Envelope-updates-the-budgeted-amount-2-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/budget.mobile.test.js-snapshots/Mobile-Budget-Envelope-updates-the-budgeted-amount-3-chromium-linux.png b/packages/desktop-client/e2e/budget.mobile.test.js-snapshots/Mobile-Budget-Envelope-updates-the-budgeted-amount-3-chromium-linux.png
index 733ca4c7cf..01cf9184a2 100644
Binary files a/packages/desktop-client/e2e/budget.mobile.test.js-snapshots/Mobile-Budget-Envelope-updates-the-budgeted-amount-3-chromium-linux.png and b/packages/desktop-client/e2e/budget.mobile.test.js-snapshots/Mobile-Budget-Envelope-updates-the-budgeted-amount-3-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/budget.mobile.test.js-snapshots/Mobile-Budget-Tracking-applies-budget-template-1-chromium-linux.png b/packages/desktop-client/e2e/budget.mobile.test.js-snapshots/Mobile-Budget-Tracking-applies-budget-template-1-chromium-linux.png
new file mode 100644
index 0000000000..ca4dbc86cf
Binary files /dev/null and b/packages/desktop-client/e2e/budget.mobile.test.js-snapshots/Mobile-Budget-Tracking-applies-budget-template-1-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/budget.mobile.test.js-snapshots/Mobile-Budget-Tracking-applies-budget-template-2-chromium-linux.png b/packages/desktop-client/e2e/budget.mobile.test.js-snapshots/Mobile-Budget-Tracking-applies-budget-template-2-chromium-linux.png
new file mode 100644
index 0000000000..cba9f22051
Binary files /dev/null and b/packages/desktop-client/e2e/budget.mobile.test.js-snapshots/Mobile-Budget-Tracking-applies-budget-template-2-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/budget.mobile.test.js-snapshots/Mobile-Budget-Tracking-applies-budget-template-3-chromium-linux.png b/packages/desktop-client/e2e/budget.mobile.test.js-snapshots/Mobile-Budget-Tracking-applies-budget-template-3-chromium-linux.png
new file mode 100644
index 0000000000..a61c8143be
Binary files /dev/null and b/packages/desktop-client/e2e/budget.mobile.test.js-snapshots/Mobile-Budget-Tracking-applies-budget-template-3-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/budget.mobile.test.js-snapshots/Mobile-Budget-Tracking-copies-last-month-s-budget-1-chromium-linux.png b/packages/desktop-client/e2e/budget.mobile.test.js-snapshots/Mobile-Budget-Tracking-copies-last-month-s-budget-1-chromium-linux.png
new file mode 100644
index 0000000000..7ccff58c18
Binary files /dev/null and b/packages/desktop-client/e2e/budget.mobile.test.js-snapshots/Mobile-Budget-Tracking-copies-last-month-s-budget-1-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/budget.mobile.test.js-snapshots/Mobile-Budget-Tracking-copies-last-month-s-budget-2-chromium-linux.png b/packages/desktop-client/e2e/budget.mobile.test.js-snapshots/Mobile-Budget-Tracking-copies-last-month-s-budget-2-chromium-linux.png
new file mode 100644
index 0000000000..94d0d64dc2
Binary files /dev/null and b/packages/desktop-client/e2e/budget.mobile.test.js-snapshots/Mobile-Budget-Tracking-copies-last-month-s-budget-2-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/budget.mobile.test.js-snapshots/Mobile-Budget-Tracking-copies-last-month-s-budget-3-chromium-linux.png b/packages/desktop-client/e2e/budget.mobile.test.js-snapshots/Mobile-Budget-Tracking-copies-last-month-s-budget-3-chromium-linux.png
new file mode 100644
index 0000000000..18ff1d4e89
Binary files /dev/null and b/packages/desktop-client/e2e/budget.mobile.test.js-snapshots/Mobile-Budget-Tracking-copies-last-month-s-budget-3-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/budget.mobile.test.js-snapshots/Mobile-Budget-Tracking-set-budget-to-12-month-average-1-chromium-linux.png b/packages/desktop-client/e2e/budget.mobile.test.js-snapshots/Mobile-Budget-Tracking-set-budget-to-12-month-average-1-chromium-linux.png
new file mode 100644
index 0000000000..fb5f9a1004
Binary files /dev/null and b/packages/desktop-client/e2e/budget.mobile.test.js-snapshots/Mobile-Budget-Tracking-set-budget-to-12-month-average-1-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/budget.mobile.test.js-snapshots/Mobile-Budget-Tracking-set-budget-to-12-month-average-2-chromium-linux.png b/packages/desktop-client/e2e/budget.mobile.test.js-snapshots/Mobile-Budget-Tracking-set-budget-to-12-month-average-2-chromium-linux.png
new file mode 100644
index 0000000000..48021d7b6f
Binary files /dev/null and b/packages/desktop-client/e2e/budget.mobile.test.js-snapshots/Mobile-Budget-Tracking-set-budget-to-12-month-average-2-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/budget.mobile.test.js-snapshots/Mobile-Budget-Tracking-set-budget-to-12-month-average-3-chromium-linux.png b/packages/desktop-client/e2e/budget.mobile.test.js-snapshots/Mobile-Budget-Tracking-set-budget-to-12-month-average-3-chromium-linux.png
new file mode 100644
index 0000000000..8aea962112
Binary files /dev/null and b/packages/desktop-client/e2e/budget.mobile.test.js-snapshots/Mobile-Budget-Tracking-set-budget-to-12-month-average-3-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/budget.mobile.test.js-snapshots/Mobile-Budget-Tracking-set-budget-to-3-month-average-1-chromium-linux.png b/packages/desktop-client/e2e/budget.mobile.test.js-snapshots/Mobile-Budget-Tracking-set-budget-to-3-month-average-1-chromium-linux.png
new file mode 100644
index 0000000000..f0339368f8
Binary files /dev/null and b/packages/desktop-client/e2e/budget.mobile.test.js-snapshots/Mobile-Budget-Tracking-set-budget-to-3-month-average-1-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/budget.mobile.test.js-snapshots/Mobile-Budget-Tracking-set-budget-to-3-month-average-2-chromium-linux.png b/packages/desktop-client/e2e/budget.mobile.test.js-snapshots/Mobile-Budget-Tracking-set-budget-to-3-month-average-2-chromium-linux.png
new file mode 100644
index 0000000000..548c941757
Binary files /dev/null and b/packages/desktop-client/e2e/budget.mobile.test.js-snapshots/Mobile-Budget-Tracking-set-budget-to-3-month-average-2-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/budget.mobile.test.js-snapshots/Mobile-Budget-Tracking-set-budget-to-3-month-average-3-chromium-linux.png b/packages/desktop-client/e2e/budget.mobile.test.js-snapshots/Mobile-Budget-Tracking-set-budget-to-3-month-average-3-chromium-linux.png
new file mode 100644
index 0000000000..c4df2d4ccc
Binary files /dev/null and b/packages/desktop-client/e2e/budget.mobile.test.js-snapshots/Mobile-Budget-Tracking-set-budget-to-3-month-average-3-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/budget.mobile.test.js-snapshots/Mobile-Budget-Tracking-set-budget-to-6-month-average-1-chromium-linux.png b/packages/desktop-client/e2e/budget.mobile.test.js-snapshots/Mobile-Budget-Tracking-set-budget-to-6-month-average-1-chromium-linux.png
new file mode 100644
index 0000000000..fdf1c3efc0
Binary files /dev/null and b/packages/desktop-client/e2e/budget.mobile.test.js-snapshots/Mobile-Budget-Tracking-set-budget-to-6-month-average-1-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/budget.mobile.test.js-snapshots/Mobile-Budget-Tracking-set-budget-to-6-month-average-2-chromium-linux.png b/packages/desktop-client/e2e/budget.mobile.test.js-snapshots/Mobile-Budget-Tracking-set-budget-to-6-month-average-2-chromium-linux.png
new file mode 100644
index 0000000000..6abaecbf41
Binary files /dev/null and b/packages/desktop-client/e2e/budget.mobile.test.js-snapshots/Mobile-Budget-Tracking-set-budget-to-6-month-average-2-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/budget.mobile.test.js-snapshots/Mobile-Budget-Tracking-set-budget-to-6-month-average-3-chromium-linux.png b/packages/desktop-client/e2e/budget.mobile.test.js-snapshots/Mobile-Budget-Tracking-set-budget-to-6-month-average-3-chromium-linux.png
new file mode 100644
index 0000000000..a4795b81bd
Binary files /dev/null and b/packages/desktop-client/e2e/budget.mobile.test.js-snapshots/Mobile-Budget-Tracking-set-budget-to-6-month-average-3-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/budget.mobile.test.js-snapshots/Mobile-Budget-Tracking-updates-the-budgeted-amount-1-chromium-linux.png b/packages/desktop-client/e2e/budget.mobile.test.js-snapshots/Mobile-Budget-Tracking-updates-the-budgeted-amount-1-chromium-linux.png
index 4b2666d746..2e23c82f7e 100644
Binary files a/packages/desktop-client/e2e/budget.mobile.test.js-snapshots/Mobile-Budget-Tracking-updates-the-budgeted-amount-1-chromium-linux.png and b/packages/desktop-client/e2e/budget.mobile.test.js-snapshots/Mobile-Budget-Tracking-updates-the-budgeted-amount-1-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/budget.mobile.test.js-snapshots/Mobile-Budget-Tracking-updates-the-budgeted-amount-2-chromium-linux.png b/packages/desktop-client/e2e/budget.mobile.test.js-snapshots/Mobile-Budget-Tracking-updates-the-budgeted-amount-2-chromium-linux.png
index 5b6db47d44..0be2162edd 100644
Binary files a/packages/desktop-client/e2e/budget.mobile.test.js-snapshots/Mobile-Budget-Tracking-updates-the-budgeted-amount-2-chromium-linux.png and b/packages/desktop-client/e2e/budget.mobile.test.js-snapshots/Mobile-Budget-Tracking-updates-the-budgeted-amount-2-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/budget.mobile.test.js-snapshots/Mobile-Budget-Tracking-updates-the-budgeted-amount-3-chromium-linux.png b/packages/desktop-client/e2e/budget.mobile.test.js-snapshots/Mobile-Budget-Tracking-updates-the-budgeted-amount-3-chromium-linux.png
index 1932b47c9a..a1e56532af 100644
Binary files a/packages/desktop-client/e2e/budget.mobile.test.js-snapshots/Mobile-Budget-Tracking-updates-the-budgeted-amount-3-chromium-linux.png and b/packages/desktop-client/e2e/budget.mobile.test.js-snapshots/Mobile-Budget-Tracking-updates-the-budgeted-amount-3-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/page-models/account-page.js b/packages/desktop-client/e2e/page-models/account-page.js
index 47bdb6e961..cbdf4efef4 100644
--- a/packages/desktop-client/e2e/page-models/account-page.js
+++ b/packages/desktop-client/e2e/page-models/account-page.js
@@ -131,8 +131,8 @@ export class AccountPage {
await this.accountMenuButton.click();
await this.page.getByRole('button', { name: 'Close Account' }).click();
return new CloseAccountModal(
- this.page.getByTestId('close-account-modal'),
this.page,
+ this.page.getByTestId('close-account-modal'),
);
}
diff --git a/packages/desktop-client/e2e/page-models/close-account-modal.js b/packages/desktop-client/e2e/page-models/close-account-modal.js
index 7cd689732a..dc975a1d71 100644
--- a/packages/desktop-client/e2e/page-models/close-account-modal.js
+++ b/packages/desktop-client/e2e/page-models/close-account-modal.js
@@ -1,15 +1,15 @@
export class CloseAccountModal {
- constructor(page, rootPage) {
+ constructor(page, locator) {
this.page = page;
- this.rootPage = rootPage;
+ this.locator = locator;
}
async selectTransferAccount(accountName) {
- await this.page.getByPlaceholder('Select account...').fill(accountName);
- await this.rootPage.keyboard.press('Enter');
+ await this.locator.getByPlaceholder('Select account...').fill(accountName);
+ await this.page.keyboard.press('Enter');
}
async closeAccount() {
- await this.page.getByRole('button', { name: 'Close account' }).click();
+ await this.locator.getByRole('button', { name: 'Close account' }).click();
}
}
diff --git a/packages/desktop-client/e2e/page-models/mobile-accounts-page.js b/packages/desktop-client/e2e/page-models/mobile-accounts-page.js
index b440a55b10..365584e73e 100644
--- a/packages/desktop-client/e2e/page-models/mobile-accounts-page.js
+++ b/packages/desktop-client/e2e/page-models/mobile-accounts-page.js
@@ -5,7 +5,7 @@ export class MobileAccountsPage {
this.page = page;
this.accountList = this.page.getByLabel('Account list');
- this.accounts = this.page.getByTestId('account');
+ this.accountListItems = this.accountList.getByTestId('account-list-item');
}
async waitFor() {
@@ -16,7 +16,7 @@ export class MobileAccountsPage {
* Get the name and balance of the nth account
*/
async getNthAccount(idx) {
- const accountRow = this.accounts.nth(idx);
+ const accountRow = this.accountListItems.nth(idx);
return {
name: accountRow.getByTestId('account-name'),
@@ -28,7 +28,7 @@ export class MobileAccountsPage {
* Click on the n-th account to open it up
*/
async openNthAccount(idx) {
- await this.accounts.nth(idx).click();
+ await this.accountListItems.nth(idx).click();
return new MobileAccountPage(this.page);
}
diff --git a/packages/desktop-client/e2e/page-models/mobile-balance-menu-modal.js b/packages/desktop-client/e2e/page-models/mobile-balance-menu-modal.js
new file mode 100644
index 0000000000..e802354013
--- /dev/null
+++ b/packages/desktop-client/e2e/page-models/mobile-balance-menu-modal.js
@@ -0,0 +1,25 @@
+export class BalanceMenuModal {
+ constructor(page, locator) {
+ this.page = page;
+ this.locator = locator;
+
+ this.heading = locator.getByRole('heading');
+ this.balanceAmountInput = locator.getByTestId('amount-input');
+ this.transferToAnotherCategoryButton = locator.getByRole('button', {
+ name: 'Transfer to another category',
+ });
+ this.coverOverspendingButton = locator.getByRole('button', {
+ name: 'Cover overspending',
+ });
+ this.rolloverOverspendingButton = locator.getByRole('button', {
+ name: 'Rollover overspending',
+ });
+ this.removeOverspendingRolloverButton = locator.getByRole('button', {
+ name: 'Remove overspending rollover',
+ });
+ }
+
+ async close() {
+ await this.heading.getByRole('button', { name: 'Close' }).click();
+ }
+}
diff --git a/packages/desktop-client/e2e/page-models/mobile-budget-menu-modal.js b/packages/desktop-client/e2e/page-models/mobile-budget-menu-modal.js
new file mode 100644
index 0000000000..774448c696
--- /dev/null
+++ b/packages/desktop-client/e2e/page-models/mobile-budget-menu-modal.js
@@ -0,0 +1,54 @@
+export class BudgetMenuModal {
+ constructor(page, locator) {
+ this.page = page;
+ this.locator = locator;
+
+ this.heading = locator.getByRole('heading');
+ this.budgetAmountInput = locator.getByTestId('amount-input');
+ this.copyLastMonthBudgetButton = locator.getByRole('button', {
+ name: 'Copy last month’s budget',
+ });
+ this.setTo3MonthAverageButton = locator.getByRole('button', {
+ name: 'Set to 3 month average',
+ });
+ this.setTo6MonthAverageButton = locator.getByRole('button', {
+ name: 'Set to 6 month average',
+ });
+ this.setToYearlyAverageButton = locator.getByRole('button', {
+ name: 'Set to yearly average',
+ });
+ this.applyBudgetTemplateButton = locator.getByRole('button', {
+ name: 'Apply budget template',
+ });
+ }
+
+ async close() {
+ await this.heading.getByRole('button', { name: 'Close' }).click();
+ }
+
+ async setBudgetAmount(newAmount) {
+ await this.budgetAmountInput.fill(String(newAmount));
+ await this.budgetAmountInput.blur();
+ await this.close();
+ }
+
+ async copyLastMonthBudget() {
+ await this.copyLastMonthBudgetButton.click();
+ }
+
+ async setTo3MonthAverage() {
+ await this.setTo3MonthAverageButton.click();
+ }
+
+ async setTo6MonthAverage() {
+ await this.setTo6MonthAverageButton.click();
+ }
+
+ async setToYearlyAverage() {
+ await this.setToYearlyAverageButton.click();
+ }
+
+ async applyBudgetTemplate() {
+ await this.applyBudgetTemplateButton.click();
+ }
+}
diff --git a/packages/desktop-client/e2e/page-models/mobile-budget-page.js b/packages/desktop-client/e2e/page-models/mobile-budget-page.js
index 6e3689334f..3053557e14 100644
--- a/packages/desktop-client/e2e/page-models/mobile-budget-page.js
+++ b/packages/desktop-client/e2e/page-models/mobile-budget-page.js
@@ -1,4 +1,9 @@
import { MobileAccountPage } from './mobile-account-page';
+import { BalanceMenuModal } from './mobile-balance-menu-modal';
+import { BudgetMenuModal } from './mobile-budget-menu-modal';
+import { CategoryMenuModal } from './mobile-category-menu-modal';
+import { EnvelopeBudgetSummaryModal } from './mobile-envelope-budget-summary-modal';
+import { TrackingBudgetSummaryModal } from './mobile-tracking-budget-summary-modal';
export class MobileBudgetPage {
MONTH_HEADER_DATE_FORMAT = 'MMMM ‘yy';
@@ -78,8 +83,8 @@ export class MobileBudgetPage {
});
}
- async waitForBudgetTable() {
- await this.budgetTable.waitFor();
+ async waitFor(options) {
+ await this.budgetTable.waitFor(options);
}
async toggleVisibleColumns(maxAttempts = 3) {
@@ -139,6 +144,8 @@ export class MobileBudgetPage {
async openCategoryMenu(categoryName) {
const categoryButton = await this.#getButtonForCategory(categoryName);
await categoryButton.click();
+
+ return new CategoryMenuModal(this.page, this.page.getByRole('dialog'));
}
async #getButtonForCell(buttonType, categoryName) {
@@ -176,14 +183,8 @@ export class MobileBudgetPage {
async openBudgetMenu(categoryName) {
const budgetedButton = await this.getButtonForBudgeted(categoryName);
await budgetedButton.click();
- }
-
- async setBudget(categoryName, newAmount) {
- const budgetedButton = await this.getButtonForBudgeted(categoryName);
- await budgetedButton.click();
- await this.page.keyboard.type(String(newAmount));
- await this.page.keyboard.press('Enter');
+ return new BudgetMenuModal(this.page, this.page.getByRole('dialog'));
}
async openSpentPage(categoryName) {
@@ -200,6 +201,7 @@ export class MobileBudgetPage {
if (await balanceButton.isVisible()) {
await balanceButton.click();
+ return new BalanceMenuModal(this.page, this.page.getByRole('dialog'));
} else {
throw new Error(
`Balance button for category ${categoryName} not found or not visible`,
@@ -271,9 +273,14 @@ export class MobileBudgetPage {
);
}
- async openEnvelopeBudgetSummaryMenu() {
+ async openEnvelopeBudgetSummary() {
const budgetSummaryButton = await this.#getButtonForEnvelopeBudgetSummary();
await budgetSummaryButton.click();
+
+ return new EnvelopeBudgetSummaryModal(
+ this.page,
+ this.page.getByRole('dialog'),
+ );
}
async #getButtonForTrackingBudgetSummary({ throwIfNotFound = true } = {}) {
@@ -298,8 +305,13 @@ export class MobileBudgetPage {
);
}
- async openTrackingBudgetSummaryMenu() {
+ async openTrackingBudgetSummary() {
const budgetSummaryButton = await this.#getButtonForTrackingBudgetSummary();
await budgetSummaryButton.click();
+
+ return new TrackingBudgetSummaryModal(
+ this.page,
+ this.page.getByRole('dialog'),
+ );
}
}
diff --git a/packages/desktop-client/e2e/page-models/mobile-category-menu-modal.js b/packages/desktop-client/e2e/page-models/mobile-category-menu-modal.js
new file mode 100644
index 0000000000..f02ae03b8d
--- /dev/null
+++ b/packages/desktop-client/e2e/page-models/mobile-category-menu-modal.js
@@ -0,0 +1,22 @@
+import { EditNotesModal } from './mobile-edit-notes-modal';
+
+export class CategoryMenuModal {
+ constructor(page, locator) {
+ this.page = page;
+ this.locator = locator;
+
+ this.heading = locator.getByRole('heading');
+ this.budgetAmountInput = locator.getByTestId('amount-input');
+ this.editNotesButton = locator.getByRole('button', { name: 'Edit notes' });
+ }
+
+ async close() {
+ await this.heading.getByRole('button', { name: 'Close' }).click();
+ }
+
+ async editNotes() {
+ await this.editNotesButton.click();
+
+ return new EditNotesModal(this.page, this.page.getByRole('dialog'));
+ }
+}
diff --git a/packages/desktop-client/e2e/page-models/mobile-edit-notes-modal.js b/packages/desktop-client/e2e/page-models/mobile-edit-notes-modal.js
new file mode 100644
index 0000000000..c9c717df83
--- /dev/null
+++ b/packages/desktop-client/e2e/page-models/mobile-edit-notes-modal.js
@@ -0,0 +1,19 @@
+export class EditNotesModal {
+ constructor(page, locator) {
+ this.page = page;
+ this.locator = locator;
+
+ this.heading = locator.getByRole('heading');
+ this.textArea = locator.getByRole('textbox');
+ this.saveNotesButton = locator.getByRole('button', { name: 'Save notes' });
+ }
+
+ async close() {
+ await this.heading.getByRole('button', { name: 'Close' }).click();
+ }
+
+ async updateNotes(notes) {
+ await this.textArea.fill(notes);
+ await this.saveNotesButton.click();
+ }
+}
diff --git a/packages/desktop-client/e2e/page-models/mobile-envelope-budget-summary-modal.js b/packages/desktop-client/e2e/page-models/mobile-envelope-budget-summary-modal.js
new file mode 100644
index 0000000000..b0615c04d6
--- /dev/null
+++ b/packages/desktop-client/e2e/page-models/mobile-envelope-budget-summary-modal.js
@@ -0,0 +1,12 @@
+export class EnvelopeBudgetSummaryModal {
+ constructor(page, locator) {
+ this.page = page;
+ this.locator = locator;
+
+ this.heading = locator.getByRole('heading');
+ }
+
+ async close() {
+ await this.heading.getByRole('button', { name: 'Close' }).click();
+ }
+}
diff --git a/packages/desktop-client/e2e/page-models/mobile-navigation.js b/packages/desktop-client/e2e/page-models/mobile-navigation.js
index 6881b4d399..258ec5a77d 100644
--- a/packages/desktop-client/e2e/page-models/mobile-navigation.js
+++ b/packages/desktop-client/e2e/page-models/mobile-navigation.js
@@ -1,26 +1,122 @@
import { MobileAccountPage } from './mobile-account-page';
import { MobileAccountsPage } from './mobile-accounts-page';
import { MobileBudgetPage } from './mobile-budget-page';
+import { MobileReportsPage } from './mobile-reports-page';
import { MobileTransactionEntryPage } from './mobile-transaction-entry-page';
import { SettingsPage } from './settings-page';
export class MobileNavigation {
constructor(page) {
this.page = page;
+ this.heading = page.getByRole('heading');
+ this.navbar = page.getByRole('navigation');
+ this.mainContentSelector = '[role=main]';
+ this.navbarSelector = '[role=navigation]';
}
- async goToBudgetPage() {
- const link = this.page.getByRole('link', { name: 'Budget' });
- await link.click();
+ static #NAVBAR_ROWS = 3;
+ static #NAV_LINKS_HIDDEN_BY_DEFAULT = [
+ 'Reports',
+ 'Schedules',
+ 'Payees',
+ 'Rules',
+ 'Settings',
+ ];
+ static #ROUTES_BY_PAGE = {
+ Budget: '/budget',
+ Accounts: '/accounts',
+ Transactions: '/transactions/new',
+ Reports: '/reports',
+ Settings: '/settings',
+ };
+
+ async dragNavbarUp() {
+ const mainContentBoundingBox = await this.page
+ .locator(this.mainContentSelector)
+ .boundingBox();
+
+ const navbarBoundingBox = await this.page
+ .locator(this.navbarSelector)
+ .boundingBox();
- return new MobileBudgetPage(this.page);
+ await this.page.dragAndDrop(this.navbarSelector, this.mainContentSelector, {
+ sourcePosition: { x: 1, y: 0 },
+ targetPosition: {
+ x: 1,
+ y: mainContentBoundingBox.height - navbarBoundingBox.height,
+ },
+ });
}
- async goToAccountsPage() {
- const link = this.page.getByRole('link', { name: 'Accounts' });
+ async dragNavbarDown() {
+ const boundingBox = await this.page
+ .locator(this.navbarSelector)
+ .boundingBox();
+
+ await this.page.dragAndDrop(this.navbarSelector, this.navbarSelector, {
+ sourcePosition: { x: 1, y: 0 },
+ targetPosition: {
+ x: 1,
+ // Only scroll until bottom of screen i.e. bottom of first navbar row.
+ y: boundingBox.height / MobileNavigation.#NAVBAR_ROWS,
+ },
+ });
+ }
+
+ async hasNavbarState(...states) {
+ if ((await this.navbar.count()) === 0) {
+ // No navbar on page.
+ return false;
+ }
+
+ const dataNavbarState = await this.navbar.getAttribute('data-navbar-state');
+ return states.includes(dataNavbarState);
+ }
+
+ async navigateToPage(pageName, pageModelFactory) {
+ const pageInstance = pageModelFactory();
+
+ if (this.page.url().endsWith(MobileNavigation.#ROUTES_BY_PAGE[pageName])) {
+ // Already on the page.
+ return pageInstance;
+ }
+
+ await this.navbar.waitFor();
+
+ const navbarStates = MobileNavigation.#NAV_LINKS_HIDDEN_BY_DEFAULT.includes(
+ pageName,
+ )
+ ? ['default', 'hidden']
+ : ['hidden'];
+
+ if (await this.hasNavbarState(...navbarStates)) {
+ await this.dragNavbarUp();
+ }
+
+ const link = this.navbar.getByRole('link', { name: pageName });
await link.click();
- return new MobileAccountsPage(this.page);
+ await pageInstance.waitFor();
+
+ if (await this.hasNavbarState('open')) {
+ await this.dragNavbarDown();
+ }
+
+ return pageInstance;
+ }
+
+ async goToBudgetPage() {
+ return await this.navigateToPage(
+ 'Budget',
+ () => new MobileBudgetPage(this.page),
+ );
+ }
+
+ async goToAccountsPage() {
+ return await this.navigateToPage(
+ 'Accounts',
+ () => new MobileAccountsPage(this.page),
+ );
}
async goToUncategorizedPage() {
@@ -31,24 +127,23 @@ export class MobileNavigation {
}
async goToTransactionEntryPage() {
- const link = this.page.getByRole('link', { name: 'Transaction' });
- await link.click();
-
- return new MobileTransactionEntryPage(this.page);
+ return await this.navigateToPage(
+ 'Transaction',
+ () => new MobileTransactionEntryPage(this.page),
+ );
}
- async goToSettingsPage() {
- await this.dragNavbarUp();
-
- const link = this.page.getByRole('link', { name: 'Settings' });
- await link.click();
-
- return new SettingsPage(this.page);
+ async goToReportsPage() {
+ return await this.navigateToPage(
+ 'Reports',
+ () => new MobileReportsPage(this.page),
+ );
}
- async dragNavbarUp() {
- await this.page
- .getByRole('navigation')
- .dragTo(this.page.getByTestId('budget-table'));
+ async goToSettingsPage() {
+ return await this.navigateToPage(
+ 'Settings',
+ () => new SettingsPage(this.page),
+ );
}
}
diff --git a/packages/desktop-client/e2e/page-models/mobile-reports-page.js b/packages/desktop-client/e2e/page-models/mobile-reports-page.js
new file mode 100644
index 0000000000..76e317ab3c
--- /dev/null
+++ b/packages/desktop-client/e2e/page-models/mobile-reports-page.js
@@ -0,0 +1,11 @@
+export class MobileReportsPage {
+ constructor(page) {
+ this.page = page;
+
+ this.overview = page.getByTestId('reports-overview');
+ }
+
+ async waitFor(options) {
+ await this.overview.waitFor(options);
+ }
+}
diff --git a/packages/desktop-client/e2e/page-models/mobile-tracking-budget-summary-modal.js b/packages/desktop-client/e2e/page-models/mobile-tracking-budget-summary-modal.js
new file mode 100644
index 0000000000..f6afab7b20
--- /dev/null
+++ b/packages/desktop-client/e2e/page-models/mobile-tracking-budget-summary-modal.js
@@ -0,0 +1,12 @@
+export class TrackingBudgetSummaryModal {
+ constructor(page, locator) {
+ this.page = page;
+ this.locator = locator;
+
+ this.heading = locator.getByRole('heading');
+ }
+
+ async close() {
+ await this.heading.getByRole('button', { name: 'Close' }).click();
+ }
+}
diff --git a/packages/desktop-client/e2e/page-models/mobile-transaction-entry-page.js b/packages/desktop-client/e2e/page-models/mobile-transaction-entry-page.js
index c4281c2b99..b6de03dd92 100644
--- a/packages/desktop-client/e2e/page-models/mobile-transaction-entry-page.js
+++ b/packages/desktop-client/e2e/page-models/mobile-transaction-entry-page.js
@@ -3,10 +3,17 @@ import { MobileAccountPage } from './mobile-account-page';
export class MobileTransactionEntryPage {
constructor(page) {
this.page = page;
-
this.header = page.getByRole('heading');
- this.amountField = page.getByTestId('amount-input');
- this.add = page.getByRole('button', { name: 'Add transaction' });
+ this.transactionForm = page.getByTestId('transaction-form');
+ this.amountField = this.transactionForm.getByTestId('amount-input');
+ this.footer = page.getByTestId('transaction-form-footer');
+ this.addTransactionButton = this.footer.getByRole('button', {
+ name: 'Add transaction',
+ });
+ }
+
+ async waitFor(options) {
+ await this.transactionForm.waitFor(options);
}
async fillField(fieldLocator, content) {
@@ -16,7 +23,7 @@ export class MobileTransactionEntryPage {
}
async createTransaction() {
- await this.add.click();
+ await this.addTransactionButton.click();
return new MobileAccountPage(this.page);
}
diff --git a/packages/desktop-client/e2e/page-models/settings-page.js b/packages/desktop-client/e2e/page-models/settings-page.js
index 110dca4665..96045c3004 100644
--- a/packages/desktop-client/e2e/page-models/settings-page.js
+++ b/packages/desktop-client/e2e/page-models/settings-page.js
@@ -1,17 +1,51 @@
export class SettingsPage {
constructor(page) {
this.page = page;
+ this.settings = page.getByTestId('settings');
+ this.exportDataButton = this.settings.getByRole('button', {
+ name: 'Export data',
+ });
+ this.switchBudgetTypeButton = this.settings.getByRole('button', {
+ name: /^Switch to (envelope|tracking) budgeting$/i,
+ });
+ this.advancedSettingsButton =
+ this.settings.getByTestId('advanced-settings');
+ this.experimentalSettingsButton = this.settings.getByTestId(
+ 'experimental-settings',
+ );
+ }
+
+ async waitFor(options) {
+ await this.settings.waitFor(options);
}
async exportData() {
- await this.page.getByRole('button', { name: 'Export data' }).click();
+ await this.exportDataButton.click();
}
async useBudgetType(budgetType) {
- const switchBudgetTypeButton = this.page.getByRole('button', {
- name: `Switch to ${budgetType} budgeting`,
- });
+ await this.switchBudgetTypeButton.waitFor();
- await switchBudgetTypeButton.click();
+ const buttonText = await this.switchBudgetTypeButton.textContent();
+ if (buttonText.includes(budgetType.toLowerCase())) {
+ await this.switchBudgetTypeButton.click();
+ }
+ }
+
+ async enableExperimentalFeature(featureName) {
+ if (await this.advancedSettingsButton.isVisible()) {
+ await this.advancedSettingsButton.click();
+ }
+
+ if (await this.experimentalSettingsButton.isVisible()) {
+ await this.experimentalSettingsButton.click();
+ }
+
+ const featureCheckbox = this.page.getByRole('checkbox', {
+ name: featureName,
+ });
+ if (!(await featureCheckbox.isChecked())) {
+ await featureCheckbox.click();
+ }
}
}
diff --git a/packages/desktop-client/playwright.config.js b/packages/desktop-client/playwright.config.js
index 170172dc70..76399324ef 100644
--- a/packages/desktop-client/playwright.config.js
+++ b/packages/desktop-client/playwright.config.js
@@ -65,7 +65,7 @@ expect.extend({
// eslint-disable-next-line import/no-default-export
export default defineConfig({
- timeout: 30000, // 30 seconds
+ timeout: 45000, // 45 seconds
retries: 1,
testDir: 'e2e/',
reporter: !process.env.CI ? [['html', { open: 'never' }]] : undefined,
diff --git a/packages/desktop-client/src/components/Notifications.tsx b/packages/desktop-client/src/components/Notifications.tsx
index dde728d7d9..a8193d7b8e 100644
--- a/packages/desktop-client/src/components/Notifications.tsx
+++ b/packages/desktop-client/src/components/Notifications.tsx
@@ -131,6 +131,7 @@ function Notification({
return (
<View
+ role="alert"
style={{
marginTop: 10,
color: positive
diff --git a/packages/desktop-client/src/components/Page.tsx b/packages/desktop-client/src/components/Page.tsx
index 0bdb0a9686..6e750ce13d 100644
--- a/packages/desktop-client/src/components/Page.tsx
+++ b/packages/desktop-client/src/components/Page.tsx
@@ -140,6 +140,7 @@ export function Page({ header, style, padding, children, footer }: PageProps) {
>
{headerToRender}
<View
+ role="main"
style={{
flex: 1,
overflowY: isNarrowWidth ? 'auto' : undefined,
diff --git a/packages/desktop-client/src/components/mobile/MobileNavTabs.tsx b/packages/desktop-client/src/components/mobile/MobileNavTabs.tsx
index 307bf79c26..1ca7c37492 100644
--- a/packages/desktop-client/src/components/mobile/MobileNavTabs.tsx
+++ b/packages/desktop-client/src/components/mobile/MobileNavTabs.tsx
@@ -1,8 +1,9 @@
import React, {
- useCallback,
type ComponentProps,
type ComponentType,
type CSSProperties,
+ useCallback,
+ useState,
} from 'react';
import { NavLink } from 'react-router-dom';
import { useSpring, animated, config } from 'react-spring';
@@ -36,6 +37,9 @@ export const MOBILE_NAV_HEIGHT = ROW_HEIGHT + PILL_HEIGHT;
export function MobileNavTabs() {
const { isNarrowWidth } = useResponsive();
+ const [navbarState, setNavbarState] = useState<'default' | 'open' | 'hidden'>(
+ 'default',
+ );
const navTabStyle = {
flex: `1 1 ${100 / COLUMN_COUNT}%`,
@@ -49,6 +53,7 @@ export function MobileNavTabs() {
({ canceled }: { canceled?: boolean }) => {
// when cancel is true, it means that the user passed the upwards threshold
// so we change the spring config to create a nice wobbly effect
+ setNavbarState('open');
api.start({
y: OPEN_FULL_Y,
immediate: false,
@@ -60,6 +65,7 @@ export function MobileNavTabs() {
const openDefault = useCallback(
(velocity = 0) => {
+ setNavbarState('default');
api.start({
y: OPEN_DEFAULT_Y,
immediate: false,
@@ -71,6 +77,7 @@ export function MobileNavTabs() {
const hide = useCallback(
(velocity = 0) => {
+ setNavbarState('hidden');
api.start({
y: HIDDEN_Y,
immediate: false,
@@ -201,6 +208,7 @@ export function MobileNavTabs() {
bottom: 0,
...(!isNarrowWidth && { display: 'none' }),
}}
+ data-navbar-state={navbarState}
>
<View>
<div
@@ -254,6 +262,7 @@ function NavTab({ Icon: TabIcon, name, path, style, onClick }: NavTabProps) {
flexDirection: 'column',
textDecoration: 'none',
textAlign: 'center',
+ userSelect: 'none',
...style,
})}
onClick={onClick}
diff --git a/packages/desktop-client/src/components/mobile/accounts/Accounts.tsx b/packages/desktop-client/src/components/mobile/accounts/Accounts.tsx
index 5fdd24685f..c30b4690ca 100644
--- a/packages/desktop-client/src/components/mobile/accounts/Accounts.tsx
+++ b/packages/desktop-client/src/components/mobile/accounts/Accounts.tsx
@@ -128,7 +128,7 @@ function AccountCard({
boxShadow: `0 1px 1px ${theme.mobileAccountShadow}`,
marginTop: 10,
}}
- data-testid="account"
+ data-testid="account-list-item"
>
<View
style={{
diff --git a/packages/desktop-client/src/components/mobile/transactions/FocusableAmountInput.tsx b/packages/desktop-client/src/components/mobile/transactions/FocusableAmountInput.tsx
index 04e466b946..b8bc7569cb 100644
--- a/packages/desktop-client/src/components/mobile/transactions/FocusableAmountInput.tsx
+++ b/packages/desktop-client/src/components/mobile/transactions/FocusableAmountInput.tsx
@@ -154,7 +154,7 @@ const AmountInput = memo(function AmountInput({
pointerEvents: 'none',
...textStyle,
}}
- data-testid="amount-fake-input"
+ data-testid="amount-input-text"
>
{editing ? text : amountToCurrency(value)}
</Text>
diff --git a/packages/desktop-client/src/components/mobile/transactions/TransactionEdit.jsx b/packages/desktop-client/src/components/mobile/transactions/TransactionEdit.jsx
index 2c8fc8b856..4a95a2d6a4 100644
--- a/packages/desktop-client/src/components/mobile/transactions/TransactionEdit.jsx
+++ b/packages/desktop-client/src/components/mobile/transactions/TransactionEdit.jsx
@@ -186,6 +186,7 @@ function Footer({
return (
<View
+ data-testid="transaction-form-footer"
style={{
paddingLeft: styles.mobileEditingPadding,
paddingRight: styles.mobileEditingPadding,
@@ -774,7 +775,10 @@ const TransactionEditInner = memo(function TransactionEditInner({
}
padding={0}
>
- <View style={{ flexShrink: 0, marginTop: 20, marginBottom: 20 }}>
+ <View
+ data-testid="transaction-form"
+ style={{ flexShrink: 0, marginTop: 20, marginBottom: 20 }}
+ >
<View
style={{
alignItems: 'center',
diff --git a/packages/desktop-client/src/components/reports/Overview.tsx b/packages/desktop-client/src/components/reports/Overview.tsx
index 61a9ab1c94..9e3162b406 100644
--- a/packages/desktop-client/src/components/reports/Overview.tsx
+++ b/packages/desktop-client/src/components/reports/Overview.tsx
@@ -481,7 +481,7 @@ export function Overview() {
{isImporting ? (
<LoadingIndicator message={t('Import is running...')} />
) : (
- <View style={{ userSelect: 'none' }}>
+ <View data-testid="reports-overview" style={{ userSelect: 'none' }}>
<ResponsiveGridLayout
breakpoints={{ desktop: breakpoints.medium, mobile: 1 }}
layouts={{ desktop: layout, mobile: layout }}
diff --git a/packages/desktop-client/src/components/settings/index.tsx b/packages/desktop-client/src/components/settings/index.tsx
index 96337d9d45..80c6cb137e 100644
--- a/packages/desktop-client/src/components/settings/index.tsx
+++ b/packages/desktop-client/src/components/settings/index.tsx
@@ -170,6 +170,7 @@ export function Settings() {
}}
>
<View
+ data-testid="settings"
style={{
marginTop: 10,
flexShrink: 0,
diff --git a/upcoming-release-notes/3583.md b/upcoming-release-notes/3583.md
new file mode 100644
index 0000000000..46d537edd6
--- /dev/null
+++ b/upcoming-release-notes/3583.md
@@ -0,0 +1,6 @@
+---
+category: Maintenance
+authors: [joel-jeremy]
+---
+
+Mobile budget menu modal e2e tests