@suffolklitlab/alkiln 5.0.2-feat-github-server-2 → 5.0.2-feat-github-server-4

package/.github/workflows/github_server.yml

@@ -56,6 +56,6 @@ jobs:
           SERVER_URL: "${{ steps.github_server.outputs.SERVER_URL }}"
           DOCASSEMBLE_DEVELOPER_API_KEY: "${{ steps.github_server.outputs.DOCASSEMBLE_DEVELOPER_API_KEY }}"
           INSTALL_METHOD: "server"
-          ALKILN_VERSION: "5.0.2-feat-github-server-2"
+          ALKILN_VERSION: "5.0.2-feat-github-server-4"
       - run: echo "Finished running ALKiln tests"
 

package/github_server/action.yml

@@ -26,6 +26,7 @@ runs:
       - name: "github_server: Set environment variables"
         run: |
           echo "DA_ADMIN_API_KEY=abcd1234abcd1234abcd5678abdc5678" >> $GITHUB_ENV
+          echo "MAX_SECONDS_FOR_DOCKER=${{ inputs.MAX_SECONDS_FOR_DOCKER }}" >> $GITHUB_ENV
         shell: bash
       - id: api_key_output_step
         run: echo "::set-output name=DOCASSEMBLE_DEVELOPER_API_KEY::$DA_ADMIN_API_KEY"
@@ -41,14 +42,14 @@ runs:
         run: |
           # github_server: Wait for server to start
 
+          # Reset the SECONDS variable
+          SECONDS=60
           # Wait 1 minute before pinging the server constantly
-          sleep 60
+          sleep $SECONDS
 
           # Use a variable we can control to avoid race conditions from
           # preventing the success log message.
           ready="false"
-          # Reset the SECONDS variable
-          SECONDS=60
 
           while [[ $ready == "false" ]]; do
             echo "Time ellapsed: $SECONDS seconds"
@@ -56,8 +57,8 @@ runs:
             # Get input for max number of seconds to wait
             # ${{ inputs.MAX_SECONDS_FOR_DOCKER }} as a number? Bash doesn't have types, just strings
             # Check if max seconds till loading has passed
-            if [[ $SECONDS -ge 600 ]]; then
-              echo "Error: Timed out waiting for docker container to serve the site."
+            if [[ $SECONDS -ge $MAX_SECONDS_FOR_DOCKER ]]; then
+              echo "ALKiln GitHub Server Error: Timed out waiting for docker container to serve the site. If you want to give your docker container more timem to install, set the MAX_SECONDS_FOR_DOCKER input for this action."
               break
             fi
 

package/lib/docassemble/get_base_interview_url.js

@@ -13,7 +13,7 @@ let get_base_interview_url = async function () {
   let server_url = session_vars.get_da_server_url();
   console.log(session_vars.get_install_type());
   if (session_vars.get_install_type() === "server") {
-    let x = `${ server_url }/interview?new_session=1&i=${session_vars.get_package_name().replace("-", ".")}%3Adata/questions/`;
+    let x = `${ server_url }/interview?new_session=1&i=docassemble.${session_vars.get_package_name().replace("-", ".")}%3Adata/questions/`;
     // e.g. http://localhost/interview?new_session=1&i=ALKiln%3A
     console.log(`base_interview_url: ${x}`)
     return x;

package/lib/scope.js

@@ -756,6 +756,8 @@ module.exports = {
 
     if ( !scope.page ) { scope.page = await scope.browser.newPage(); }
 
+    console.log(`interview_url:`, interview_url);
+
     // TODO: implement and use scope.handle_possible_timeout()
     try {
 

package/package.json

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