@suffolklitlab/alkiln 5.0.0-hotfixupload11 → 5.0.0-hotfixupload12

package/lib/scope.js

@@ -1781,63 +1781,51 @@ module.exports = {
     * 
     * Returns whether the row was used or not.
     */
-    console.log( process.cwd() );
 
-    // First make sure the list of files is of the correct format
-    // Allow a typo where someone forgot to include a space after a comma
+    // First make sure the list of files was defined. Don't remove spaces yet -
+    // allow a typo where someone forgot to include a space after a comma.
     let uploads_names = answer.split(`,`);
     if ( uploads_names.length === 0 ) {
       await scope.addToReport( scope, {
         type: `error`,
         value: `Your list of files to upload is empty.`
       });
-      return false;
+      return false;  // The row wasn't used
+    }
+
+    let dirs = [];
+    if ( session_vars.get_origin() === `playground` ) {
+      let files_playground = fg.sync(
+        [ `/usr/share/docassemble/files/playgroundsources/${session_vars.get_user_id()}/${session_vars.get_user_project_name()}` ],
+        { onlyFiles: false, suppressErrors: true }
+      );
+
+      let files_s3 = fg.sync(
+        [ `/tmp/playgroundsources/${session_vars.get_user_id()}/${session_vars.get_user_project_name()}` ],
+        { onlyFiles: false, suppressErrors: true }
+      );
+
+      dirs = files_playground.concat( files_s3 );
+    } else {
+      dirs = fg.sync(
+        [ `**/docassemble/**/data/sources` ],
+        { onlyFiles: false, suppressErrors: true }
+      );
     }
 
-    // `**/docassemble/**/data/sources`
-    // `/usr/share/docassemble/files/playgroundsources/${session_vars.get_user_id()}/${session_vars.get_user_project_name()}/*.feature`);
-    // `/tmp/playgroundsources/${session_vars.get_user_id()}/${session_vars.get_user_project_name()}/*.feature`);
-    // MUST have proj name for right upload files
-
-    let dirs_playground = fg.sync(
-      [ `/usr/share/docassemble/files/playgroundsources/**/data/sources` ],
-      { onlyFiles: false, suppressErrors: true }
-    );
-    console.log(`\n=== dirs_playground ===`);
-    console.log(dirs_playground);
-
-    let dirs_playground_all = fg.sync(
-      [ `/usr/share/docassemble/**/data/sources` ],
-      { onlyFiles: false, suppressErrors: true }
-    );
-    console.log(`\n=== dirs_playground_all ===`);
-    console.log(dirs_playground_all);
-
-    let dirs_s3 = fg.sync(
-      [ `/tmp/playgroundsources/**/data/sources` ],
-      { onlyFiles: false, suppressErrors: true }
-    );
-    console.log(`\n=== dirs_s3 ===`);
-    console.log(dirs_s3);
-
-    let dirs_repo = fg.sync(
-      [ `${ process.cwd() }/**/docassemble/**/data/sources` ],
-      { onlyFiles: false, suppressErrors: true }
-    );
-    console.log(`\n=== dirs_repo ===`);
-    console.log(dirs_repo);
-
-    // Make sure sources directory exists
-    let dirs = fg.sync([ `${ process.cwd() }/**/docassemble/**/data/sources` ], { onlyFiles: false });
+    // Make sure sources directory exists and has files in it
     if ( dirs.length === 0 ) {
       await scope.addToReport( scope, {
         type: `warning`,
-        value: `The test files need to be in the "sources" directory anywhere within "${ process.cwd() }", but ALKiln couldn't find it.`
+        value: `The test files need to be in the "sources" directory, `
+          + `but ALKiln couldn't find the directory or it was empty.`
+          // Should this say the full directory glob used to try to find the files?
       });
-      return false;
+      return false;  // The row wasn't used
     }
-    let dir = null;
 
+    // Get the full paths of the files
+    let dir = null;
     let paths = [];
     let missing_files = [];  // For any user warnings
     for ( let name of uploads_names ) {
@@ -1848,6 +1836,7 @@ module.exports = {
           // console.log( one_dir );
           matching_paths = fg.sync([ `${ one_dir }/${ trimmed_name }` ]);
           if ( matching_paths.length > 0 ) {
+            // Once we've found the file, we've got the right directory
             dir = one_dir;
             break;
           }
@@ -1872,7 +1861,7 @@ module.exports = {
 
     // If all files missing, return that the row wasn't used
     if ( missing_files.length === uploads_names.length ) {
-      return false;
+      return false;  // The row wasn't used
     }
 
     // Prepare to wait for upload to complete
@@ -1881,9 +1870,9 @@ module.exports = {
     let disabled_selector = `${ selector }[disabled]`;
     let enabled_selector = `${ selector }:not([disabled])`;
 
-    // This comes before the upload starts
-    // Notice `await` is absent. Don't actually wait here.
-    // Just start looking for it now. That way we'll catch it before it's gone
+    // This comes before the upload starts.
+    // Notice `await` is absent. Don't actually wait here yet.
+    // Start looking for it before it exists or we might miss it.
     let wait_for_disable = scope.page.waitForSelector( disabled_selector );
     
     // Upload

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@suffolklitlab/alkiln",
-  "version": "5.0.0-hotfixupload11",
+  "version": "5.0.0-hotfixupload12",
   "description": "Integrated automated end-to-end testing with docassemble, puppeteer, and cucumber.",
   "main": "lib/index.js",
   "scripts": {