Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@
<description>Shows app name tooltip on hover in the overview search results</description>
</key>
<key name="module-vela-vpn-quick-settings" type="b">
<default>true</default>
<default>false</default>
<summary>Enable Vela VPN Quick Settings module</summary>
<description>Routes VPN Quick Settings activation through Vela</description>
</key>
Expand Down
10 changes: 7 additions & 3 deletions tests/shell/auroraVelaVpnQuickSettings.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ export var METRICS = {};
export function init() {
Scripting.defineScriptEvent(
'fallbackPolicyOk',
'Vela VPN fallback is opt-in and handles ServiceUnknown',
'Vela VPN integration is opt-in and handles ServiceUnknown fallback',
);
}

Expand All @@ -33,8 +33,12 @@ export async function run() {
const originalFallbackEnabled = settings.get_boolean(FALLBACK_SETTING);

try {
const defaultValue = settings.get_default_value(FALLBACK_SETTING)?.unpack();
if (defaultValue !== false)
const defaultModuleEnabled = settings.get_default_value(MODULE_SETTING)?.unpack();
if (defaultModuleEnabled !== false)
throw new Error('Vela VPN integration must be disabled by default');

const defaultFallbackEnabled = settings.get_default_value(FALLBACK_SETTING)?.unpack();
if (defaultFallbackEnabled !== false)
throw new Error('Vela VPN Shell fallback must be disabled by default');

settings.set_boolean(MODULE_SETTING, true);
Expand Down
3 changes: 2 additions & 1 deletion tests/unit/schema.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,8 @@ test('schema ↔ catalog — every declared module and option setting is synchro
assert.deepEqual([...compiledSchemaKeys()].sort(), [...catalogSettingsKeys()].sort());
});

test('schema — Vela Shell fallback is disabled by default', () => {
test('schema — Vela VPN integration and Shell fallback are disabled by default', () => {
assert.equal(schemaDefault('module-vela-vpn-quick-settings'), 'false');
assert.equal(schemaDefault('vela-vpn-quick-settings-shell-fallback'), 'false');
});

Expand Down