From 38b31979123c8311ca9480f5d264853a63376667 Mon Sep 17 00:00:00 2001
From: Farhan Tariq <farhan-tariq@hotmail.com>
Date: Fri, 18 Dec 2020 10:53:29 +0000
Subject: [PATCH 1/2] Fix when folder is having no request property

---
 components/collections/folder.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/collections/folder.vue b/components/collections/folder.vue
index 4b8ba28e2..fcdf57d85 100644
--- a/components/collections/folder.vue
+++ b/components/collections/folder.vue
@@ -87,7 +87,7 @@
           />
         </li>
       </ul>
-      <ul v-if="folder.folders.length === 0 && folder.requests.length === 0">
+      <ul v-if="folder.folders && folder.folders.length === 0 && folder.requests && folder.requests.length === 0">
         <li class="flex ml-8 border-l border-brdColor">
           <p class="info"><i class="material-icons">not_interested</i> {{ $t("folder_empty") }}</p>
         </li>

From a2a03c6b52e0e66a1228a8f5e5765afd1fe5f451 Mon Sep 17 00:00:00 2001
From: Karel De Smet <karel.de.smet@outlook.com>
Date: Sat, 19 Dec 2020 03:15:36 +0100
Subject: [PATCH 2/2] Unit tests for test functions toBe, toHaveProperty
 (#1392)

* Added unit tests for the post-request tests

* Added 2 top level functions to avoid duplication of code

* Simplified tests for toBe and error handling

* Added a test for asserting string values with toBe

* Added a test for negative assertion with toBe

* Added tests for toHaveProperty

* Imported PASS, FAIL and ERROR constants

* Use getTestResult and getErrors to avoid duplication of code

* Removed .vscode/settings.json

* Minor cleanup to postwomanTesting.spec.js

* Revert change of runTestScriptWithVariables back to default export

Co-authored-by: Liyas Thomas <liyascthomas@gmail.com>
Co-authored-by: Andrew Bastin <andrewbastin.k@gmail.com>
---
 helpers/__tests__/postwomanTesting.spec.js | 64 ++++++++++++++++++++++
 helpers/postwomanTesting.js                |  6 +-
 2 files changed, 67 insertions(+), 3 deletions(-)
 create mode 100644 helpers/__tests__/postwomanTesting.spec.js

diff --git a/helpers/__tests__/postwomanTesting.spec.js b/helpers/__tests__/postwomanTesting.spec.js
new file mode 100644
index 000000000..e0824ec41
--- /dev/null
+++ b/helpers/__tests__/postwomanTesting.spec.js
@@ -0,0 +1,64 @@
+import { PASS, FAIL } from "../postwomanTesting"
+import runTestScriptWithVariables from "../postwomanTesting"
+
+function getTestResult(script, index) {
+  return runTestScriptWithVariables(script).testResults[index].result
+}
+
+function getErrors(script) {
+  return runTestScriptWithVariables(script).errors
+}
+
+describe("Error handling", () => {
+  test("throws error at unknown test method", () => {
+    const testScriptWithUnknownMethod = "pw.expect(1).toBeSomeUnknownMethod()"
+    expect(() => {
+      runTestScriptWithVariables(testScriptWithUnknownMethod)
+    }).toThrow()
+  })
+  test("errors array is empty on a successful test", () => {
+    expect(getErrors("pw.expect(1).toBe(1)")).toStrictEqual([])
+  })
+})
+
+describe("toBe", () => {
+  test("test for numbers", () => {
+    expect(getTestResult("pw.expect(1).toBe(2)", 0)).toEqual(FAIL)
+
+    expect(getTestResult("pw.expect(1).toBe(1)", 0)).toEqual(PASS)
+  })
+
+  test("test for strings", () => {
+    expect(getTestResult("pw.expect('hello').toBe('bonjour')", 0)).toEqual(FAIL)
+    expect(getTestResult("pw.expect('hi').toBe('hi')", 0)).toEqual(PASS)
+  })
+
+  test("test for negative assertion (.not.toBe)", () => {
+    expect(getTestResult("pw.expect(1).not.toBe(1)", 0)).toEqual(FAIL)
+    expect(getTestResult("pw.expect(1).not.toBe(2)", 0)).toEqual(PASS)
+    expect(getTestResult("pw.expect('world').not.toBe('planet')", 0)).toEqual(PASS)
+    expect(getTestResult("pw.expect('world').not.toBe('world')", 0)).toEqual(FAIL)
+  })
+})
+
+describe("toHaveProperty", () => {
+  const dummyResponse = {
+    id: 843,
+    description: "random",
+  }
+
+  test("test for positive assertion (.toHaveProperty)", () => {
+    expect(
+      getTestResult(`pw.expect(${JSON.stringify(dummyResponse)}).toHaveProperty("id")`, 0)
+    ).toEqual(PASS)
+    expect(getTestResult(`pw.expect(${dummyResponse.id}).toBe(843)`, 0)).toEqual(PASS)
+  })
+  test("test for negative assertion (.not.toHaveProperty)", () => {
+    expect(
+      getTestResult(`pw.expect(${JSON.stringify(dummyResponse)}).not.toHaveProperty("type")`, 0)
+    ).toEqual(PASS)
+    expect(
+      getTestResult(`pw.expect(${JSON.stringify(dummyResponse)}).toHaveProperty("type")`, 0)
+    ).toEqual(FAIL)
+  })
+})
diff --git a/helpers/postwomanTesting.js b/helpers/postwomanTesting.js
index b53b19276..30d0bb8d4 100644
--- a/helpers/postwomanTesting.js
+++ b/helpers/postwomanTesting.js
@@ -1,6 +1,6 @@
-const PASS = "PASS"
-const FAIL = "FAIL"
-const ERROR = "ERROR"
+export const PASS = "PASS"
+export const FAIL = "FAIL"
+export const ERROR = "ERROR"
 
 const styles = {
   [PASS]: { icon: "check", class: "success-response" },