copy tweaks, fill in tests

Author: david-crespo

app/pages/project/instances/instance/InstancePage.tsx

@@ -109,6 +109,11 @@ InstancePage.loader = async ({ params }: LoaderFunctionArgs) => {
 
 const POLL_INTERVAL = 1000
 
+// We're using this logic here on instance detail, but not on instance list.
+// Instance list will only poll for the transitioning case. We don't show
+// anything about cooldown on the instance list, so the only point of polling
+// would be to catch a restart when it happens. But with the cooldown period
+// being an hour, we'd be doing a _lot_ of unnecessary polling on the list page.
 function shouldPoll(instance: Instance) {
   if (instanceTransitioning(instance)) return 'transition'
   if (instanceCoolingDown(instance)) return 'cooldown'

app/pages/project/instances/instance/tabs/SettingsTab.tsx

@@ -98,14 +98,13 @@ export function Component() {
             name="autoRestartPolicy"
             label="Policy"
             description="The global default is currently best effort, but this may change in the future."
-            placeholder="Default"
             items={restartPolicyItems}
             required
             className="max-w-none"
           />
           <FormMeta
             label="Cooldown expiration"
-            helpText="The time at which the auto-restart cooldown period for this instance completes. If N/A, then either the instance has never been automatically restarted, or the cooldown period has already expired."
+            helpText="When this instance will next restart (if in a failed state and the policy allows it). If N/A, then either the instance has never been automatically restarted, or the cooldown period has expired."
           >
             {
               // TODO: show preview of how the time would change on update when
@@ -126,10 +125,10 @@ export function Component() {
           </FormMeta>
           <FormMeta
             label="Last auto-restarted"
-            helpText="When this instance was last automatically restarted. Empty if never auto-restarted."
+            helpText="When this instance was last automatically restarted. N/A if never auto-restarted."
           >
             {instance.timeLastAutoRestarted ? (
-              <>{toLocaleDateTimeString(instance.timeLastAutoRestarted)}</>
+              toLocaleDateTimeString(instance.timeLastAutoRestarted)
             ) : (
               <span className="text-tertiary">N/A</span>
             )}

test/e2e/instance-auto-restart.e2e.ts

@@ -9,7 +9,7 @@ import { expect, test } from '@playwright/test'
 
 import { expectToast } from './utils'
 
-test('Instance auto restart policy', async ({ page }) => {
+test('Auto restart policy on failed instance', async ({ page }) => {
   await page.goto('/projects/mock-project/instances/you-fail')
 
   // check popover
@@ -22,9 +22,11 @@ test('Instance auto restart policy', async ({ page }) => {
   // now go to settings tab by clicking link in popover
   await page.getByRole('link', { name: 'Default' }).click()
 
-  // assert contents of table-like thing showing the state
+  // assert contents of table-like thing showing the state. leave date underspecified
+  // because it's always 5 minutes of whatever now is
+  await expect(page.getByText(/Cooldown expiration.+, 202\d.+\(5 minutes\)/)).toBeVisible()
+  await expect(page.getByText(/Last auto-restarted.+, 202\d/)).toBeVisible()
 
-  // await expect(page.getByRole('button', { name: 'Policy' }))
   const save = page.getByRole('button', { name: 'Save' })
   await expect(save).toBeDisabled()
 
@@ -37,7 +39,37 @@ test('Instance auto restart policy', async ({ page }) => {
 
   await expectToast(page, 'Instance auto-restart policy updated')
   await expect(policyListbox).toContainText('Never')
+  await expect(save).toBeDisabled()
 })
 
 // TODO: test that polling updates the relevant stuff
-// TODO: test updating policy on a running instance
+
+// unlike the other instance update things, you can change auto restart policy
+// regardless of state
+test('Auto restart policy on running instance', async ({ page }) => {
+  await page.goto('/projects/mock-project/instances/db1')
+
+  await expect(page.getByText('Running')).toBeVisible() // it's running. we know
+
+  // go to settings tab
+  await page.getByRole('tab', { name: 'settings' }).click()
+
+  // assert contents of table-like thing showing the state
+  await expect(page.getByText('Cooldown expirationN/A')).toBeVisible()
+  await expect(page.getByText('Last auto-restartedN/A')).toBeVisible()
+
+  // await expect(page.getByRole('button', { name: 'Policy' }))
+  const save = page.getByRole('button', { name: 'Save' })
+  await expect(save).toBeDisabled()
+
+  const policyListbox = page.getByRole('button', { name: 'Policy' })
+  await expect(policyListbox).toContainText('Default')
+
+  await page.getByRole('button', { name: 'Policy' }).click()
+  await page.getByRole('option', { name: 'Never' }).click()
+  await save.click()
+
+  await expectToast(page, 'Instance auto-restart policy updated')
+  await expect(policyListbox).toContainText('Never')
+  await expect(save).toBeDisabled()
+})