read from test or cli (#106)

* read from test or cli * check null * fix Co-authored-by: Changlong Liu <[email protected]>
Azure · Dec 17, 2020 · 5c1906e · 5c1906e
1 parent bd92ffb
commit 5c1906e
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/src/index.ts b/src/index.ts
@@ -23,9 +23,10 @@ extension.Add("cli-test", async host => {
     dumper.dumpCodeModel("test-pre", session.model);
 
     // add test scenario from common settings
-    const cliCommonSettings = await host.GetValue("test") || await host.GetValue("cli");
-    if (cliCommonSettings) {
-        session.model["test-scenario"] = cliCommonSettings['test-scenario'] || cliCommonSettings['test-setup'];
+    const testCommonSettings = await host.GetValue("test");
+    const cliCommonSettings = await host.GetValue("cli");
+    if (testCommonSettings || cliCommonSettings) {
+        session.model["test-scenario"] = testCommonSettings?.['test-scenario'] || testCommonSettings?.['test-setup'] || cliCommonSettings?.['test-scenario'] || cliCommonSettings?.['test-setup'];
     }
 
     dumper.dumpCodeModel("test-post", session.model);