From 56cbcdd85a2f1d5a92523eadf75c3b72588eaf5d Mon Sep 17 00:00:00 2001
From: "Benjamin R. J. Schwedler" <ben@posit.co>
Date: Tue, 24 Sep 2024 09:55:38 -0500
Subject: [PATCH] Update goss tests for pwb-code-server

---
 workbench-for-google-cloud-workstations/test/goss.yaml | 5 ++++-
 workbench-for-microsoft-azure-ml/test/goss.yaml        | 5 ++++-
 workbench/test/goss.yaml                               | 7 ++-----
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/workbench-for-google-cloud-workstations/test/goss.yaml b/workbench-for-google-cloud-workstations/test/goss.yaml
index 7839667cf..b4aa98e14 100644
--- a/workbench-for-google-cloud-workstations/test/goss.yaml
+++ b/workbench-for-google-cloud-workstations/test/goss.yaml
@@ -70,8 +70,11 @@ file:
     exists: true
     owner: rstudio-server
     group: rstudio-server
-  /usr/lib/rstudio-server/bin/code-server/bin/code-server:
+  /usr/lib/rstudio-server/bin/pwb-code-server/bin/code-server:
     exists: true
+  # Old code-server location
+  /usr/lib/rstudio-server/bin/code-server/bin/code-server:
+    exists: false
   /etc/rstudio/vscode.conf:
     exists: true
   /etc/rstudio/jupyter.conf:
diff --git a/workbench-for-microsoft-azure-ml/test/goss.yaml b/workbench-for-microsoft-azure-ml/test/goss.yaml
index 5983284a2..221316fc0 100644
--- a/workbench-for-microsoft-azure-ml/test/goss.yaml
+++ b/workbench-for-microsoft-azure-ml/test/goss.yaml
@@ -78,8 +78,11 @@ file:
     exists: true
     owner: rstudio-server
     group: rstudio-server
-  /usr/lib/rstudio-server/bin/code-server/bin/code-server:
+  /usr/lib/rstudio-server/bin/pwb-code-server/bin/code-server:
     exists: true
+  # Old code-server location
+  /usr/lib/rstudio-server/bin/code-server/bin/code-server:
+    exists: false
   /etc/rstudio/vscode.conf:
     exists: true
   /tmp/startup.log:
diff --git a/workbench/test/goss.yaml b/workbench/test/goss.yaml
index 9d8ae4a62..a8fce2d53 100644
--- a/workbench/test/goss.yaml
+++ b/workbench/test/goss.yaml
@@ -69,14 +69,11 @@ file:
     exists: true
     owner: rstudio-server
     group: rstudio-server
-  {{ $version_split := split "." .Env.RSW_VERSION }}
-  {{ if or (ge ($version_split._0 | atoi) 2025) (and (ge ($version_split._0 | atoi) 2024) (ge ($version_split._1 | atoi) 7)) }}
   /usr/lib/rstudio-server/bin/pwb-code-server/bin/code-server:
     exists: true
-  {{ else }}
+  # Old code-server location
   /usr/lib/rstudio-server/bin/code-server/bin/code-server:
-    exists: true
-  {{ end }}
+    exists: false
   /var/lib/rstudio-launcher/Local/jobs/buildkitsandbox:
     exists: false
   /etc/rstudio/vscode.conf: