Added npm tasks to speed up automated testing.

Author: zoltan-dulac

bin/checkHTML.sh

@@ -19,35 +19,27 @@
 # 100 - VNU checks returns errors
 # 101 - aXe returned errors
 # 102 - pa11y returned errors
+#
+#
+# Arguments:
+# checkHTML.sh all --for-pr : Just check files relevant for the PR.
 #######################################################################
 
 echo "PATH is $PATH"
 which axe
 
 VNU_JAR="node_modules/vnu-jar/build/dist/vnu.jar"
 VNU_CMD="java -jar $VNU_JAR"
+TEMPLIST_FILE="tmp/temp-files.txt"
+JUST_FOR_PR="0"
 
-which ifconfig 1>&2 2> /dev/null
-if [ "$?" = "0" ]
+if [ "$2" = "--for-pr" ]
 then
-	MYIP=`ifconfig -a | grep inet | grep -v inet6 | awk '{print $2}' | head -2 | tail -1`
-else
-	id=$(netsh interface show interface | grep "Connected" | awk '{print $4}')
-	MYIP=$(ipconfig | awk -v desc="$id" '
-		BEGIN {found=0}
-		{
-			if ($0 ~ desc) {
-			found=1
-			} else if ($0 ~ /^[^ ]/ && found) {
-				found=0
-			}
-			if (found && /IPv4 Address/) {
-				gsub(/.*: /, "", $0)
-				print $0
-				exit
-			}
-		}')
+	echo "Just running tests for this PR"
+	JUST_FOR_PR="1"
 fi
+
+MYIP=`bin/my-ip.sh`
 PROJECT_URL="http://$MYIP:8888/index.php"
 SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
 PHP=`bin/findPHP.sh`
@@ -229,7 +221,13 @@ checkDependencies() {
 downloadHTML() {
 	checkDependencies
 
-	URLS=`bin/getPages.js $MYIP`;
+	if [ "$JUST_FOR_PR" = "0" ]
+	then
+		URLS=`bin/getPages.js $MYIP`;
+	else
+		URLS=`bin/pages-affected-in-PR.sh`
+	fi
+
 	DOWNLOADED_URLS=""
 	TEMP_FILES=""
 
@@ -269,19 +267,20 @@ downloadHTML() {
 	echo
 
 	printf "%s\n" $DOWNLOADED_URLS > tmp/downloaded-urls.txt
-	echo -n $TEMP_FILES > tmp/temp-files.txt
+	echo -n $TEMP_FILES > $TEMPLIST_FILE
 	echo -n $AXE_DELAYED_FILES > tmp/axe-delayed-files.txt
 }
 
 
 runVNUTests() {
+	echo "Running VNU Tests ..."
 	#. Download the HTML files if they have not already been downloaded
-	if ! [ -f tmp/temp-files.txt ]
+	if ! [ -f $TEMPLIST_FILE ]
 	then
 		bin/generateSiteMap.sh
 		downloadHTML
 	else
-		: "${TEMP_FILES:=`cat tmp/temp-files.txt`}"
+		: "${TEMP_FILES:=`cat $TEMPLIST_FILE`}"
 	fi
 	numTempFiles=$(echo "${TEMP_FILES}" | awk -F" " '{print NF}')
 
@@ -483,7 +482,7 @@ function runLighthouseTests() {
 	node bin/lighthouse-accessibility-scan.js
 }
 
-if [ "$#" = "1" ]
+if [ "$#" = "2" ]
 then
 	TYPE="$1"
 	FILES="${@:2}"
@@ -504,6 +503,8 @@ fi
 bin/generateSiteMap.sh
 downloadHTML
 
+echo "TYPE: $TYPE"
+
 
 #.. Run specific tests based on the argument passed in when running this script
 if [ "$TYPE" = "vnu" ]
@@ -530,4 +531,3 @@ then
 	rm tmp/* 2> /dev/null
 fi
 
-echo "DOWNLOADED_URLS: $DOWNLOADED_URLS"

bin/find-affected-pages.js

@@ -17,7 +17,7 @@
  *   --match <mode>          Matching mode: "suffix" (default) or "basename"
  *   --exts <csv>            Extra HTML-like extensions to include (default: ".html,.htm")
  *   --results-relative      Output only filenames (no paths) for pages and assets
- *   --just-pages            Output only the list of affected pages (no assets)
+ *   --just-pages            Output only the list of affected pages (no assets like js or CSS files)
  *   --quiet                 Machine-friendly output:
  *                            - default: CSV "page,assets"
  *                            - with --just-pages: one page per line

bin/my-ip.sh

@@ -0,0 +1,25 @@
+#!/bin/bash
+
+which ifconfig 1> /dev/null 2> /dev/null
+if [ "$?" = "0" ]
+then
+	MYIP=`ifconfig -a | grep inet | grep -v inet6 | awk '{print $2}' | head -2 | tail -1`
+else
+	id=$(netsh interface show interface | grep "Connected" | awk '{print $4}')
+	MYIP=$(ipconfig | awk -v desc="$id" '
+		BEGIN {found=0}
+		{
+			if ($0 ~ desc) {
+			found=1
+			} else if ($0 ~ /^[^ ]/ && found) {
+				found=0
+			}
+			if (found && /IPv4 Address/) {
+				gsub(/.*: /, "", $0)
+				print $0
+				exit
+			}
+		}')
+fi
+
+echo $MYIP

bin/pages-affected-in-PR.sh

@@ -8,15 +8,22 @@ CSS_LIST=`echo "$FILE_LIST" | grep ".css$"`
 
 BASE_PHP_LIST=`echo "$PHP_LIST" | awk -F"/" '{print $NF}' `
 
-PHP_FILES_AFFECTED_BY_JS_OR_CSS=`node bin/find-affected-pages.js \
+MYIP=`bin/my-ip.sh`
+
+
+
+
+PHP_FILES_AFFECTED=`node bin/find-affected-pages.js \
   --dir ./tmp/vnu/ \
   --exts ".php" \
   --quiet --just-pages --results-relative \
   --match basename \
-  --files "$(git diff --name-only origin/main...HEAD | paste -sd, -)" `
+  --files "$(git diff --name-only origin/main...HEAD | paste -sd, -)"
+  --add-prefix= `
+
 
 
 LIST="$BASE_PHP_LIST
-$PHP_FILES_AFFECTED_BY_JS_OR_CSS"
+$PHP_FILES_AFFECTED"
 
-echo "$LIST" | sort -u
+echo "$LIST" | sort -u | awk -v myip="$MYIP" '{printf ("http://%s:8888/%s\n", myip, $1)}'

bin/runJestForPR.sh

@@ -0,0 +1,35 @@
+#!/bin/bash
+
+FILE_LIST=`git diff --name-only origin/main...HEAD`
+
+PHP_LIST=`echo "$FILE_LIST" | egrep ".php$"`
+JS_LIST=`echo "$FILE_LIST" | grep ".js$"`
+CSS_LIST=`echo "$FILE_LIST" | grep ".css$"`
+
+BASE_PHP_LIST=`echo "$PHP_LIST" | awk -F"/" '{print $NF}' `
+
+MYIP=`bin/my-ip.sh`
+
+
+
+
+PHP_FILES_AFFECTED=`node bin/find-affected-pages.js \
+  --dir ./tmp/vnu/ \
+  --exts ".php" \
+  --quiet --just-pages --results-relative \
+  --match basename \
+  --files "$(git diff --name-only origin/main...HEAD | paste -sd, -)"
+  `
+
+POSSIBLE_TEST_FILES=`echo "$PHP_FILES_AFFECTED" | sed "s/.php/.test.js/"`
+TEST_FILES=""
+
+for i in $POSSIBLE_TEST_FILES
+do
+    if [ -f "js/test/$i" ]
+    then
+        TEST_FILES="$TEST_FILES $i"
+    fi
+done
+
+node  node_modules/jest/bin/jest.js --run-in-band  --runInBand $TEST_FILES

package.json

@@ -37,6 +37,7 @@
   "scripts": {
     "jest": "jest --runInBand",
     "test": "bin/enforceRemFontSize.sh && bin/checkHTML.sh && jest  --runInBand",
+    "test-pr": "bin/enforceRemFontSize.sh && bin/checkHTML.sh all --for-pr && bin/runJestForPR.sh",
     "jest-local": "jest --maxWorkers=75%",
     "test-local": "bin/checkHTML.sh && jest  --maxWorkers=75%",
     "jest-debug-memory-leak": "node --expose-gc ./node_modules/.bin/jest --runInBand --logHeapUsage",