Symlink root dir for tests

getsentry · Aug 12, 2021 · 15d80ac · 15d80ac
1 parent a26a5d1
commit 15d80ac
Show file tree

Hide file tree

Showing 17 changed files with 28 additions and 23 deletions.
diff --git a/test/e2e/index.test.ts b/test/e2e/index.test.ts
@@ -1,14 +1,23 @@
 import { expect, should, use } from 'chai';
 import * as chaiAsPromised from 'chai-as-promised';
 import { spawnSync, SpawnSyncOptionsWithBufferEncoding } from 'child_process';
-import { join } from 'path';
+import { dirname, join } from 'path';
 import { inspect } from 'util';
+import { symlinkSync, mkdirSync, existsSync } from 'fs';
 
 import { TestContext } from './context';
 import { downloadElectron } from './download';
 import { TestServer, TestServerEvent } from './server';
 import { getLastFrame } from './utils';
 
+// Symlink the root directory into a fake node_modules directory so all the tests
+// can simply require('@sentry/electron;)
+const symLinkDst = join(__dirname, '../node_modules/@sentry/electron');
+mkdirSync(dirname(symLinkDst), { recursive: true });
+if (!existsSync(symLinkDst)) {
+  symlinkSync(join(__dirname, '../../'), symLinkDst);
+}
+
 const SENTRY_KEY = '37f8a2ee37c0409d8970bc7559c7c7e4';
 
 should();

diff --git a/test/e2e/test-apps/isolated-app/src/main.js b/test/e2e/test-apps/isolated-app/src/main.js
@@ -2,8 +2,7 @@ const path = require('path');
 const url = require('url');
 
 const { app, BrowserWindow } = require('electron');
