From 648c5d61eebde5c7361e09012bd436e9071f3443 Mon Sep 17 00:00:00 2001
From: Andrew Breidenbach <breidenbach.aj@gmail.com>
Date: Fri, 5 Jul 2024 19:58:43 +0200
Subject: [PATCH] standalone: add unfurl init test, use /-/overview for
 blueprint pages

---
 .github/workflows/build_test_release.yml      |  8 ++
 cypress/support/create-aws-environment.js     |  4 +-
 cypress/support/e2e.js                        | 54 +++++++-------
 cypress/support/environments.js               | 23 ++++--
 .../components/cells/application-cell.vue     | 13 +++-
 .../components/cells/combined-cell.vue        | 73 +++++++++++++++++++
 .../dashboard/components/cells/mixins.js      | 11 +++
 .../tables/deployment-index-table.vue         | 19 +----
 packages/oc-pages/dashboard/index.js          |  3 +
 .../deployment-info/deployment-item.js        |  6 +-
 packages/oc-pages/project_overview/index.js   |  2 +
 .../project_overview/store/modules/misc.js    |  5 +-
 packages/oc-pages/vue_shared/lib/normalize.js |  2 +
 scripts/src/forwarded-variables.json          |  3 +-
 scripts/src/integration-test.js               | 34 +++++++--
 testing-shared/reloading-unfurl.sh            |  2 +-
 testing-shared/setup.sh                       |  2 +-
 testing-shared/ufhome-add-environment.sh      |  2 +-
 testing-shared/unfurl-init-setup.sh           | 14 ++++
 19 files changed, 219 insertions(+), 61 deletions(-)
 create mode 100644 packages/oc-pages/dashboard/components/cells/combined-cell.vue
 create mode 100644 packages/oc-pages/dashboard/components/cells/mixins.js
 create mode 100755 testing-shared/unfurl-init-setup.sh

diff --git a/.github/workflows/build_test_release.yml b/.github/workflows/build_test_release.yml
index c8d7589a..cfbed918 100644
--- a/.github/workflows/build_test_release.yml
+++ b/.github/workflows/build_test_release.yml
@@ -42,6 +42,8 @@ jobs:
       - uses: actions/setup-node@v3
         with:
           node-version: 16
+      - name: git config
+        run: git config --global user.email "you@example.com"; git config --global user.name "Your Name"
       - name: Install yarn dependencies
         run: npm i -g yarn && YARN_ENABLE_IMMUTABLE_INSTALLS=false yarn install
         # TODO add back ufsv-patch -- --runInBand
@@ -55,6 +57,12 @@ jobs:
         run: yarn integration-test run --namespace onecommons/blueprints -- -e GENERATE_SUBDOMAINS=true --browser chrome -s cypress/e2e/blueprints/aws__baserow__baserow.cy.js
       - name: pkill
         run: pkill unfurl || /bin/true
+      - name: Integration test (unfurl init)
+        env:
+          STANDALONE_SETUP_SCRIPT: testing-shared/unfurl-init-setup.sh
+        run: yarn integration-test run --namespace onecommons/blueprints -- -e GENERATE_SUBDOMAINS=true --browser chrome -s cypress/e2e/blueprints/aws__minecraft__minecraft.cy.js
+      - name: pkill
+        run: pkill unfurl || /bin/true
       - name: Integration test (staging upstream)
         run: yarn integration-test run --namespace onecommons/blueprints -- -e GENERATE_SUBDOMAINS=true --browser chrome -s cypress/e2e/blueprints/aws__baserow__baserow.cy.js
         env:
