Test

.circleci/config.yml

@@ -0,0 +1,72 @@
+version: 2.1
+jobs:
+  test:
+    docker:
+      - image: mcr.microsoft.com/playwright:v1.43.1-jammy
+    steps:
+      - checkout
+
+      - run:
+          name: Install system dependencies
+          command: apt-get update && apt-get install -y curl
+
+      - run:
+          name: Install dependencies
+          command: npm ci
+
+      - run:
+          name: Install Playwright Browsers
+          command: npx playwright install --with-deps
+
+      - run:
+          name: Start Grunt Server
+          background: true
+          command: |
+            npx grunt connect:livereload:keepalive
+
+      - run:
+          name: Wait for server to be ready
+          command: |
+            echo "Waiting for server to start..."
+            # Give the server a moment to initialize
+            sleep 3
+
+            for i in {1..30}; do
+              if curl -sSf http://localhost:8000 >/dev/null 2>&1; then
+                echo "Server is ready on port 8000!"
+                # Verify it's actually serving content
+                curl -s http://localhost:8000 | head -5
+                exit 0
+              fi
+              echo "Attempt $i/30: Server not ready yet..."
+              sleep 2
+            done
+
+            echo "Server failed to start after 60 seconds"
+            echo "Debug information:"
+            netstat -tlnp | grep :8000 || echo "No process listening on port 8000"
+            ps aux | grep grunt || echo "No grunt processes found"
+
+            # Check if grunt process exists but maybe on different port
+            ss -tlnp | grep :8000 || echo "No process listening on port 8000"
+            ps aux | grep grunt || echo "No grunt processes found"
+
+            # Check if grunt process exists but maybe on different port
+            ss -tlnp | grep grunt || echo "No grunt-related ports found"
+
+            exit 1
+
+      - run:
+          name: Run Playwright tests
+          command: npx playwright test
+          no_output_timeout: 10m
+
+      - store_artifacts:
+          path: test-results/
+          destination: playwright-test-results
+
+workflows:
+  version: 2
+  test:
+    jobs:
+      - test

.gitignore

@@ -3,4 +3,10 @@ build/
 app/output/props/*
 tempZipDir
 .idea/*
-node_modules
+node_modules
+
+# Playwright
+/test-results/
+/playwright-report/
+/blob-report/
+/playwright/.cache/

Gruntfile.js

@@ -200,7 +200,7 @@ module.exports = function (grunt) {
             },
 			macGenConvert: {
 				cmd: function(str, formDefFile) {
-					return 'node macGenConverter.js ' + str + ' > ' + formDefFile; 
+					return 'node macGenConverter.js ' + str + ' > ' + formDefFile;
 				}
 			}
         },
@@ -230,7 +230,7 @@ module.exports = function (grunt) {
         connect: {
             server: {
                 options: {
-                    setHeaders: setHeaders 
+                    setHeaders: setHeaders
                 }
             },
             options: {
@@ -247,10 +247,10 @@ module.exports = function (grunt) {
                             next();
                         });
 
-                        middlewares.unshift(postHandler);
-                        middlewares.unshift(lrSnippet);                        
                         middlewares.unshift(mountFolder(baseDirForServer));
                         middlewares.unshift(mountDirectory(baseDirForServer));
+                        middlewares.unshift(postHandler);
+                        middlewares.unshift(lrSnippet);
                         return middlewares;
                     }
                 }
@@ -259,33 +259,37 @@ module.exports = function (grunt) {
                 options: {
                     port: 8001,
                     middleware: [
-                            postHandler,
-                            lrSnippet,
-                            mountFolder('test'),
-                            mountFolder(baseDirForServer),
-                            mountDirectory(baseDirForServer)
-                        ]
-                }                
+                        mountFolder('test'),
+                        mountFolder(baseDirForServer),
+                        mountDirectory(baseDirForServer),
+                        postHandler,
+                        lrSnippet
+                    ]
+                }
             }
         },
-        open: {
+         open: {
             server: {
                 path: 'http://localhost:<%= connect.options.port %>/index.html',
-                app: {app: (function() {
-                    var platform = require('os').platform();
-                    // windows: *win*
-                    // mac: darwin
-                    if (platform.search('win') >= 0 &&
-                      platform.search('darwin') < 0) {
-                      // Windows expects chrome.
-                      grunt.log.writeln('detected Windows environment');
-                      return 'chrome';
-                    } else {
-                      // Mac (and maybe others--add as discovered), expects
-                      // Google Chrome
-                      grunt.log.writeln('detected non-Windows environment');
-                      return 'Google Chrome';
-                    }
+                app: {
+                    app: (function() {
+                        var platform = require('os').platform();
+                        // windows: *win*
+                        // mac: darwin
+                        // linux: linux
+                        if (platform.search('win') !== -1) {
+                            // Windows expects chrome.
+                            grunt.log.writeln('Detected Windows environment');
+                            return 'chrome';
+                        } else if (platform.search('darwin') !== -1) {
+                            // Mac expects "Google Chrome"
+                            grunt.log.writeln('Detected macOS environment');
+                            return 'Google Chrome';
+                        } else {
+                            // Default for Linux and potentially other environments
+                            grunt.log.writeln('Detected non-Windows, non-macOS environment');
+                            return 'google-chrome';
+                            }
                   })()
                 }
             }
@@ -365,15 +369,15 @@ module.exports = function (grunt) {
 			var platform = require('os').platform();
 			var isWindows = (platform.search('win') >= 0 &&
                              platform.search('darwin') < 0);
-							 
+
             var dirs = grunt.file.expand(
                 {filter: function(path) {
  						if ( !path.endsWith(".xlsx") ) {
 							return false;
 						}
 						var cells = path.split((isWindows ? "\\" : "/"));
 						return (cells.length >= 6) &&
-						  ( cells[cells.length-1] === cells[cells.length-2] + ".xlsx" ); 
+						  ( cells[cells.length-1] === cells[cells.length-2] + ".xlsx" );
 					},
                  cwd: 'app' },
 				'**/*.xlsx',
