From 32660c5251da8ad4939cd76344ddc9d97c90d24c Mon Sep 17 00:00:00 2001
From: liyasthomas <liyascthomas@gmail.com>
Date: Thu, 12 Aug 2021 18:41:55 +0530
Subject: [PATCH] refactor: move test results to request response section

---
 components/app/Footer.vue                  |   2 -
 components/http/TestResult.vue             | 174 +++++++++++++++------
 components/http/Tests.vue                  | 171 +++++---------------
 components/lenses/ResponseBodyRenderer.vue |   3 +
 lang/en-US.json                            |   2 +-
 5 files changed, 171 insertions(+), 181 deletions(-)

diff --git a/components/app/Footer.vue b/components/app/Footer.vue
index 1d373134a..399a274da 100644
--- a/components/app/Footer.vue
+++ b/components/app/Footer.vue
@@ -35,7 +35,6 @@
                 v-tippy="{ theme: 'tooltip' }"
                 icon="help_center"
                 :title="$t('app.help')"
-                :shortcut="['?']"
               />
             </template>
             <div class="flex flex-col">
@@ -89,7 +88,6 @@
           v-tippy="{ theme: 'tooltip' }"
           icon="keyboard"
           :title="$t('shortcuts')"
-          :shortcut="['?']"
           @click.native="showShortcuts = true"
         />
         <ButtonSecondary
diff --git a/components/http/TestResult.vue b/components/http/TestResult.vue
index 8e8fbb2d7..23de2b5e9 100644
--- a/components/http/TestResult.vue
+++ b/components/http/TestResult.vue
@@ -1,62 +1,146 @@
 <template>
-  <div class="divide-y divide-dividerLight">
-    <div v-if="results.tests">
-      <HttpTestResult
-        v-for="(result, index) in results.tests"
-        :key="`result-${index}`"
-        :results="result"
-      />
-    </div>
-    <span
-      v-if="results.description"
-      class="
-        border-b border-dividerLight
-        flex
-        font-semibold
-        text-secondaryDark
-        py-2
-        px-4
-        items-center
+  <AppSection :label="$t('test.result')">
+    <div
+      v-if="
+        testResults &&
+        (testResults.expectResults.length || testResults.tests.length)
       "
     >
-      {{ results.description }}
-    </span>
-    <div v-if="results.expectResults" class="divide-y divide-dividerLight">
       <div
-        v-for="(result, index) in results.expectResults"
-        :key="`result-${index}`"
-        class="flex py-2 px-4 items-center"
+        class="
+          bg-primary
+          border-b border-dividerLight
+          flex flex-1
+          top-lowerSecondaryStickyFold
+          pl-4
+          z-10
+          sticky
+          items-center
+          justify-between
+        "
       >
-        <i
-          class="mr-4 material-icons"
-          :class="result.status === 'pass' ? 'text-green-500' : 'text-red-500'"
+        <label class="font-semibold"> Test Report </label>
+        <ButtonSecondary
+          v-tippy="{ theme: 'tooltip' }"
+          :title="$t('clear')"
+          icon="clear_all"
+          @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="font-semibold text-red-500">
+            {{ failedTests }} failing,
+          </span>
+          <span v-if="passedTests" class="font-semibold text-green-500">
+            {{ passedTests }} successful,
+          </span>
+          <span class="font-semibold"> out of {{ totalTests }} tests. </span>
+        </div>
+      </div>
+      <div class="divide-y divide-dividerLight">
+        <div v-if="testResults.tests">
+          <HttpTestResult
+            v-for="(result, index) in testResults.tests"
+            :key="`result-${index}`"
+            :results="result"
+          />
+        </div>
+        <span
+          v-if="testResults.description"
+          class="
+            border-b border-dividerLight
+            flex
+            font-semibold
+            text-secondaryDark
+            py-2
+            px-4
+            items-center
+          "
         >
-          {{ result.status === "pass" ? "check" : "close" }}
-        </i>
-        <span v-if="result.message" class="font-semibold text-secondaryDark">
-          {{ result.message }}
-        </span>
-        <span class="text-secondaryLight">
-          {{
-            ` \xA0 — \xA0test ${
-              result.status === "pass" ? $t("passed") : $t("failed")
-            }`
-          }}
+          {{ testResults.description }}
         </span>
