From 71619cf84b10e398e3e931f4cc3c5ddf69f47c0a Mon Sep 17 00:00:00 2001
From: liyasthomas <liyascthomas@gmail.com>
Date: Fri, 27 Aug 2021 14:32:07 +0530
Subject: [PATCH] feat: test report pie chart

---
 components/http/TestResult.vue       | 51 ++++++++--------------------
 components/http/TestResultEntry.vue  | 13 +++----
 components/http/TestResultReport.vue | 45 ++++++++++++++++++++++++
 helpers/testSnippets.js              |  5 ++-
 4 files changed, 66 insertions(+), 48 deletions(-)
 create mode 100644 components/http/TestResultReport.vue

diff --git a/components/http/TestResult.vue b/components/http/TestResult.vue
index 63bf76400..83ec777c1 100644
--- a/components/http/TestResult.vue
+++ b/components/http/TestResult.vue
@@ -1,10 +1,15 @@
 <template>
   <AppSection :label="$t('test.results')">
-    <div v-if="testResults && (testResults.expectResults || testResults.tests)">
+    <div
+      v-if="
+        testResults &&
+        (testResults.expectResults.length || testResults.tests.length)
+      "
+    >
       <div
         class="
           bg-primary
-          border-b border-dividerLight
+          border-dividerLight border-b
           flex flex-1
           top-lowerSecondaryStickyFold
           pl-4
@@ -24,25 +29,8 @@
           @click.native="clearContent()"
         />
       </div>
-      <div class="flex p-2 items-center">
-        <SmartProgressRing
-          class="text-red-500"
-          :radius="16"
-          :stroke="4"
-          :progress="(failedTests / totalTests) * 100"
-        />
-        <div class="ml-2">
-          <span v-if="failedTests" class="text-red-500">
-            {{ failedTests }} failing,
-          </span>
-          <span v-if="passedTests" class="text-green-500">
-            {{ passedTests }} successful,
-          </span>
-          <span> out of {{ totalTests }} tests. </span>
-        </div>
-      </div>
-      <div class="divide-y divide-dividerLight">
-        <div v-if="testResults.tests">
+      <div class="divide-dividerLight border-dividerLight border-b divide-y-4">
+        <div v-if="testResults.tests" class="divide-dividerLight divide-y-4">
           <HttpTestResultEntry
             v-for="(result, index) in testResults.tests"
             :key="`result-${index}`"
@@ -51,8 +39,12 @@
         </div>
         <div
           v-if="testResults.expectResults"
-          class="divide-y divide-dividerLight"
+          class="divide-dividerLight divide-y"
         >
+          <HttpTestResultReport
+            v-if="testResults.expectResults.length"
+            :test-results="testResults"
+          />
           <div
             v-for="(result, index) in testResults.expectResults"
             :key="`result-${index}`"
@@ -103,25 +95,10 @@
 </template>
 
 <script setup lang="ts">
-import { computed } from "@nuxtjs/composition-api"
 import { useReadonlyStream } from "~/helpers/utils/composables"
 import { restTestResults$, setRESTTestResults } from "~/newstore/RESTSession"
 
 const testResults = useReadonlyStream(restTestResults$, null)
 
-const totalTests = computed(() => testResults.value?.expectResults.length)
-const failedTests = computed(
-  () =>
-    testResults.value?.expectResults.filter(
-      (result: { status: string }) => result.status === "fail"
-    ).length
-)
-const passedTests = computed(
-  () =>
-    testResults.value?.expectResults.filter(
-      (result: { status: string }) => result.status === "pass"
-    ).length
-)
-
 const clearContent = () => setRESTTestResults(null)
 </script>
diff --git a/components/http/TestResultEntry.vue b/components/http/TestResultEntry.vue
index 94678966f..ee2900836 100644
--- a/components/http/TestResultEntry.vue
+++ b/components/http/TestResultEntry.vue
@@ -2,18 +2,15 @@
   <div>
     <span
       v-if="testResults.description"
-      class="
-        border-b border-dividerLight
-        flex
-        text-secondaryDark
-        py-2
-        px-4
-        items-center
-      "
+      class="flex font-bold text-secondaryDark py-2 px-4 items-center"
     >
       {{ testResults.description }}
     </span>
     <div v-if="testResults.expectResults" class="divide-y divide-dividerLight">
+      <HttpTestResultReport
+        v-if="testResults.expectResults.length"
+        :test-results="testResults"
+      />
       <div
         v-for="(result, index) in testResults.expectResults"
         :key="`result-${index}`"
diff --git a/components/http/TestResultReport.vue b/components/http/TestResultReport.vue
new file mode 100644
index 000000000..bce7a045e
--- /dev/null
+++ b/components/http/TestResultReport.vue
@@ -0,0 +1,45 @@
+<template>
+  <div class="flex p-2 items-center">
+    <SmartProgressRing
+      class="text-red-500"
+      :radius="16"
+      :stroke="4"
+      :progress="(failedTests / totalTests) * 100"
+    />
+    <div class="ml-2">
+      <span v-if="failedTests" class="text-red-500">
+        {{ failedTests }} failing,
+      </span>
+      <span v-if="passedTests" class="text-green-500">
+        {{ passedTests }} successful,
+      </span>
+      <span> out of {{ totalTests }} tests. </span>
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { computed, PropType } from "@nuxtjs/composition-api"
+import { HoppTestResult } from "~/helpers/types/HoppTestResult"
+
+const props = defineProps({
+  testResults: {
+    type: Object as PropType<HoppTestResult>,
+    required: true,
+  },
+})
+
+const totalTests = computed(() => props.testResults.expectResults.length)
+const failedTests = computed(
+  () =>
+    props.testResults.expectResults.filter(
+      (result: { status: string }) => result.status === "fail"
+    ).length
+)
+const passedTests = computed(
+  () =>
+    props.testResults.expectResults.filter(
+      (result: { status: string }) => result.status === "pass"
+    ).length
+)
+</script>
diff --git a/helpers/testSnippets.js b/helpers/testSnippets.js
index 06d12f814..239f819b7 100644
--- a/helpers/testSnippets.js
+++ b/helpers/testSnippets.js
@@ -9,9 +9,8 @@ pw.test("Status code is 200", ()=> {
   {
     name: "Response: Assert property from body",
     script: `\n\n// Check JSON response property
-pw.test("Status code is 200", ()=> {
-    const body = pw.response.body.json();
-    pw.expect(body.property).toBe("value");
+pw.test("Check JSON response property", ()=> {
+    pw.expect(pw.response.method).toBe("GET");
 });`,
   },
   {