@@ -396,30 +400,30 @@ module.exports = function (grunt) {
         });
 
 var zipAllFiles = function( destZipFile, filesList, completionFn ) {
-			// create a file to stream archive data to. 
+			// create a file to stream archive data to.
 			var fs = require('fs');
 			var archiver = require('archiver');
 
 			var output = fs.createWriteStream(destZipFile);
 			var archive = archiver('zip', {
-				store: true // Sets the compression method to STORE. 
+				store: true // Sets the compression method to STORE.
 			});
-			 
-			// listen for all archive data to be written 
+
+			// listen for all archive data to be written
 			output.on('close', function() {
 			  console.log(archive.pointer() + ' total bytes');
 			  console.log('archiver has been finalized and the output file descriptor has closed.');
 			  completionFn(true);
 			});
-			 
-			// good practice to catch this error explicitly 
+
+			// good practice to catch this error explicitly
 			archive.on('error', function(err) {
 			  throw err;
 			});
-			 
-			// pipe archive data to the file 
+
+			// pipe archive data to the file
 			archive.pipe(output);
-				
+
 			filesList.forEach(function(fileName) {
                 //  Have to add app back into the file name for the adb push
                 var src = tablesConfig.appDir + '/' + fileName;
@@ -429,7 +433,7 @@ var zipAllFiles = function( destZipFile, filesList, completionFn ) {
 						grunt.log.writeln('error ' + err + ' adding ' + src + ' to file ' + destZipFile);
 				}} );
 			});
-			// finalize the archive (ie we are done appending files but streams have to finish yet) 
+			// finalize the archive (ie we are done appending files but streams have to finish yet)
 			archive.finalize();
 };
 