+        <div
+          v-if="testResults.expectResults"
+          class="divide-y divide-dividerLight"
+        >
+          <div
+            v-for="(result, index) in testResults.expectResults"
+            :key="`result-${index}`"
+            class="flex py-2 px-4 items-center"
+          >
+            <i
+              class="mr-4 material-icons"
+              :class="
+                result.status === 'pass' ? 'text-green-500' : 'text-red-500'
+              "
+            >
+              {{ result.status === "pass" ? "check" : "close" }}
+            </i>
+            <span
+              v-if="result.message"
+              class="font-semibold text-secondaryDark"
+            >
+              {{ result.message }}
+            </span>
+            <span class="text-secondaryLight">
+              {{
+                ` \xA0 — \xA0test ${
+                  result.status === "pass" ? $t("passed") : $t("failed")
+                }`
+              }}
+            </span>
+          </div>
+        </div>
       </div>
     </div>
-  </div>
+    <div
+      v-else
+      class="flex flex-col text-secondaryLight p-4 items-center justify-center"
+    >
+      <i class="opacity-75 pb-2 material-icons">bug_report</i>
+      <span class="text-center">
+        {{ $t("empty.tests") }}
+      </span>
+    </div>
+  </AppSection>
 </template>
 
 <script lang="ts">
-import { defineComponent, PropType } from "@nuxtjs/composition-api"
-import { HoppTestResult } from "~/helpers/types/HoppTestResult"
+import { defineComponent } from "@nuxtjs/composition-api"
+import { useReadonlyStream } from "~/helpers/utils/composables"
+import { restTestResults$, setRESTTestResults } from "~/newstore/RESTSession"
 
 export default defineComponent({
-  props: {
-    results: {
-      type: Object as PropType<HoppTestResult>,
-      default: null,
+  setup() {
+    return {
+      testResults: useReadonlyStream(restTestResults$, null),
+    }
+  },
+  computed: {
+    totalTests(): number | undefined {
+      return this.testResults?.expectResults.length
+    },
+    failedTests(): number | undefined {
+      return this.testResults?.expectResults.filter(
+        (result: { status: string }) => result.status === "fail"
+      ).length
+    },
+    passedTests(): number | undefined {
+      return this.testResults?.expectResults.filter(
+        (result: { status: string }) => result.status === "pass"
+      ).length
+    },
+  },
+  methods: {
+    clearContent() {
+      setRESTTestResults(null)
     },
   },
 })
diff --git a/components/http/Tests.vue b/components/http/Tests.vue
index 1fd43aa48..6de194277 100644
--- a/components/http/Tests.vue
+++ b/components/http/Tests.vue
@@ -1,148 +1,53 @@
 <template>
-  <SmartTabs styles="sticky top-upperSecondaryStickyFold z-20">
-    <SmartTab id="script" :label="$t('test.script')" :selected="true">
-      <div
-        class="
-          bg-primary
-          border-b border-dividerLight
-          flex flex-1
-          top-upperTertiaryStickyFold
-          pl-4
-          z-10
-          sticky
-          items-center
-          justify-between
-        "
-      >
-        <label class="font-semibold">
-          {{ $t("javascript_code") }}
-        </label>
-        <ButtonSecondary
-          v-tippy="{ theme: 'tooltip' }"
-          to="https://github.com/hoppscotch/hoppscotch/wiki/Post-Request-Tests"
-          blank
-          :title="$t('wiki')"
-          icon="help_outline"
-        />
-      </div>
-      <SmartJsEditor
-        v-model="testScript"
-        :options="{
-          maxLines: Infinity,
-          minLines: 16,
-          fontSize: '12px',
-          autoScrollEditorIntoView: true,
-          showPrintMargin: false,
-          useWorker: false,
-        }"
-        complete-mode="test"
-      />
-    </SmartTab>
-    <SmartTab
-      id="results"
-      :label="$t('test.results')"
-      :info="totalTests ? totalTests.toString() : ''"
+  <AppSection id="script" :label="$t('test.script')">
+    <div
+      class="
+        bg-primary
+        border-b border-dividerLight
+        flex flex-1
+        pl-4
+        top-upperSecondaryStickyFold
+        z-10
+        sticky
+        items-center
+        justify-between
+      "
     >
-      <div
-        v-if="
-          testResults &&
-          (testResults.expectResults.length || testResults.tests.length)
-        "
-      >
-        <div
-          class="
-            bg-primary
-            border-b border-dividerLight
-            flex flex-1
-            top-upperTertiaryStickyFold
-            pl-4
-            z-10
-            sticky
-            items-center
-            justify-between
-          "
-        >
-          <label class="font-semibold"> Test Report </label>
-          <ButtonSecondary
-            v-tippy="{ theme: 'tooltip' }"
-            :title="$t('clear')"
-            icon="clear_all"
-            @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="font-semibold text-red-500">
-              {{ failedTests }} failing,
-            </span>
-            <span v-if="passedTests" class="font-semibold text-green-500">
-              {{ passedTests }} successful,
-            </span>
-            <span class="font-semibold"> out of {{ totalTests }} tests. </span>
-          </div>
-        </div>
-        <HttpTestResult :results="testResults" />
-      </div>
-      <div
-        v-else
-        class="
-          flex flex-col
-          text-secondaryLight
-          p-4
-          items-center
-          justify-center
-        "
-      >
-        <i class="opacity-75 pb-2 material-icons">bug_report</i>
-        <span class="text-center">
-          {{ $t("empty.tests") }}
-        </span>
-      </div>
-    </SmartTab>
-  </SmartTabs>
+      <label class="font-semibold">
+        {{ $t("javascript_code") }}
+      </label>
+      <ButtonSecondary
+        v-tippy="{ theme: 'tooltip' }"
+        to="https://github.com/hoppscotch/hoppscotch/wiki/Post-Request-Tests"
+        blank
+        :title="$t('wiki')"
+        icon="help_outline"
+      />
+    </div>
+    <SmartJsEditor
+      v-model="testScript"
+      :options="{
+        maxLines: Infinity,
+        minLines: 16,
+        fontSize: '12px',
+        autoScrollEditorIntoView: true,
+        showPrintMargin: false,
+        useWorker: false,
+      }"
+      complete-mode="test"
+    />
+  </AppSection>
 </template>
 
 <script lang="ts">
 import { defineComponent } from "@nuxtjs/composition-api"