diff --git a/cypress/support/create-aws-environment.js b/cypress/support/create-aws-environment.js
index 30c32c84..a36cb32c 100644
--- a/cypress/support/create-aws-environment.js
+++ b/cypress/support/create-aws-environment.js
@@ -104,7 +104,9 @@ Cypress.Commands.add('createAWSEnvironment', (options) => {
 
   // create external resource
   if (shouldCreateExternalResource) {
-    cy.whenInstancesAbsent(environmentName, () => {
+    cy.whenInstancesAbsent(environmentName, (env) => {
+      if(Object.keys(env.repositories).filter(repo => repo != '_dashboard').length == 0) return
+
       viewingEnv || cy.visit(`/${DASHBOARD_DEST}/-/environments/${environmentName}`)
       if(shouldCreateDNS) {
         cy.uncheckedCreateDNS(AWS_DNS_TYPE, AWS_DNS_ZONE)
diff --git a/cypress/support/e2e.js b/cypress/support/e2e.js
index 67a0edf4..213c7447 100644
--- a/cypress/support/e2e.js
+++ b/cypress/support/e2e.js
@@ -31,6 +31,7 @@ const INTEGRATION_TEST_ARGS = Cypress.env('INTEGRATION_TEST_ARGS')
 const UNFURL_SERVER_URL = Cypress.env('UNFURL_SERVER_URL')
 const UNFURL_CLOUDMAP_PATH = Cypress.env('UNFURL_CLOUDMAP_PATH')
 const UNFURL_PACKAGE_RULES = Cypress.env('UNFURL_PACKAGE_RULES')
+const STANDALONE_UNFURL = Cypress.env('STANDALONE_UNFURL')
 
 const UNFURL_VALIDATION_MODE = Cypress.env('UNFURL_VALIDATION_MODE') || Cypress.env('VALIDATION_MODE')
 
@@ -138,32 +139,35 @@ beforeEach(() => {
     })
   }
 
-  cy.document().then(doc => {
-    const csrf = doc.querySelector('meta[name="csrf-token"]')?.content
-
-    const win = doc.parentView || doc.defaultView
-
-    cy.request({
-      method: 'PATCH',
-      url: `/${DASHBOARD_DEST || win.gon.home_project}/-/variables`,
-      failOnStatusCode: false,
-      headers: {
-        'X-CSRF-Token': csrf
-      },
-      body: {
-        "variables_attributes": [
-          {
-            "key": "UNFURL_SKIP_SAVE",
-            "secret_value": "never",
-            "environment_scope": "*",
-            "variable_type": "env_var",
-            "masked": false,
-            "protected": false
-          }
-        ]
-      }
+  // set via unfurl environment in standalone tests
+  if(!STANDALONE_UNFURL) {
+    cy.document().then(doc => {
+      const csrf = doc.querySelector('meta[name="csrf-token"]')?.content
+
+      const win = doc.parentView || doc.defaultView
+
+      cy.request({
+        method: 'PATCH',
+        url: `/${DASHBOARD_DEST || win.gon.home_project}/-/variables`,
+        failOnStatusCode: false,
+        headers: {
+          'X-CSRF-Token': csrf
+        },
+        body: {
+          "variables_attributes": [
+            {
+              "key": "UNFURL_SKIP_SAVE",
+              "secret_value": "never",
+              "environment_scope": "*",
+              "variable_type": "env_var",
+              "masked": false,
+              "protected": false
+            }
+          ]
+        }
+      })
     })
-  })
+  }
 
   cy.window().then(win => {
     if(DEPLOY_IMAGE) {
diff --git a/cypress/support/environments.js b/cypress/support/environments.js
index 40e5cbf0..f1dbda76 100644
--- a/cypress/support/environments.js
+++ b/cypress/support/environments.js
@@ -19,6 +19,19 @@ const
 
 import slugify from '../../packages/oc-pages/vue_shared/slugify'
 
+/**
+ * Custom Cypress command to wait until the environment is ready,
+ * then execute a callback with the environment and store as arguments.
+ *
+ * Note: Assertions can be directly chained on the return value of this command.
+ * This is because Cypress commands return Promises, allowing for assertions
+ * like `cy.withEnvironment('envName').should('exist')`. The callback function
+ * does not affect this behavior as long as the command returns the expected value.
+ *
+ * @param {string} environmentName - The name of the environment to look up.
+ * @param {Function} cb - A callback function that receives the environment and store.
+ * @returns {Cypress.Chainable} - Returns a chainable Cypress command.
+ */
 Cypress.Commands.add('withEnvironment', (environmentName, cb) => {
   return cy.waitUntil(() => cy.withStore().then(store => {
     if(!store.getters.environmentsAreReady) return false
@@ -30,25 +43,25 @@ Cypress.Commands.add('withEnvironment', (environmentName, cb) => {
   }), {timeout: BASE_TIMEOUT * 2,  interval: 500})
     .then(store => {
       const env = store.getters.lookupEnvironment(environmentName) || null
-      cb && cb(env)
+      cb && cb(env, store) // store in callback for convenience
       return env
     })
 })
 
 Cypress.Commands.add('whenEnvironmentExists', (environmentName, cb) => {
-  return cy.withEnvironment(environmentName).then(env => env && cb(env))
+  return cy.withEnvironment(environmentName).then((env, store) => env && cb(env, store))
 })
 
 Cypress.Commands.add('whenEnvironmentAbsent', (environmentName, cb) => {
-  return cy.withEnvironment(environmentName).then(env => !env && cb())
+  return cy.withEnvironment(environmentName).then((env, store) => !env && cb(store))
 })
 
 Cypress.Commands.add('whenInstancesAbsent', (environmentName, cb) => {
-  return cy.withEnvironment(environmentName).then( env => {
+  return cy.withEnvironment(environmentName).then((env, store) => {
     if(! env) return
     if(Object.values(env.instances || {})
       .filter(instance => instance.name != 'dns-zone') == 0) {
-      cb()
+      cb(env, store)
     }
   })
 })
diff --git a/packages/oc-pages/dashboard/components/cells/application-cell.vue b/packages/oc-pages/dashboard/components/cells/application-cell.vue
index 374defac..4238972a 100644
--- a/packages/oc-pages/dashboard/components/cells/application-cell.vue
+++ b/packages/oc-pages/dashboard/components/cells/application-cell.vue
@@ -1,8 +1,10 @@
 <script>
 import * as routes from '../../router/constants'
+import {withApplicationLinkTarget} from './mixins'
 import ProjectIcon from 'oc_vue_shared/components/oc/project-icon.vue'
 export default {
     components: { ProjectIcon },
+    mixins: [withApplicationLinkTarget],
     props: {
         application: {
             type: Object,
@@ -14,6 +16,15 @@ export default {
             projectIconSrc: null,
         }
     },
+    computed: {
+        applicationLinkTarget() {
+            if(!this.application.projectPath) return null
+            if(window.gon.unfurl_gui) {
+                return `/${this.application.projectPath}/-/overview`
+            }
+            return `/${this.application.projectPath}`
+        }
+    },
     async created() {
         this.projectIconSrc = await this.application.projectIcon
     }
@@ -21,7 +32,7 @@ export default {
 </script>
 <template>
     <!-- TODO use router link when possible -->
-    <a :href="application.projectPath && application.projectPath != '.' ? `/${application.projectPath}`: null">
+    <a :href="applicationLinkTarget">
         <div v-if="application" class="status-item font-weight-bold">
             <project-icon :projectIcon="projectIconSrc" />
             {{application.title}}
diff --git a/packages/oc-pages/dashboard/components/cells/combined-cell.vue b/packages/oc-pages/dashboard/components/cells/combined-cell.vue
new file mode 100644
index 00000000..dcc3d513
--- /dev/null
+++ b/packages/oc-pages/dashboard/components/cells/combined-cell.vue
@@ -0,0 +1,73 @@
+<script>
+import * as routes from '../../router/constants'
+import DeploymentStatusIcon from './shared/deployment-status-icon.vue'
+import {mapGetters} from 'vuex'
+import _ from 'lodash'
+import DashboardRouterLink from "../../components/dashboard-router-link.vue"
+import {withApplicationLinkTarget} from './mixins'
+
+export default {
+    components: { DeploymentStatusIcon, DashboardRouterLink },
+    mixins: [withApplicationLinkTarget],
+    props: {
+        deployment: {
+            type: Object,
+            required: true
+        },
+        environment: {
+            type: Object,
+            required: true
+        },
+        application: {
+            type: Object,
+            required: true
+        },
+        displayStatus: {
+            type: Boolean,
+            default: true
+        },
+        noRouter: {
+            type: Boolean,
+            default: false
+        },
+        scope: {
+            type: Object,
+            required: true
+        },
+    },
+    data() {
+        return {routes}
+    },
+    computed: {
+        ...mapGetters(['deploymentItemDirect']),
+        deploymentItem() {
+            const {environment, deployment} = this
+            const deploymentItem = this.deploymentItemDirect({environment, deployment})
+            return deploymentItem
+        },
+        statuses() {
+            return _.uniqBy(this.deployment.statuses || [], 'type')
+        }
+    }
+}
+</script>
+<template>
+<div class="d-flex">
+    <deployment-status-icon :scope="scope" width="40px"/>
+    <div v-if="application" style="display: flex; flex-direction: column;" :class="{'hash-fragment': `#${deployment.name}` == $route.hash}">
+        <dashboard-router-link :noRouter="noRouter" :href="noRouter? deploymentItem.viewableLink: deploymentItem.viewableTo">
+            <b>{{deployment.title}}:</b>
+        </dashboard-router-link>
+        <a :href="applicationLinkTarget">
+            ({{application.title}})
+        </a>
+
+    </div>
+</div>
+</template>
+<style scoped>
+.status-item {
+    display: flex;
+    align-items: center;
+}
+</style>
diff --git a/packages/oc-pages/dashboard/components/cells/mixins.js b/packages/oc-pages/dashboard/components/cells/mixins.js
new file mode 100644
index 00000000..d880986e
--- /dev/null
+++ b/packages/oc-pages/dashboard/components/cells/mixins.js
@@ -0,0 +1,11 @@
+export const withApplicationLinkTarget = {
+    computed: {
+        applicationLinkTarget() {
+            if(!this.application.projectPath) return null
+            if(window.gon.unfurl_gui) {
+                return `/${this.application.projectPath}/-/overview`
+            }
+            return `/${this.application.projectPath}`
+        }
+    }
+}
diff --git a/packages/oc-pages/dashboard/components/tables/deployment-index-table.vue b/packages/oc-pages/dashboard/components/tables/deployment-index-table.vue
index 143d3f8e..32b62a67 100644
--- a/packages/oc-pages/dashboard/components/tables/deployment-index-table.vue
+++ b/packages/oc-pages/dashboard/components/tables/deployment-index-table.vue
@@ -1,10 +1,10 @@
 <script>
 import TableComponent from 'oc_vue_shared/components/oc/table.vue'
 import {OcTab, EnvironmentSelection, LocalDeploy, AutostopInner} from 'oc_vue_shared/components/oc'
+import CombinedCell from '../cells/combined-cell.vue'
 import EnvironmentCell from '../cells/environment-cell.vue'
 import ResourceCell from '../cells/resource-cell.vue'
 import DeploymentControls from '../cells/deployment-controls.vue'
-import DeploymentStatusIcon from '../cells/shared/deployment-status-icon.vue'
 import LastDeploy from './deployment-index-table/last-deploy.vue'
 import {GlTabs, GlModal, GlFormInput, GlFormGroup} from '@gitlab/ui'
 import {mapGetters, mapActions, mapMutations} from 'vuex'
@@ -13,7 +13,6 @@ import { FLASH_TYPES } from 'oc_vue_shared/client_utils/oc-flash';
 import Vue from 'vue'
 import _ from 'lodash'
 import * as routes from '../../router/constants'
-import DashboardRouterLink from "../../components/dashboard-router-link.vue"
 import MergeRequestsTable from './merge-requests-table.vue'
 
 const standalone = window.gon.unfurl_gui
@@ -84,6 +83,7 @@ const tabFilters = [
 export default {
     components: {
         TableComponent,
+        CombinedCell,
         EnvironmentCell,
         ResourceCell,
         DeploymentControls,
@@ -94,8 +94,6 @@ export default {
         EnvironmentSelection,
         GlFormInput,
         GlFormGroup,
-        DeploymentStatusIcon,
-        DashboardRouterLink,
         MergeRequestsTable,
         AutostopInner,
         LocalDeploy
@@ -757,18 +755,7 @@ export default {
                 </div>
             </template>
             <template #deployment="scope">
-                <div class="d-flex">
-                    <deployment-status-icon width="40px" :scope="scope" />
-                    <div v-if="scope.item.context.application" style="display: flex; flex-direction: column;" :class="{'hash-fragment': `#${scope.item.context.deployment.name}` == $route.hash}">
-                        <dashboard-router-link :noRouter="noRouter" :href="noRouter? deploymentItem(scope, 'viewableLink'): deploymentItem(scope, 'viewableTo')">
-                            <b>{{scope.item.context.deployment.title}}:</b>
-                        </dashboard-router-link>
-                        <a :href="`/${scope.item.context.deployment.projectPath}`">
-                            ({{scope.item.context.application.title}})
-                        </a>
-
-                    </div>
-                </div>
+                <combined-cell v-if="scope.item.context.deployment" :noRouter="noRouter" :scope="scope" :application="scope.item.context.application" :deployment="scope.item.context.deployment" :environment="scope.item.context.environment"/>
             </template>
             <!--template #resource$empty="scope">
                 <div v-if="hasDeployPath(scope)">{{__('Not yet deployed')}}</div>
diff --git a/packages/oc-pages/dashboard/index.js b/packages/oc-pages/dashboard/index.js
index 2180461f..f1967ef4 100644
--- a/packages/oc-pages/dashboard/index.js
+++ b/packages/oc-pages/dashboard/index.js
@@ -9,6 +9,7 @@ import {setupTheme} from 'oc_vue_shared/theme'
 import {OcComponents} from 'oc_vue_shared/components/oc/plugin'
 import {Popover as ElPopover, Loading as ElLoading} from 'element-ui'
 import '../project_overview/assets/global.css' // TODO move this somewhere better
+import {normpath} from 'oc_vue_shared/lib/normalize'
 
 Vue.use(GlToast);
 Vue.use(OcComponents)
@@ -31,6 +32,8 @@ export default (elemId='js-table-component') => {
     import('./layout-fix.css')
     const element = document.getElementById(elemId);
     window.gon = {...window.gon, ...element.dataset}
+    window.gon.home_project = normpath(window.gon.home_project)
+    window.gon.working_dir_project = normpath(window.gon.working_dir_project)
 
     if(window.Cypress || sessionStorage['debug'] || sessionStorage['unfurl-gui:state']) {
         window.$store = store
diff --git a/packages/oc-pages/dashboard/store/modules/deployment-info/deployment-item.js b/packages/oc-pages/dashboard/store/modules/deployment-info/deployment-item.js
index 54ccf542..f7c6c2a9 100644
--- a/packages/oc-pages/dashboard/store/modules/deployment-info/deployment-item.js
+++ b/packages/oc-pages/dashboard/store/modules/deployment-info/deployment-item.js
@@ -108,7 +108,11 @@ export default class DeploymentItem {
 
     get readonlyLink() { return `/${this.projectPath}/-/deployments/${this.environment.name}/${this.deployment.name}`}
     get editableLink() {
-        let result = `/${this.deployment.projectPath}/deployment-drafts/${encodeURIComponent(this.projectPath)}/${this.environment.name}/${this.deployment.name}?fn=${this.deployment.title}`
+        let overviewPath = this.deployment.projectPath
+        if(window.gon.unfurl_gui) {
+            overviewPath += '/-/overview'
+        }
+        let result = `/${overviewPath}/deployment-drafts/${encodeURIComponent(this.projectPath)}/${this.environment.name}/${this.deployment.name}?fn=${this.deployment.title}`
         if(this.deployment.branch) {
             result += `&bprev=${this.deployment.branch}`
         }
diff --git a/packages/oc-pages/project_overview/index.js b/packages/oc-pages/project_overview/index.js
index 4991c2d4..632cf055 100644
--- a/packages/oc-pages/project_overview/index.js
+++ b/packages/oc-pages/project_overview/index.js
@@ -35,6 +35,8 @@ export default (elemId='js-oc-project-overview') => {
   } = element.dataset;
 
   projectPath = normpath(projectPath)
+  window.gon.home_project = normpath(window.gon.home_project)
+  window.gon.working_dir_project = normpath(window.gon.working_dir_project)
   const base = window.location.pathname.includes('/-/overview') ?
     `${projectPath}/-/overview` : projectPath
 
diff --git a/packages/oc-pages/project_overview/store/modules/misc.js b/packages/oc-pages/project_overview/store/modules/misc.js
index 8291600d..73ec153a 100644
--- a/packages/oc-pages/project_overview/store/modules/misc.js
+++ b/packages/oc-pages/project_overview/store/modules/misc.js
@@ -5,6 +5,7 @@ import {fetchProjectInfo} from 'oc_vue_shared/client_utils/projects'
 import {createFlash, hideLastFlash, FLASH_TYPES} from 'oc_vue_shared/client_utils/oc-flash'
 import {unfurlServerUrlOverride} from 'oc_vue_shared/storage-keys'
 import {lookupKey} from 'oc_vue_shared/storage-keys'
+import {normpath} from 'oc_vue_shared/lib/normalize'
 
 const DEFAULT_ROUTER_HOOK = (to, from, next) => next()
 
@@ -67,11 +68,11 @@ const mutations = {
 const getters = {
     getRouterHook(state) {return state.routerHook},
     getCurrentNamespace(state, getters) {
-        if(window.gon.home_project !== null) return state.namespace || lookupKey('defaultNamespace') || getters.getUsername
+        if(window.gon.home_project !== null) return normpath(state.namespace || lookupKey('defaultNamespace') || getters.getUsername)
         return null
     },
     getHomeProjectPath(state, getters)  {
-        if(window.gon.home_project !== null) return `${getters.getCurrentNamespace}/${state.dashboard || USER_HOME_PROJECT}`
+        if(window.gon.home_project !== null) return normpath(`${getters.getCurrentNamespace}/${state.dashboard || USER_HOME_PROJECT}`)
         return null
     },
     getHomeProjectName(state) {
diff --git a/packages/oc-pages/vue_shared/lib/normalize.js b/packages/oc-pages/vue_shared/lib/normalize.js
index 38c13d63..0494c7e2 100644
--- a/packages/oc-pages/vue_shared/lib/normalize.js
+++ b/packages/oc-pages/vue_shared/lib/normalize.js
@@ -7,6 +7,8 @@ function normalizeDirectives(directives) {
 }
 
 export function normpath(path) {
+    if(!path) return path
+    if(path == ':') path = window.gon.home_project
     return path.split('/').filter(c => !!c).join('/')
 }
 
diff --git a/scripts/src/forwarded-variables.json b/scripts/src/forwarded-variables.json
index 54aa0f84..dd88da47 100644
--- a/scripts/src/forwarded-variables.json
+++ b/scripts/src/forwarded-variables.json
@@ -69,5 +69,6 @@
   "DASHBOARD_DEST",
   "UNFURL_CMD",
   "FAIL_FAST_ENABLED",
-  "UNFURL_CLOUD_SERVER"
+  "UNFURL_CLOUD_SERVER",
+  "STANDALONE_SETUP_SCRIPT"
 ]
diff --git a/scripts/src/integration-test.js b/scripts/src/integration-test.js
index 006fd8f0..1782f4bd 100755
--- a/scripts/src/integration-test.js
+++ b/scripts/src/integration-test.js
@@ -21,12 +21,32 @@ const STANDALONE_PROJECT_DIR = `${UNFURL_TEST_TMPDIR}/ufsv`
 if(STANDALONE_UNFURL && ! PORT) {
   PORT = new URL(OC_URL).port
 }
+
+
 process.env.UNFURL_HOME = path.join(UNFURL_TEST_TMPDIR, './unfurl_home')
 process.env.UNFURL_NORUNTIME = true
 process.env.OC_URL = OC_URL
 
 const LOCAL_ONLY = !!(STANDALONE_UNFURL && (!UNFURL_CLOUD_SERVER || UNFURL_CLOUD_SERVER == OC_URL))
 
+if(LOCAL_ONLY) {
+  console.log('Running a local only test - there is no defined upstream')
+} else if(STANDALONE_UNFURL) {
+  console.log(`Running a local test against ${UNFURL_CLOUD_SERVER}`)
+} else {
+  console.log(`Running test against an Unfurl Cloud instance: ${OC_URL}`)
+}
+
+// not used unless local only
+const STANDALONE_SETUP_SCRIPT = process.env.STANDALONE_SETUP_SCRIPT || 'testing-shared/setup.sh'
+if(process.env.STANDALONE_SETUP_SCRIPT) {
+  console.log(`Using a parameterized setup script ${process.env.STANDALONE_SETUP_SCRIPT}`)
+}
+
+if(!LOCAL_ONLY && process.env.STANDALONE_SETUP_SCRIPT) {
+  console.warn('Contradictory test parameters: STANDALONE_SETUP_SCRIPT can not be used with UNFURL_CLOUD_SERVER or OC_URL')
+}
+
 process.env.FAIL_FAST_ENABLED = process.env.FAIL_FAST_ENABLED || 'false'
 
 if(STANDALONE_UNFURL) {
@@ -157,8 +177,6 @@ async function forwardedEnvironmentVariables(override) {
 }
 
 
-const ERROR_CREATE_USER_NO_DASHBOARD = 'A dashboard must be specified if a user is to be created.  Specify either --username or --dashboard-repo'
-
 const ENV_NAMING_FUNCTIONS = {
   identifierFromCurrentTime(baseId) {
     const d = new Date(Date.now())
@@ -170,7 +188,6 @@ const ENV_NAMING_FUNCTIONS = {
 }
 
 function createDashboardCommand(username, dashboardRepo) {
-  //if(!dashboardRepo) { throw new Error(ERROR_CREATE_USER_NO_DASHBOARD) }
   const
     createUser = path.join(__dirname, 'create-user.js'),
     createUserArgs = ['--username', username, '--external', EXTERNAL],
@@ -290,8 +307,13 @@ async function main() {
     delete forwardedEnv['CYPRESS_OC_IMPERSONATE']
   }
 
-  if(STANDALONE_UNFURL && ! LOCAL_ONLY) {
-    delete forwardedEnv['CYPRESS_DASHBOARD_DEST'] // has ambiguous meaning for standalone with upstream
+  if(STANDALONE_UNFURL ) {
+    if(LOCAL_ONLY) {
+      delete forwardedEnv['CYPRESS_DASHBOARD_DEST'] // has ambiguous meaning for standalone with upstream
+    }
+    else {
+      forwardedEnv['CYPRESS_DASHBOARD_DEST'] = 'local:' + forwardedEnv['CYPRESS_DASHBOARD_DEST']
+    }
   }
 
   const cypressCommand = await invokeCypressCommand(args._, forwardedEnv)
@@ -320,7 +342,7 @@ async function main() {
   if(STANDALONE_UNFURL) {
 
     if(LOCAL_ONLY) {
-      execFileSync('testing-shared/setup.sh', {
+      execFileSync(STANDALONE_SETUP_SCRIPT, {
         env: {
           ...process.env,
           UNFURL_SERVER_CWD: process.env.DASHBOARD_DEST
diff --git a/testing-shared/reloading-unfurl.sh b/testing-shared/reloading-unfurl.sh
index 7204eb14..9a00278b 100755
--- a/testing-shared/reloading-unfurl.sh
+++ b/testing-shared/reloading-unfurl.sh
@@ -4,7 +4,7 @@ if [[ "$1" == "serve" ]]; then
   unfurl_init="$(python -c "import importlib.util; print(importlib.util.find_spec('unfurl').origin)")"
   unfurl_dir=$(dirname $unfurl_init)
 
-  exec find "$unfurl_dir" | entr -r unfurl "$@"
+  exec find "$unfurl_dir" | entr -nr unfurl "$@"
 else
   exec unfurl "$@"
 fi
diff --git a/testing-shared/setup.sh b/testing-shared/setup.sh
index d1877f16..bcb17c26 100755
--- a/testing-shared/setup.sh
+++ b/testing-shared/setup.sh
@@ -3,7 +3,7 @@ if [ -z ${UNFURL_SERVER_CWD+x} ]; then echo UNFURL_SERVER_CWD must be set; exit
 rm -rf $UNFURL_SERVER_CWD/.git*
 rm -rf $UNFURL_SERVER_CWD/*
 mkdir -p $UNFURL_SERVER_CWD
-local_unfurl_yaml=$(realpath $UFSV_LOCAL)
+local_unfurl_yaml=$(realpath $UFSV_LOCAL) #safe with cd
 
 set -e
 
diff --git a/testing-shared/ufhome-add-environment.sh b/testing-shared/ufhome-add-environment.sh
index e2b18bae..764320fe 100755
--- a/testing-shared/ufhome-add-environment.sh
+++ b/testing-shared/ufhome-add-environment.sh
@@ -29,7 +29,7 @@ ufhome=$dashboard_project
 cp testing-shared/fixtures/environments/$1.yaml $ufhome/local/$name_or_type.yaml
 
 
-sed -i "s|environments:|+?include-$name_or_type: local/$name_or_type.yaml\nenvironments:|" $ufhome/unfurl.yaml
+sed -E -i "s|((# )?environments:)|+?include-$name_or_type: local/$name_or_type.yaml\n\1|" $ufhome/unfurl.yaml
 
 if [ ! -z "$environment_name" ]; then
   sed -i "s|$environment_type:|$environment_name:|" "$ufhome/local/$name_or_type.yaml"
diff --git a/testing-shared/unfurl-init-setup.sh b/testing-shared/unfurl-init-setup.sh
new file mode 100755
index 00000000..5fafdfea
--- /dev/null
+++ b/testing-shared/unfurl-init-setup.sh
@@ -0,0 +1,14 @@
+#!/bin/bash
+
+if [ -z ${UNFURL_SERVER_CWD+x} ]; then echo UNFURL_SERVER_CWD must be set; exit 1; fi
+rm -rf $UNFURL_SERVER_CWD
+mkdir -p $(dirname $UNFURL_SERVER_CWD)
+local_unfurl_yaml=$(realpath $UFSV_LOCAL) #safe with cd
+unfurl_cmd=${UNFURL_CMD:-unfurl}
+
+$unfurl_cmd init $UNFURL_SERVER_CWD
+
+if [ -n "$UFSV_LOCAL" ]
+then
+  cp $local_unfurl_yaml local/unfurl.yaml
+fi