more fun

lucee · Jun 8, 2024 · 61bfccf · 61bfccf
1 parent 9cb59e4
commit 61bfccf
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 10 deletions.
diff --git a/.github/workflows/spreadsheet-cfml.yml b/.github/workflows/spreadsheet-cfml.yml
@@ -17,9 +17,8 @@ jobs:
         path: _custom
     - name: Copy custom test runner tweaks
       run: |
-        cp -R _custom/custom/spreadsheet-cfml/test/* ~/test
+        cp -R _custom/custom/spreadsheet-cfml/test/* test
         rm -rf _custom
-        
     - name: Set up JDK 11
       uses: actions/setup-java@v4
       with:
@@ -79,8 +78,8 @@ jobs:
      - name: Run Test Suite
        uses: lucee/script-runner@main
        with:
-          webroot: ${{ github.workspace }}
-          execute: /test/index.cfm
+          webroot: ${{ github.workspace }}test
+          execute: /index.cfm
           luceeVersionQuery: ${{ matrix.luceeVersion }}
      - name: stash home dir
        if: always()

diff --git a/custom/spreadsheet-cfml/test/index.cfm b/custom/spreadsheet-cfml/test/index.cfm
@@ -14,12 +14,8 @@
 		testRunner = New testbox.system.TestBox();
 		result = testRunner.runRaw( bundles=paths );
 		reporter = testRunner.buildReporter( "text" );
-		report = " disabled ";
-		try {
-	//		report = reporter.runReport( results=result, testbox=testRunner, justReturn=true );
-		} catch (e) {
-			systemOutput(e, true);
-		}
+		report = reporter.runReport( results=result, testbox=testRunner, justReturn=true );
+		
 		failure = ( result.getTotalFail() + result.getTotalError() ) > 0;
 
 //		#(failure?':x:':':heavy_check_mark:')#