Merge branch 'ci-on-oses' into master

expo · Jan 17, 2021 · 4cd5900 · 4cd5900
2 parents e2962e2 + 2f449ea
commit 4cd5900
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 8 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -4,9 +4,10 @@ on: [push, pull_request]
 
 jobs:
   test:
-    runs-on: ubuntu-latest
+    runs-on: ${{ matrix.os }}
     strategy:
       matrix:
+        os: [ubuntu-latest, windows-latest, macos-latest]
         node-version: [10.x, 12.x, 14.x]
       max-parallel: 1
 

diff --git a/test/ngrok.postinstall.spec.js b/test/ngrok.postinstall.spec.js
@@ -1,18 +1,27 @@
-const homedir = require('homedir');
-const path = require('path');
+const { join } = require('path');
 const fs = require('fs');
 const child_process = require('child_process');
 
-const postinstallPath = path.join(__dirname, '../postinstall.js');
-const ngrokPath = path.join(homedir(), '/.ngrok');
+const postinstallPath = join(__dirname, '../postinstall.js');
+const ngrokPath = join(__dirname, 'fixtures', '.ngrok');
+fs.mkdirSync(ngrokPath, { recursive: true });
 const certpath = `${ngrokPath}/testCert.pem`;
 
 describe('postinstall', () => {
+	before(() => {
+		process.env.NGROK_ROOT_CA_PATH = certpath;
+		process.env.NGROK_IGNORE_CACHE = 'true';
+	});
+
+	after(() => {
+		delete process.env.NGROK_IGNORE_CACHE
+		delete process.env.NGROK_ROOT_CA_PATH
+	});
+
 	describe('with no certificate', () => {
 		before(() => {
 			clearNgrokDirectory();
 			writeJunkPemFile();
-			process.env.NGROK_ROOT_CA_PATH = certpath;
 		});
 
 		it('should run using a junk file without crashing', done => {
@@ -25,7 +34,6 @@ describe('postinstall', () => {
 		before(() => {
 			clearNgrokDirectory();
 			writeVerisignCertPemFile();
-			process.env.NGROK_ROOT_CA_PATH = certpath;
 		});
 
 		it('should fail to run with an invalid certificate', done => {
@@ -44,7 +52,7 @@ describe('postinstall', () => {
 
 function clearNgrokDirectory() {
 	const files = fs.readdirSync(ngrokPath);
-	files.forEach(f => fs.unlinkSync(path.join(ngrokPath, f)));
+	files.forEach(f => fs.unlinkSync(join(ngrokPath, f)));
 }
 
 function writeJunkPemFile() {