fix(test): fix testing.testEnvironment setting

Closes #2425
ionic-team · Jul 15, 2020 · 645f3a0 · 645f3a0
1 parent 60617c9
commit 645f3a0
Show file tree

Hide file tree

Showing 2 changed files with 41 additions and 5 deletions.
diff --git a/src/compiler/config/test/validate-testing.spec.ts b/src/compiler/config/test/validate-testing.spec.ts
@@ -17,6 +17,7 @@ describe('validateTesting', () => {
       srcDir: path.join(ROOT, 'User', 'some', 'path', 'src'),
       flags: {},
       namespace: 'Testing',
+      configPath: path.join(ROOT, 'User', 'some', 'path', 'stencil.config.ts'),
     };
     userConfig.outputTargets = [
       ({
@@ -94,4 +95,28 @@ describe('validateTesting', () => {
       path.join(ROOT, 'User', 'some', 'path', 'dist-folder'),
     ]);
   });
+
+  it('set relative testEnvironment to absolute', () => {
+    userConfig.flags.e2e = true;
+    userConfig.testing = {
+      testEnvironment: './rel-path.js',
+    };
+    const { config } = validateConfig(userConfig);
+    expect(path.isAbsolute(config.testing.testEnvironment)).toBe(true);
+    expect(path.basename(config.testing.testEnvironment)).toEqual('rel-path.js');
+  });
+
+  it('set node module testEnvironment', () => {
+    userConfig.flags.e2e = true;
+    userConfig.testing = {
+      testEnvironment: 'jsdom',
+    };
+    const { config } = validateConfig(userConfig);
+    expect(config.testing.testEnvironment).toEqual('jsdom');
+  });
+
+  it('do nothing for empty testEnvironment', () => {
+    const { config } = validateConfig(userConfig);
+    expect(config.testing.testEnvironment).toBeUndefined();
+  });
 });
diff --git a/src/compiler/config/validate-testing.ts b/src/compiler/config/validate-testing.ts
@@ -1,7 +1,9 @@
 import * as d from '../../declarations';
 import { buildError, buildWarn } from '@utils';
-import { isAbsolute, join } from 'path';
+import { isAbsolute, join, basename, dirname } from 'path';
 import { isOutputTargetDist, isOutputTargetWww } from '../output-targets/output-utils';
+import { isLocalModule } from '../sys/resolve/resolve-utils';
+import { isString } from 'util';
 
 export const validateTesting = (config: d.Config, diagnostics: d.Diagnostic[]) => {
   const testing = (config.testing = Object.assign({}, config.testing || {}));
@@ -10,6 +12,15 @@ export const validateTesting = (config: d.Config, diagnostics: d.Diagnostic[]) =
     return;
   }
 
+  let configPathDir = config.configPath;
+  if (isString(configPathDir)) {
+    if (basename(configPathDir).includes('.')) {
+      configPathDir = dirname(configPathDir);
+    }
+  } else {
+    configPathDir = config.rootDir;
+  }
+
   if (typeof config.flags.headless === 'boolean') {
     testing.browserHeadless = config.flags.headless;
   } else if (typeof testing.browserHeadless !== 'boolean') {
@@ -66,7 +77,7 @@ export const validateTesting = (config: d.Config, diagnostics: d.Diagnostic[]) =
   if (typeof testing.preset !== 'string') {
     testing.preset = join(config.sys.getCompilerExecutingPath(), '..', '..', 'testing');
   } else if (!isAbsolute(testing.preset)) {
-    testing.preset = join(config.configPath, testing.preset);
+    testing.preset = join(configPathDir, testing.preset);
   }
 
   if (!Array.isArray(testing.setupFilesAfterEnv)) {
@@ -79,9 +90,9 @@ export const validateTesting = (config: d.Config, diagnostics: d.Diagnostic[]) =
     err.messageText = `setupTestFrameworkScriptFile has been deprecated.`;
   }
 
-  if (typeof testing.testEnvironment === 'string') {
-    if (!isAbsolute(testing.testEnvironment)) {
-      testing.testEnvironment = join(config.configPath, testing.testEnvironment);
+  if (isString(testing.testEnvironment)) {
+    if (!isAbsolute(testing.testEnvironment) && isLocalModule(testing.testEnvironment)) {
+      testing.testEnvironment = join(configPathDir, testing.testEnvironment);
     }
   }