Improve test runner and make commands (#649)

* add make update command * add make constraint * improve first run on fresh constraint
GSA · Sep 4, 2024 · 89f6c35 · 89f6c35
1 parent c38c2b8
commit 89f6c35
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/src/scripts/dev-constraint.cjs b/src/scripts/dev-constraint.cjs
@@ -229,12 +229,15 @@ async function runCucumberTest(constraintId, testFiles) {
     const nodeOptions = '--loader ts-node/esm --no-warnings --experimental-specifier-resolution=node';
     const cucumberCommand = `NODE_OPTIONS="${nodeOptions}" npx cucumber-js`;
 
-    const scenarioLines = getScenarioLineNumbers(featureFile, constraintId,testFiles);
+    let scenarioLines = getScenarioLineNumbers(featureFile, constraintId,testFiles);
 
     if (scenarioLines.length === 0) {
         console.error(`No scenarios found for constraintId: ${constraintId}`);
-        execSync("npm run test:coverage",{stdio:'inherit'});
+        execSync("npm run test:coverage",{stdio:'ignore'});
+        scenarioLines = getScenarioLineNumbers(featureFile, constraintId,testFiles);
+        if(scenarioLines.length===0){
         return false;
+        }
     }
 
     try {

diff --git a/src/validations/module.mk b/src/validations/module.mk
@@ -21,6 +21,12 @@ build-validations:
 clean-validations:
 	@echo "Nothing to clean"
 
+update:
+	npm install
+	$(OSCAL_CLI) use latest
+constraint:
+	npm run constraint
+
 test-validations:
 	@echo "Validating rev5 artifacts recursively..."
 	$(OSCAL_CLI) validate -f $(REV5_BASELINES) -e ./src/validations/constraints/fedramp-external-constraints.xml -r