From 49760e213883c39ed72357279f7b3cdedd34b142 Mon Sep 17 00:00:00 2001 From: Tim Fish Date: Wed, 11 Jan 2023 14:29:02 +0000 Subject: [PATCH] test: Don't run sandbox tests on Linux for Electron < 13 (#622) --- examples/electron-forge-webpack/recipe.yml | 2 +- examples/webpack-context-isolation-preload/recipe.yml | 2 +- examples/webpack-context-isolation/recipe.yml | 2 +- test/e2e/recipe/eval.ts | 4 +++- test/e2e/test-apps/other/error-iframe/recipe.yml | 2 +- 5 files changed, 7 insertions(+), 5 deletions(-) diff --git a/examples/electron-forge-webpack/recipe.yml b/examples/electron-forge-webpack/recipe.yml index 0ee6003d..d40dea6d 100644 --- a/examples/electron-forge-webpack/recipe.yml +++ b/examples/electron-forge-webpack/recipe.yml @@ -1,4 +1,4 @@ description: Electron Forge Webpack with contextIsolation and sandbox command: yarn && yarn package -condition: supportsContextIsolation +condition: supportsContextIsolation && supportsSandbox timeout: 120 diff --git a/examples/webpack-context-isolation-preload/recipe.yml b/examples/webpack-context-isolation-preload/recipe.yml index cd6349e1..07abca78 100644 --- a/examples/webpack-context-isolation-preload/recipe.yml +++ b/examples/webpack-context-isolation-preload/recipe.yml @@ -1,4 +1,4 @@ description: Webpack 5 app with contextIsolation and sandbox with preload command: yarn && yarn build -condition: supportsContextIsolation +condition: supportsContextIsolation && supportsSandbox timeout: 120 diff --git a/examples/webpack-context-isolation/recipe.yml b/examples/webpack-context-isolation/recipe.yml index c6f46484..18407171 100644 --- a/examples/webpack-context-isolation/recipe.yml +++ b/examples/webpack-context-isolation/recipe.yml @@ -1,4 +1,4 @@ description: Webpack 5 app with contextIsolation and sandbox command: yarn && yarn build -condition: supportsContextIsolation +condition: supportsContextIsolation && supportsSandbox timeout: 120 diff --git a/test/e2e/recipe/eval.ts b/test/e2e/recipe/eval.ts index 63d69462..ced24cbc 100644 --- a/test/e2e/recipe/eval.ts +++ b/test/e2e/recipe/eval.ts @@ -15,9 +15,11 @@ function getEvalContext(electronVersion: string): Context { (platform === 'win32' && version.major >= 6) || (platform === 'linux' && version.major >= 15); + const supportsSandbox = platform !== 'linux' || version.major >= 13; + const supportsContextIsolation = version.major >= 6; - return createContext({ version, platform, usesCrashpad, supportsContextIsolation }); + return createContext({ version, platform, usesCrashpad, supportsContextIsolation, supportsSandbox }); } export function evaluateCondition(name: string, electronVersion: string, condition: string | undefined): boolean { diff --git a/test/e2e/test-apps/other/error-iframe/recipe.yml b/test/e2e/test-apps/other/error-iframe/recipe.yml index 37965ed3..73bace15 100644 --- a/test/e2e/test-apps/other/error-iframe/recipe.yml +++ b/test/e2e/test-apps/other/error-iframe/recipe.yml @@ -1,4 +1,4 @@ description: JavaScript Error from