From acd11896b4a5ec1437f572f96c26cb87cc5a5dfe Mon Sep 17 00:00:00 2001
From: Ivan_Chen <v-ivanchen@microsoft.com>
Date: Wed, 24 Jul 2024 18:18:28 +0800
Subject: [PATCH] test: select tenant use env

---
 src/test/e2e/tests/selectAzureTenant.test.ts |  4 ++--
 src/test/e2e/utils/constants.ts              | 22 ++++++++++++++++----
 2 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/src/test/e2e/tests/selectAzureTenant.test.ts b/src/test/e2e/tests/selectAzureTenant.test.ts
index a34f31d..b5e8613 100644
--- a/src/test/e2e/tests/selectAzureTenant.test.ts
+++ b/src/test/e2e/tests/selectAzureTenant.test.ts
@@ -2,7 +2,7 @@
 // Licensed under the MIT license.
 
 import { expect, test } from '../baseTest';
-import { APICenter, Timeout, VSCode, TestENV } from '../utils/constants';
+import { APICenter, TestENV, Timeout, VSCode } from '../utils/constants';
 import VscodeOperator from '../utils/vscodeOperator';
 
 test('select Tenant', async ({ workbox }) => {
@@ -13,7 +13,7 @@ test('select Tenant', async ({ workbox }) => {
     // select tenant
     expect(await VscodeOperator.isTreeItemExist(workbox, APICenter.SELECT_TENANT)).toBeTruthy();
     await VscodeOperator.clickTreeItem(workbox, APICenter.SELECT_TENANT);
-    await VscodeOperator.selectOptionByIndex(workbox, 0);
+    await VscodeOperator.selectOptionByName(workbox, TestENV.AZURE_TENANT_NAME!);
     // check subscription
     const isSelectSubsExist = await VscodeOperator.isTreeItemExist(workbox, APICenter.SELECT_SUBS);
     if (isSelectSubsExist) {
diff --git a/src/test/e2e/utils/constants.ts b/src/test/e2e/utils/constants.ts
index 0be790a..d928456 100644
--- a/src/test/e2e/utils/constants.ts
+++ b/src/test/e2e/utils/constants.ts
@@ -5,10 +5,24 @@ import dotenv from "dotenv";
 import fs from "fs";
 dotenv.config();
 
-fs.existsSync(".env.local") && fs.readFileSync(".env.local", "utf-8").split("\n").forEach((line) => {
-    const [key, value] = line.split("=");
-    process.env[key] = value;
-});
+if (fs.existsSync(".env.local")) {
+    const lines = fs.readFileSync(".env.local", "utf-8").split("\n");
+    lines.forEach((line) => {
+        const indexOfEquals = line.indexOf("=");
+        if (indexOfEquals !== -1) {
+            const key = line.slice(0, indexOfEquals).trim();
+            let value = line.slice(indexOfEquals + 1).trim();
+
+            // Remove surrounding quotes if present
+            if ((value.startsWith('"') && value.endsWith('"')) ||
+                (value.startsWith("'") && value.endsWith("'"))) {
+                value = value.slice(1, -1);
+            }
+
+            process.env[key] = value;
+        }
+    });
+}
 
 export class Timeout {
     public static readonly CLICK_WAIT = 1000;