Skip to content

Commit eced118

Browse files
raksoooraksooo
committed
Merge branch 'add-custom-bridge-test-des-820'
2 parents f9e4201 + 9931f2c commit eced118

File tree

9 files changed

+289
-13
lines changed

9 files changed

+289
-13
lines changed

‎gui/locales/messages.pot

+8
Original file line numberDiff line numberDiff line change
@@ -261,6 +261,10 @@ msgctxt "accessibility"
261261
msgid "%(title)s, View loaded"
262262
msgstr ""
263263

264+
msgctxt "accessibility"
265+
msgid "Add new custom bridge"
266+
msgstr ""
267+
264268
msgctxt "accessibility"
265269
msgid "Close notification"
266270
msgstr ""
@@ -275,6 +279,10 @@ msgctxt "accessibility"
275279
msgid "Copy account number"
276280
msgstr ""
277281

282+
msgctxt "accessibility"
283+
msgid "Edit custom bridge"
284+
msgstr ""
285+
278286
msgctxt "accessibility"
279287
msgid "Expand %(location)s"
280288
msgstr ""

‎gui/src/renderer/components/EditCustomBridge.tsx

+5-1
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,11 @@ function CustomBridgeForm() {
9595
<SmallButton key="cancel" onClick={hideDeleteDialog}>
9696
{messages.gettext('Cancel')}
9797
</SmallButton>,
98-
<SmallButton key="delete" color={SmallButtonColor.red} onClick={onDelete}>
98+
<SmallButton
99+
key="delete"
100+
color={SmallButtonColor.red}
101+
onClick={onDelete}
102+
data-testid="delete-confirm">
99103
{messages.gettext('Delete')}
100104
</SmallButton>,
101105
]}

‎gui/src/renderer/components/OpenVpnSettings.tsx

+2-1
Original file line numberDiff line numberDiff line change
@@ -269,6 +269,7 @@ function BridgeModeSelector() {
269269
label: messages.gettext('On'),
270270
value: 'on',
271271
disabled: tunnelProtocol !== 'openvpn' || transportProtocol === 'udp',
272+
'data-testid': 'bridge-mode-on',
272273
},
273274
{
274275
label: messages.gettext('Off'),
@@ -367,7 +368,7 @@ function BridgeModeSelector() {
367368
<SmallButton key="cancel" onClick={hideConfirmationDialog}>
368369
{messages.gettext('Cancel')}
369370
</SmallButton>,
370-
<SmallButton key="confirm" onClick={confirmBridgeState}>
371+
<SmallButton key="confirm" onClick={confirmBridgeState} data-testid="enable-confirm">
371372
{messages.gettext('Enable')}
372373
</SmallButton>,
373374
]}

‎gui/src/renderer/components/cell/Selector.tsx

+8-2
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@ export interface SelectorItem<T> {
1616
label: string;
1717
value: T;
1818
disabled?: boolean;
19+
// eslint-disable-next-line @typescript-eslint/naming-convention
20+
'data-testid'?: string;
1921
}
2022

2123
// T represents the available values and U represent the value of "Automatic"/"Any" if there is one.
@@ -51,7 +53,8 @@ export default function Selector<T, U>(props: SelectorProps<T, U>) {
5153
isSelected={selected}
5254
disabled={props.disabled || item.disabled}
5355
forwardedRef={ref}
54-
onSelect={props.onSelect}>
56+
onSelect={props.onSelect}
57+
data-testid={item['data-testid']}>
5558
{item.label}
5659
</SelectorCell>
5760
);
@@ -133,6 +136,8 @@ interface SelectorCellProps<T> {
133136
onSelect: (value: T) => void;
134137
children: React.ReactNode | Array<React.ReactNode>;
135138
forwardedRef?: React.Ref<HTMLButtonElement>;
139+
// eslint-disable-next-line @typescript-eslint/naming-convention
140+
'data-testid'?: string;
136141
}
137142

