Merge pull request #75 from em-c-rod/testPullRequest

update workflows and tests
em-c-rod · Apr 21, 2023 · ed382f3 · ed382f3
2 parents eae4590 + de7bb2c
commit ed382f3
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/.github/workflows/burpsuite2hdf.yml b/.github/workflows/burpsuite2hdf.yml
@@ -1,4 +1,8 @@
-on: [push]
+on:
+  push:
+    branches: [master]
+  pull_request:
+    branches: [master]
 jobs:
   heimdall_tools_conversion:
     runs-on: ubuntu-latest
@@ -17,6 +21,8 @@ jobs:
       #   with:
       #     file: 'sample/burpsuite_sample.min'
       #     converter: 'burpsuite_mapper'
+      - name: Get GitHub Action Path
+        run: echo "GITHUB_ACTION_PATH is - ${{ toJSON(github) }}"
       - name: Convert Burpsuite
         uses: em-c-rod/saf_action_test@master
         with:

diff --git a/test/index.test.js b/test/index.test.js
@@ -1,18 +1,17 @@
 const path = require('path');
-const saf_action =  require('../index.js');
+const saf_action =  require('../run_command.js');
 
 describe('SAF Action tests', () => {
   it('should run SAF with a space topic separator in the command string', async () => {
     let inputFilePath = path.resolve('./test/sample_data/red_hat_good.json');
     process.env['INPUT_COMMAND_STRING'] = `view summary -i ${inputFilePath}`;
-    require('../index.js');
-    await saf_action();
+    await saf_action({safCLIPath: "./node_modules/@mitre/saf/lib/index.js"});
     delete process.env['INPUT_COMMAND_STRING'];
   });
-  it('should run SAF with a semicolon topic separator in the command string', async () => {
+  it('should run SAF with a colon topic separator in the command string', async () => {
     let inputFilePath = path.resolve('./test/sample_data/red_hat_good.json');
     process.env['INPUT_COMMAND_STRING'] = `view:summary -i ${inputFilePath}`;
-    await saf_action();
+    await saf_action({safCLIPath: "./node_modules/@mitre/saf/lib/index.js"});
     delete process.env['INPUT_COMMAND_STRING'];
   });
 });