-
-const { init } = require('../../../../../');
+const { init } = require('@sentry/electron');
 
 init({
   dsn: 'http://37f8a2ee37c0409d8970bc7559c7c7e4@localhost:8123/277345',

diff --git a/test/e2e/test-apps/isolated-app/src/renderer.js b/test/e2e/test-apps/isolated-app/src/renderer.js
@@ -1,4 +1,4 @@
-const { init, configureScope } = require('../../../../../');
+const { init, configureScope } = require('@sentry/electron');
 
 init({
   debug: true,

diff --git a/test/e2e/test-apps/node-integration/fixtures/scope-data-main.js b/test/e2e/test-apps/node-integration/fixtures/scope-data-main.js
@@ -1,4 +1,4 @@
-const { configureScope, setUser } = require('../../../../../');
+const { configureScope, setUser } = require('@sentry/electron');
 if (process.type === 'browser') {
   configureScope((scope) => {
     scope.setExtra('a', 2);

diff --git a/test/e2e/test-apps/node-integration/fixtures/scope-data-merged.js b/test/e2e/test-apps/node-integration/fixtures/scope-data-merged.js
@@ -1,4 +1,4 @@
-const { configureScope } = require('../../../../../');
+const { configureScope } = require('@sentry/electron');
 if (process.type === 'browser') {
   configureScope((scope) => {
     scope.setExtra('a', 2);

diff --git a/test/e2e/test-apps/node-integration/fixtures/scope-data-renderer.js b/test/e2e/test-apps/node-integration/fixtures/scope-data-renderer.js
@@ -1,4 +1,4 @@
-const { configureScope } = require('../../../../../');
+const { configureScope } = require('@sentry/electron');
 if (process.type === 'renderer') {
   configureScope((scope) => {
     scope.setExtra('a', 2);

diff --git a/test/e2e/test-apps/node-integration/fixtures/sentry-basic.js b/test/e2e/test-apps/node-integration/fixtures/sentry-basic.js
@@ -1,4 +1,4 @@
-const { init } = require('../../../../../');
+const { init } = require('@sentry/electron');
 
 init({
   dsn: process.env.DSN,

diff --git a/test/e2e/test-apps/node-integration/fixtures/sentry-browser-tracing.js b/test/e2e/test-apps/node-integration/fixtures/sentry-browser-tracing.js
@@ -1,5 +1,5 @@
 if (process.type === 'browser') {
-  const { init } = require('../../../../../main');
+  const { init } = require('@sentry/electron/main');
 
   init({
     dsn: process.env.DSN,
@@ -11,7 +11,7 @@ if (process.type === 'browser') {
     },
   });
 } else {
-  const { init } = require('../../../../../renderer');
+  const { init } = require('@sentry/electron/renderer');
   const { Integrations } = require('@sentry/tracing');
 
   init({

diff --git a/test/e2e/test-apps/node-integration/fixtures/sentry-browser.js b/test/e2e/test-apps/node-integration/fixtures/sentry-browser.js
@@ -1,5 +1,5 @@
 if (process.type === 'browser') {
-  const { init } = require('../../../../../main');
+  const { init } = require('@sentry/electron/main');
 
   init({
     dsn: process.env.DSN,
@@ -10,7 +10,7 @@ if (process.type === 'browser') {
     },
   });
 } else {
-  const { init, Integrations } = require('../../../../../renderer');
+  const { init, Integrations } = require('@sentry/electron/renderer');
   const { defaultIntegrations } = require('@sentry/browser');
 
   init({

diff --git a/test/e2e/test-apps/node-integration/fixtures/sentry-custom-release.js b/test/e2e/test-apps/node-integration/fixtures/sentry-custom-release.js
@@ -1,4 +1,4 @@
-const { init } = require('../../../../../');
+const { init } = require('@sentry/electron');
 
 init({
   dsn: process.env.DSN,

diff --git a/test/e2e/test-apps/node-integration/fixtures/sentry-custom-renderer-name.js b/test/e2e/test-apps/node-integration/fixtures/sentry-custom-renderer-name.js
@@ -1,4 +1,4 @@
-const { init } = require('../../../../../');
+const { init } = require('@sentry/electron');
 
 init({
   dsn: process.env.DSN,

diff --git a/test/e2e/test-apps/node-integration/fixtures/sentry-electron-uploader-main.js b/test/e2e/test-apps/node-integration/fixtures/sentry-electron-uploader-main.js
@@ -1,4 +1,4 @@
-const { init, configureScope, Integrations } = require('../../../../../');
+const { init, configureScope, Integrations } = require('@sentry/electron');
 
 init({
   dsn: process.env.DSN,

diff --git a/test/e2e/test-apps/node-integration/fixtures/sentry-electron-uploader-renderer.js b/test/e2e/test-apps/node-integration/fixtures/sentry-electron-uploader-renderer.js
@@ -1,4 +1,4 @@
-const { init, configureScope, Integrations } = require('../../../../../');
+const { init, configureScope, Integrations } = require('@sentry/electron');
 
 init({
   dsn: process.env.DSN,

diff --git a/test/e2e/test-apps/node-integration/fixtures/sentry-onfatal-exit.js b/test/e2e/test-apps/node-integration/fixtures/sentry-onfatal-exit.js
@@ -1,7 +1,5 @@
 // eslint-disable-next-line no-unused-vars
-const { app } = require('electron');
-
-const { init } = require('../../../../../');
+const { init } = require('@sentry/electron');
 
 init({
   dsn: process.env.DSN,

diff --git a/test/e2e/test-apps/node-integration/fixtures/sentry-scope-user-data.js b/test/e2e/test-apps/node-integration/fixtures/sentry-scope-user-data.js
@@ -1,4 +1,4 @@
-const { init, configureScope } = require('../../../../../');
+const { init, configureScope } = require('@sentry/electron');
 
 init({
   dsn: process.env.DSN,

diff --git a/test/e2e/test-apps/node-integration/fixtures/sentry-session.js b/test/e2e/test-apps/node-integration/fixtures/sentry-session.js
@@ -1,6 +1,5 @@
 const { app } = require('electron');
-
-const { init } = require('../../../../../');
+const { init } = require('@sentry/electron');
 
 init({
   dsn: process.env.DSN,

diff --git a/test/e2e/test-apps/node-integration/main.js b/test/e2e/test-apps/node-integration/main.js
@@ -10,7 +10,7 @@ require('./load-sentry');
 
 app.on('ready', () => {
   const window = new BrowserWindow({
-    show: !!process.env.DEBUG,
+    show: false,
     webPreferences: { nodeIntegration: true, contextIsolation: false },
   });