-import {
-  useTestScript,
-  restTestResults$,
-  setRESTTestResults,
-} from "~/newstore/RESTSession"
-import { useReadonlyStream } from "~/helpers/utils/composables"
+import { useTestScript } from "~/newstore/RESTSession"
 
 export default defineComponent({
   setup() {
     return {
       testScript: useTestScript(),
-      testResults: useReadonlyStream(restTestResults$, null),
     }
   },
-  computed: {
-    totalTests(): number | undefined {
-      return this.testResults?.expectResults.length
-    },
-    failedTests(): number | undefined {
-      return this.testResults?.expectResults.filter(
-        (result: { status: string }) => result.status === "fail"
-      ).length
-    },
-    passedTests(): number | undefined {
-      return this.testResults?.expectResults.filter(
-        (result: { status: string }) => result.status === "pass"
-      ).length
-    },
-  },
-  methods: {
-    clearContent() {
-      setRESTTestResults(null)
-    },
-  },
 })
 </script>
diff --git a/components/lenses/ResponseBodyRenderer.vue b/components/lenses/ResponseBodyRenderer.vue
index 974904b99..4f56ccc53 100644
--- a/components/lenses/ResponseBodyRenderer.vue
+++ b/components/lenses/ResponseBodyRenderer.vue
@@ -17,6 +17,9 @@
     >
       <LensesHeadersRenderer :headers="response.headers" />
     </SmartTab>
+    <SmartTab id="results" :label="$t('test.results')">
+      <HttpTestResult />
+    </SmartTab>
   </SmartTabs>
 </template>
 
diff --git a/lang/en-US.json b/lang/en-US.json
index 0ed84fcc7..c69513926 100644
--- a/lang/en-US.json
+++ b/lang/en-US.json
@@ -207,7 +207,7 @@
   },
   "test": {
     "script": "Script",
-    "results": "Results"
+    "results": "Test Results"
   },
   "shortcut": {
     "general": {