@suffolklitlab/alkiln 4.10.4-cli-playground-1 → 4.10.4-cli-playground-2

package/lib/docassemble/docassemble_api_interface.js

@@ -141,13 +141,27 @@ da_i.is_server_responding = async function ( dev_id_options ) {
 
 // node -e 'require("./lib/docassemble/docassemble_api_interface.js").get_dev_id()'
 da_i.get_dev_id = async function ( dev_id_options ) {
-  /** For consistency, wrap _da_REST.get_dev_id().
-  *    See https://docassemble.org/docs/api.html#user. */
+  /** Get user id, either locally or on the server.
+  *    For consistency, wrap _da_REST.get_dev_id().
+  *    See https://docassemble.org/docs/api.html#user.
+  * 
+  * @param dev_id_options {obj} Options for getting dev_id
+  * @param dev_id_options.timeout {int} Required if options is defined. Max MS
+  *    to allow for server request.
+  */
 
-  // Default timeouts
-  let { timeout } = dev_id_options ||  { timeout: DEFAULT_MAX_REQUEST_MS };
-  let response = await _da_REST.get_dev_id( timeout );
-  return response.data.id;
+  let dev_id = null;
+
+  if ( session_vars.get_origin() === 'interview' ) {
+    dev_id = session_vars.get_user_id();
+  } else {
+    // Default timeouts
+    let { timeout } = dev_id_options ||  { timeout: DEFAULT_MAX_REQUEST_MS };
+    let response = await _da_REST.get_dev_id( timeout );
+    dev_id = response.data.id;
+  }
+
+  return dev_id;
 };  // Ends da_i.get_dev_id();
 
 

package/lib/docassemble/get_base_interview_url.js

@@ -11,6 +11,7 @@ let get_base_interview_url = async function () {
   *    when the user is not logged in.) We can't use `reset=2` because it caused an
   *    'Unable to locate interview session' error. */
   let server_url = session_vars.get_da_server_url();
+
   let dev_id = await docassemble_api_interface.get_dev_id();
   let project_name = session_vars.get_project_name();
   return `${ server_url }/interview?new_session=1&i=docassemble.playground${ dev_id }${ project_name }%3A`;

package/lib/run_cucumber.js

@@ -17,20 +17,23 @@ const cucumber_api = require('@cucumber/cucumber/api');
     "publishQuiet": true,
     "require": "./lib/index.js", 
     "format": ["progress", "summary:cucumber-report.txt"],
-    "paths": ["docassemble/*/data/sources/*.feature"],
+    "paths": ["docassemble/*/data/sources/*.feature",
+              // // "1" is the user id. We also need to get the Project name, etc.
+              // "/usr/share/docassemble/files/playgroundsources/1/test.feature"
+    ],
     "retry": 1,
   }
 
   // If they're running it from an interview on their server instead of from GitHub
   if ( session_vars.get_origin() === `interview` ) {
-    provided_config.paths.append(`/usr/share/docassemble/files/playgroundsources/${session_vars.get_user_id()}/${session_vars.get_user_project_name()}/*.feature`);
+    provided_config.paths.push(`/usr/share/docassemble/files/playgroundsources/${session_vars.get_user_id()}/${session_vars.get_user_project_name()}/*.feature`);
   }
 
   let tag_vals = just_args;
   if ( session_vars.get_origin() === `interview` ) {
     // Should tags be given as a string or a list? String would give option to
     // give a boolean expression. TODO: offer a dropdown with available tags.
-    tag_vals = session_vars.get_tags().split(` `);
+    tag_vals = session_vars.get_tags();
   }
 
   if (tag_vals.length > 0) {
@@ -49,7 +52,6 @@ const cucumber_api = require('@cucumber/cucumber/api');
     }
   }
 
-
   const { runConfiguration } = await cucumber_api.loadConfiguration({
     provided: provided_config
   }, environment);
@@ -66,7 +68,7 @@ const cucumber_api = require('@cucumber/cucumber/api');
   console.log(`%o`, runConfiguration);
 
   const { success } = await cucumber_api.runCucumber({...runConfiguration, support});
-  console.log(`ALKiln run_cucumber.js succeeded:`);
+  console.log(`\nALKiln run_cucumber.js succeeded:`);
   console.log(`%o`, success);
   const exitCode = success ? 0 : 1;
   process.exitCode = exitCode;

package/lib/scope.js

@@ -732,7 +732,6 @@ module.exports = {
   load: async function ( scope, file_name ) {
     /* Try to load the page. Should we also pass a `timeout` arg or just
     *    use scope.timeout? */
-
     await scope.addToReport(scope,{
       type: `row`,
       value: `Trying to load the interview`
@@ -753,17 +752,15 @@ module.exports = {
       let base_url = await get_base_interview_url();
       interview_url = `${ base_url }${ file_name }`;
     }
+    
     if ( session_vars.get_debug() ) { console.log( `interview_url:`, interview_url ); }
 
     if ( !scope.page ) { scope.page = await scope.browser.newPage(); }
 
     // TODO: implement and use scope.handle_possible_timeout()
     try {
-
       await scope.page.goto(interview_url, { waitUntil: 'domcontentloaded', timeout: scope.timeout })
-
     } catch ( error ) {
-
       // If the page didn't load because it took to long to load
       if ( error.name === `TimeoutError` ) {
 
@@ -772,7 +769,6 @@ module.exports = {
 
       // If the page didn't load because of any other reason
       } else {
-
         // Throw any non-timeout error
         scope.addToReport( scope, {
           type: `error`,
@@ -782,14 +778,12 @@ module.exports = {
       }  // ends if error is timeout error
 
     }  // ends try/catch
-
     let load_result = await scope.getLoadData( scope );
     // Errors, or reaching timeout, causes an exception and is shown to the developer at the end
     if ( load_result.error ) {
       await scope.addToReport(scope, { type: `error`, value: `On final attempt to load interview, got "${ load_result.error }"` });
       expect( load_result.error ).to.equal( '' );
     }
-
     return scope.page;
   },  // Ends scope.load()
 

package/lib/steps.js

@@ -91,6 +91,7 @@ BeforeAll(async () => {
   
   // Make the folder to store all the files for this run of the tests
   scope.paths.artifacts = files.make_artifacts_folder();
+  console.log(`process.cwd()`, process.cwd());
   // Save its name in a file. `session_vars` can get it back later.
   // This is used by at least run_cucumber.js.
   session_vars.save_artifacts_path_name( scope.paths.artifacts );

package/lib/utils/session_vars.js

@@ -35,7 +35,13 @@ session_vars.get_origin = function () {
 };
 session_vars.get_user_project_name = function () { return process.env._PROJECT_NAME || null; };
 session_vars.get_user_id = function () { return process.env._USER_ID || null; };
-session_vars.get_tags = function () { return process.env._TAGS || null; };
+session_vars.get_tags = function () {
+  if ( process.env._TAGS ) {
+    return process.env._TAGS.split(` `);
+  } else {
+    return [];
+  }
+};
 
 // More complex logic
 session_vars.get_server_reload_timeout = function () {

package/package.json

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