@@ -438,12 +442,12 @@ var zipAllFiles = function( destZipFile, filesList, completionFn ) {
         'BROKEN: does not compress and last file is not terminated properly. Construct the configzip and systemzip for survey and tables',
         function() {
 			var done = this.async();
-			
+
 			var buildDir = 'build' +
 				'/zips';
-			 
+
 			grunt.file.delete(buildDir + '/');
-			
+
 			grunt.file.mkdir(buildDir);
 			grunt.file.mkdir(buildDir + '/survey/');
 			grunt.file.mkdir(buildDir + '/tables/');
@@ -465,7 +469,7 @@ var zipAllFiles = function( destZipFile, filesList, completionFn ) {
 				'config/assets/framework/**',
                 'config/assets/commonDefinitions.js',
                 'config/assets/img/play.png',
-                'config/assets/img/form_logo.png',
+                'config/assets/img/form_logo_new.png',
                 'config/assets/img/backup.png',
                 'config/assets/img/advance.png',
                 'config/assets/css/odk-survey.css',
@@ -493,16 +497,16 @@ var zipAllFiles = function( destZipFile, filesList, completionFn ) {
 				'!**/.DS_Store',
                 '!**/~$*.xlsx');
 
-			zipAllFiles(buildDir + '/survey/systemzip', surveySystemZipFiles, 
+			zipAllFiles(buildDir + '/survey/systemzip', surveySystemZipFiles,
 				function(outcome) {
 					if ( outcome ) {
-						zipAllFiles(buildDir + '/survey/configzip', surveyConfigZipFiles, 
+						zipAllFiles(buildDir + '/survey/configzip', surveyConfigZipFiles,
 							function(outcome) {
 								if ( outcome ) {
-									zipAllFiles(buildDir + '/tables/systemzip', tablesSystemZipFiles, 
+									zipAllFiles(buildDir + '/tables/systemzip', tablesSystemZipFiles,
 										function(outcome) {
 											if ( outcome ) {
-												zipAllFiles(buildDir + '/tables/configzip', tablesConfigZipFiles, 
+												zipAllFiles(buildDir + '/tables/configzip', tablesConfigZipFiles,
 													function(outcome) {
 														if ( outcome ) {
 															grunt.log.writeln('success!');
@@ -816,15 +820,15 @@ var zipAllFiles = function( destZipFile, filesList, completionFn ) {
 				destFileName = destFileName.substring(0,idx) + destFileName.substring(idx+demoInfix.length);
 				idx = destFileName.indexOf(demoInfix + ".");
 			}
-			
+
 			var idxDir = destFileName.indexOf(demoInfix + "/");
 			while ( idxDir >= 0 ) {
 				// directory...
 				isInfixed = true;
 				destFileName = destFileName.substring(0,idxDir) + destFileName.substring(idxDir+demoInfix.length);
 				idxDir = destFileName.indexOf(demoInfix + "/");
 			}
-			
+
 			var buildDir = 'build' +
 				'/' +
 				demoInfix.substring(1);
@@ -858,7 +862,7 @@ var zipAllFiles = function( destZipFile, filesList, completionFn ) {
 
 	//
 	// returns a function that will handle the adb push of files onto the
-	// device with any files containing ".infix." stripped of that infix 
+	// device with any files containing ".infix." stripped of that infix
 	// and any folders ending in ".infix" also stripped.
 	//
 	var infixRenameAdbPusher = function(demoInfix, offsetDir) {
@@ -884,7 +888,7 @@ var zipAllFiles = function( destZipFile, filesList, completionFn ) {
 				destFileName = destFileName.substring(0,idx) + destFileName.substring(idx+demoInfix.length);
 				idx = destFileName.indexOf(demoInfix + ".");
 			}
-			
+
 			var idxDir = destFileName.indexOf(demoInfix + "/");
 			while ( idxDir >= 0 ) {
 				// directory...
@@ -1063,7 +1067,7 @@ var zipAllFiles = function( destZipFile, filesList, completionFn ) {
 			'config/assets/css/odk-survey.css',
 			'config/assets/img/advance.png',
 			'config/assets/img/backup.png',
-			'config/assets/img/form_logo.png',
+			'config/assets/img/form_logo_new.png',
 			'config/assets/img/little_arrow.png',
 			'config/assets/img/play.png',
 			'config/assets/libs/**',
@@ -1137,7 +1141,7 @@ var zipAllFiles = function( destZipFile, filesList, completionFn ) {
 			'config/assets/css/odk-survey.css',
 			'config/assets/img/advance.png',
 			'config/assets/img/backup.png',
-			'config/assets/img/form_logo.png',
+			'config/assets/img/form_logo_new.png',
 			'config/assets/img/little_arrow.png',
 			'config/assets/img/play.png',
 			'config/assets/libs/**',
@@ -1216,7 +1220,7 @@ var zipAllFiles = function( destZipFile, filesList, completionFn ) {
 			'config/assets/css/odk-survey.css',
 			'config/assets/img/advance.png',
 			'config/assets/img/backup.png',
-			'config/assets/img/form_logo.png',
+			'config/assets/img/form_logo_new.png',
 			'config/assets/img/little_arrow.png',
 			'config/assets/img/play.png',
 			'config/assets/libs/**',
@@ -1306,7 +1310,7 @@ var zipAllFiles = function( destZipFile, filesList, completionFn ) {
 			'config/assets/css/odk-survey.css',
 			'config/assets/img/advance.png',
 			'config/assets/img/backup.png',
-			'config/assets/img/form_logo.png',
+			'config/assets/img/form_logo_new.png',
 			'config/assets/img/little_arrow.png',
 			'config/assets/img/play.png',
 			'config/assets/libs/**',
@@ -1468,7 +1472,7 @@ var zipAllFiles = function( destZipFile, filesList, completionFn ) {
 			'config/assets/css/odk-survey.css',
 			'config/assets/img/advance.png',
 			'config/assets/img/backup.png',
-			'config/assets/img/form_logo.png',
+			'config/assets/img/form_logo_new.png',
 			'config/assets/img/little_arrow.png',
 			'config/assets/img/play.png',
 			'config/assets/libs/**',
@@ -1858,7 +1862,7 @@ var zipAllFiles = function( destZipFile, filesList, completionFn ) {
 					// to /sdcard/odk/forms
 					// I.e., this folder should contain things like:
 					//  .../formid.xml
-					//  .../formid-media/form_logo.jpg
+					//  .../formid-media/form_logo_new.jpg
 					//  .../formid-media/...
 					//  .../formid2.xml
 					//

app/config/assets/css/odk-survey.css

@@ -381,8 +381,10 @@ Eventually we should make a jqm theme for this.
 }
 
 .odk-formlogo {
-    width: 100%;
+    width: 40%;
+    height: 40%;
 }
+
 .odk-label-image {
     width: 100%;
 }
@@ -679,3 +681,4 @@ Eventually we should make a jqm theme for this.
     overflow:hidden;
     margin-right:50px;
 }
+