test: update runs OS (#11960)

Co-authored-by: Ivan_Chen <v-ivanchen@microsoft.com>
OfficeDev · Jul 5, 2024 · 41e4cb8 · 41e4cb8
1 parent 1a5745c
commit 41e4cb8
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 66 deletions.
diff --git a/packages/tests/scripts/randomCases.json b/packages/tests/scripts/randomCases.json
@@ -20,47 +20,17 @@
             "sample-localdebug-incoming-webhook",
             "basic-tab-debug-upgrade-debug",
             "bot-debug-upgrade-debug",
-            "bot-upgrade-debug"
-        ]
-    },
-    {
-        "os": {
-            "windows-latest": {
-                "node-16": [],
-                "node-18": []
-            },
-            "ubuntu-latest": {
-                "node-16": [],
-                "node-18": []
-            },
-            "macos-latest": {
-                "node-16": [],
-                "node-18": []
-            }
-        },
-        "cases": [
+            "bot-upgrade-debug",
+            "sample-remotedebug-todo-list-with-spfx",
+            "sample-remotedebug-todo-list-with-m365",
+            "sample-localdebug-react-retail-dashboard",
+            "sample-localdebug-spfx-productivity-dashboard",
+            "sample-remotedebug-react-retail-dashboard",
+            "sample-remotedebug-spfx-productivity-dashboard",
             "sample-localdebug-npm-search",
             "sample-localdebug-proactive-message"
         ]
     },
-    {
-        "os": {
-            "windows-latest": {
-                "node-16": []
-            },
-            "ubuntu-latest": {
-                "node-16": []
-            },
-            "macos-latest": {
-                "node-16": []
-            }
-        },
-        "cases": [
-            "sample-localdebug-todo-list-with-spfx",
-            "sample-localdebug-react-retail-dashboard",
-            "sample-localdebug-spfx-productivity-dashboard"
-        ]
-    },
     {
         "os": {
             "windows-latest": {
@@ -74,7 +44,8 @@
             }
         },
         "cases": [
-            "sample-localdebug-chef-bot"
+            "sample-localdebug-chef-bot",
+            "sample-remotedebug-chef-bot"
         ]
     },
     {
@@ -89,7 +60,6 @@
             }
         },
         "cases": [
-            "sample-localdebug-todo-list-with-m365",
             "sample-localdebug-hello-world-tab-with-backend",
             "sample-localdebug-graph-connector-bot",
             "sample-localdebug-bot-sso",
@@ -114,7 +84,6 @@
             "sample-remotedebug-hello-world-tab-with-backend",
             "sample-remotedebug-npm-search",
             "sample-remotedebug-hello-world-meeting",
-            "sample-remotedebug-todo-list-with-m365",
             "sample-remotedebug-one-productivity-hub",
             "sample-remotedebug-stock-update",
             "sample-remotedebug-query-org",
@@ -127,28 +96,6 @@
             "bot-upgrade-provision-debug"
         ]
     },
-    {
-        "os": {
-            "windows-latest": {
-                "node-16": []
-            }
-        },
-        "cases": [
-            "sample-remotedebug-chef-bot"
-        ]
-    },
-    {
-        "os": {
-            "windows-latest": {
-                "node-18": []
-            }
-        },
-        "cases": [
-            "sample-remotedebug-todo-list-with-spfx",
-            "sample-remotedebug-react-retail-dashboard",
-            "sample-remotedebug-spfx-productivity-dashboard"
-        ]
-    },
     {
         "os": {
             "ubuntu-latest": {
@@ -174,7 +121,9 @@
             "sample-localdebug-hello-world-tab-docker",
             "sample-remotedebug-hello-world-tab-docker",
             "basic-tab-provision-upgrade-provision-debug",
-            "bot-provision-upgrade-provision-debug"
+            "bot-provision-upgrade-provision-debug",
+            "sample-localdebug-todo-list-with-spfx",
+            "sample-localdebug-todo-list-with-m365"
         ]
     }
 ]
diff --git a/packages/tests/src/e2e/samples/ProvisionChefBot.tests.ts b/packages/tests/src/e2e/samples/ProvisionChefBot.tests.ts
@@ -31,10 +31,10 @@ class ChefBotTestCase extends CaseFactory {
     fs.mkdirSync(path.resolve(projectPath, "env"), {
       recursive: true,
     });
-    const userFile = path.resolve(projectPath, "env", ".env.dev.user");
+    const userFile = path.resolve(projectPath, "env", ".env.dev");
     const KEY = "SECRET_OPENAI_KEY=MY_OPENAI_API_KEY";
     fs.writeFileSync(userFile, KEY);
-    console.log(`add key ${KEY} to .env.dev.user file`);
+    console.log(`add key ${KEY} to .env.dev file`);
   }
 }
 

diff --git a/packages/tests/src/ui-test/samples/sample-localdebug-chef-bot.test.ts b/packages/tests/src/ui-test/samples/sample-localdebug-chef-bot.test.ts
@@ -30,7 +30,7 @@ class ChefBotTestCase extends CaseFactory {
     const envFile = path.resolve(
       sampledebugContext.projectPath,
       "env",
-      ".env.local.user"
+      ".env.local"
     );
     // create .env.local.user file
     fs.writeFileSync(envFile, "SECRET_OPENAI_KEY=yourapikey");