138143
function SelectorCell<T>(props: SelectorCellProps<T>) {
@@ -150,7 +155,8 @@ function SelectorCell<T>(props: SelectorCellProps<T>) {
150155
disabled={props.disabled}
151156
role="option"
152157
aria-selected={props.isSelected}
153-
aria-disabled={props.disabled}>
158+
aria-disabled={props.disabled}
159+
data-testid={props['data-testid']}>
154160
<StyledCellIcon
155161
$visible={props.isSelected}
156162
source="icon-tick"

‎gui/src/renderer/components/select-location/SpecialLocationList.tsx

+10-2
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,8 @@ export function CustomBridgeLocationRow(
108108
const history = useHistory();
109109

110110
const bridgeSettings = useSelector((state) => state.settings.bridgeSettings);
111-
const icon = bridgeSettings.custom !== undefined ? 'icon-edit' : 'icon-add';
111+
const bridgeConfigured = bridgeSettings.custom !== undefined;
112+
const icon = bridgeConfigured ? 'icon-edit' : 'icon-add';
112113

113114
const selectedRef = props.source.selected ? props.selectedElementRef : undefined;
114115
const background = getButtonColor(props.source.selected, 0, props.source.disabled);
@@ -135,7 +136,14 @@ export function CustomBridgeLocationRow(
135136
'A custom bridge server can be used to circumvent censorship when regular Mullvad bridge servers don’t work.',
136137
)}
137138
/>
138-
<StyledLocationRowIcon {...background} onClick={navigate}>
139+
<StyledLocationRowIcon
140+
{...background}
141+
aria-label={
142+
bridgeConfigured
143+
? messages.pgettext('accessibility', 'Edit custom bridge')
144+
: messages.pgettext('accessibility', 'Add new custom bridge')
145+
}
146+
onClick={navigate}>
139147
<StyledSpecialLocationSideButton
140148
source={icon}
141149
width={18}

‎gui/src/renderer/components/select-location/select-location-hooks.ts

+1
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,7 @@ export function useOnSelectBridgeLocation() {
121121
case SpecialBridgeLocationType.closestToExit:
122122
return setLocation(
123123
bridgeSettingsModifier((bridgeSettings) => {
124+
bridgeSettings.type = 'normal';
124125
bridgeSettings.normal.location = 'any';
125126
return bridgeSettings;
126127
}),

‎gui/test/e2e/installed/state-dependent/custom-bridge.spec.ts

+173
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,173 @@
1+
import { expect, test } from '@playwright/test';
2+
import { Page } from 'playwright';
3+
4+
import { startInstalledApp } from '../installed-utils';
5+
import { TestUtils } from '../../utils';
6+
import { colors } from '../../../../src/config.json';
7+
import { RoutePath } from '../../../../src/renderer/lib/routes';
8+
9+
// This test expects the daemon to be logged in and not have a custom bridge configured.
10+
// Env parameters:
11+
// `SHADOWSOCKS_SERVER_IP`
12+
// `SHADOWSOCKS_SERVER_PORT`
13+
// `SHADOWSOCKS_SERVER_CIPHER`
14+
// `SHADOWSOCKS_SERVER_PASSWORD`
15+
16+
let page: Page;
17+
let util: TestUtils;
18+
19+
test.beforeAll(async () => {
20+
({ page, util } = await startInstalledApp());
21+
});
22+
23+
test.afterAll(async () => {
24+
await page.close();
25+
});
26+
27+
test('App should enable bridge mode', async () => {
28+
await util.waitForNavigation(async () => await page.click('button[aria-label="Settings"]'));
29+
expect(
30+
await util.waitForNavigation(async () => await page.getByText('VPN settings').click()),
31+
).toBe(RoutePath.vpnSettings);
32+
33+
await page.getByRole('option', { name: 'OpenVPN' }).click();
34+
35+
expect(
36+
await util.waitForNavigation(async () => await page.getByText('OpenVPN settings').click()),
37+
).toBe(RoutePath.openVpnSettings);
38+
39+
await page.getByTestId('bridge-mode-on').click();
40+
await expect(page.getByText('Enable bridge mode?')).toBeVisible();
41+
42+
page.getByTestId('enable-confirm').click();
43+
44+
await util.waitForNavigation(async () => await page.click('button[aria-label="Back"]'));
45+
await util.waitForNavigation(async () => await page.click('button[aria-label="Back"]'));
46+
expect(
47+
await util.waitForNavigation(async () => await page.click('button[aria-label="Close"]')),
48+
).toBe(RoutePath.main);
49+
});
50+
51+
test('App display disabled custom bridge', async () => {
52+
expect(
53+
await util.waitForNavigation(
54+
async () => await page.click('button[aria-label^="Select location"]'),
55+
),
56+
).toBe(RoutePath.selectLocation);
57+
58+
const title = page.locator('h1')
59+
await expect(title).toHaveText('Select location');
60+
61+
await page.getByText(/^Entry$/).click();
62+
63+
const customBridgeButton = page.getByText('Custom bridge');
64+
await expect(customBridgeButton).toBeDisabled();
65+
});
66+
67+
test('App should add new custom bridge', async () => {
68+
expect(
69+
await util.waitForNavigation(
70+
async () => await page.click('button[aria-label="Add new custom bridge"]'),
71+
),
72+
).toBe(RoutePath.editCustomBridge);
73+
74+
const title = page.locator('h1')
75+
await expect(title).toHaveText('Add custom bridge');
76+
77+
const inputs = page.locator('input');
78+
const addButton = page.locator('button:has-text("Add")');
79+
await expect(addButton).toBeVisible();
80+
await expect(addButton).toBeDisabled();
81+
82+
await inputs.first().fill(process.env.SHADOWSOCKS_SERVER_IP!);
83+
await expect(addButton).toBeDisabled();
84+
85+
await inputs.nth(1).fill('443');
86+
await expect(addButton).toBeEnabled();
87+
88+
await inputs.nth(2).fill(process.env.SHADOWSOCKS_SERVER_PASSWORD!);
89+
90+
await page.getByTestId('ciphers').click();
91+
await page.getByRole('option', { name: process.env.SHADOWSOCKS_SERVER_CIPHER!, exact: true }).click();
92+
93+
expect(
94+
await util.waitForNavigation(async () => await addButton.click())
95+
).toEqual(RoutePath.selectLocation);
96+
97+
const customBridgeButton = page.getByText('Custom bridge');
98+
await expect(customBridgeButton).toBeEnabled();
99+
100+
await expect(page.locator('button[aria-label="Edit custom bridge"]')).toBeVisible();
101+
});
102+
103+
test('App should select custom bridge', async () => {
104+
const customBridgeButton = page.locator('button:has-text("Custom bridge")');
105+
await expect(customBridgeButton).toHaveCSS('background-color', colors.green);
106+
107+
const automaticButton = page.getByText('Automatic');
108+
await automaticButton.click();
109+
await page.getByText(/^Entry$/).click();
110+
await expect(customBridgeButton).not.toHaveCSS('background-color', colors.green);
111+
112+
113+
await customBridgeButton.click();
114+
await page.getByText(/^Entry$/).click();
115+
await expect(customBridgeButton).toHaveCSS('background-color', colors.green);
116+
117+
});
118+
119+
test('App should edit custom bridge', async () => {
120+
const automaticButton = page.getByText('Automatic');
121+
await automaticButton.click();
122+
await page.getByText(/^Entry$/).click();
123+
124+
expect(
125+
await util.waitForNavigation(
126+
async () => await page.click('button[aria-label="Edit custom bridge"]'),
127+
),
128+
).toBe(RoutePath.editCustomBridge);
129+
130+
const title = page.locator('h1')
131+
await expect(title).toHaveText('Edit custom bridge');
132+
133+
const inputs = page.locator('input');
134+
const saveButton = page.locator('button:has-text("Save")');
135+
await expect(saveButton).toBeVisible();
136+
await expect(saveButton).toBeEnabled();
137+
138+
await inputs.nth(1).fill(process.env.SHADOWSOCKS_SERVER_PORT!);
139+
await expect(saveButton).toBeEnabled();
140+
141+
142+
expect(
143+
await util.waitForNavigation(async () => await saveButton.click())
144+
).toEqual(RoutePath.selectLocation);
145+
146+
const customBridgeButton = page.locator('button:has-text("Custom bridge")');
147+
await expect(customBridgeButton).toBeEnabled();
148+
await expect(customBridgeButton).toHaveCSS('background-color', colors.green);
149+
});
150+
151+
test('App should delete custom bridge', async () => {
152+
expect(
153+
await util.waitForNavigation(
154+
async () => await page.click('button[aria-label="Edit custom bridge"]'),
155+
),
156+
).toBe(RoutePath.editCustomBridge);
157+
158+
const deleteButton = page.locator('button:has-text("Delete")');
159+
await expect(deleteButton).toBeVisible();
160+
await expect(deleteButton).toBeEnabled();
161+
162+
await deleteButton.click();
163+
await expect(page.getByText('Delete custom bridge?')).toBeVisible();
164+
165+
const confirmButton = page.getByTestId('delete-confirm');
166+
expect(
167+
await util.waitForNavigation(async () => await confirmButton.click())
168+
).toEqual(RoutePath.selectLocation);
169+
170+
const customBridgeButton = page.locator('button:has-text("Custom bridge")');
171+
await expect(customBridgeButton).toBeDisabled();
172+
await expect(customBridgeButton).not.toHaveCSS('background-color', colors.green);
173+
});

‎test/test-manager/src/tests/helpers.rs

+15
Original file line numberDiff line numberDiff line change
@@ -249,6 +249,21 @@ pub async fn login_with_retries(
249249
}
250250
}
251251

252+
/// Ensure that the test runner is logged in to an account.
253+
///
254+
/// This will first check whether we are logged in. If not, it will also try to login
255+
/// on your behalf. If this function returns without any errors, we are logged in to a valid
256+
/// account.
257+
pub async fn ensure_logged_in(
258+
mullvad_client: &mut MullvadProxyClient,
259+
) -> Result<(), mullvad_management_interface::Error> {
260+
if mullvad_client.get_device().await?.is_logged_in() {
261+
return Ok(());
262+
}
263+
// We are apparently not logged in already.. Try to log in.
264+
login_with_retries(mullvad_client).await
265+
}
266+
252267
/// Try to connect to a Mullvad Tunnel.
253268
///
254269
/// # Returns

0 commit comments

Comments
 (0)