From 4e56d2c26d4d26710d60dce251e1cda8587f2ebc Mon Sep 17 00:00:00 2001
From: Gregory Schier <gschier1990@gmail.com>
Date: Thu, 9 Jul 2020 14:59:22 -0700
Subject: [PATCH] Release for 2020.3 (#2356)

* Bump verions

* Remove enableUnitTestingBeta setting (#2358)

* Bump versions
---
 packages/insomnia-app/app/models/settings.js       |  2 --
 .../app/ui/components/activity-toggle.js           | 14 ++------------
 .../app/ui/components/settings/general.js          | 14 --------------
 .../app/ui/components/wrapper-debug.js             |  3 +--
 .../app/ui/components/wrapper-design.js            |  1 -
 .../app/ui/components/wrapper-unit-test.js         |  3 +--
 .../app/ui/css/components/unit-tests.less          |  1 -
 packages/insomnia-app/config/config.core.json      |  2 +-
 packages/insomnia-app/config/config.designer.json  |  2 +-
 9 files changed, 6 insertions(+), 36 deletions(-)

diff --git a/packages/insomnia-app/app/models/settings.js b/packages/insomnia-app/app/models/settings.js
index 3d5e51ff70..52380488a2 100644
--- a/packages/insomnia-app/app/models/settings.js
+++ b/packages/insomnia-app/app/models/settings.js
@@ -57,7 +57,6 @@ type BaseSettings = {
 
   // Feature flags
   enableSyncBeta: boolean,
-  enableUnitTestingBeta: boolean,
 };
 
 export type Settings = BaseModel & BaseSettings;
@@ -113,7 +112,6 @@ export function init(): BaseSettings {
 
     // Feature flags
     enableSyncBeta: false,
-    enableUnitTestingBeta: false,
   };
 }
 
diff --git a/packages/insomnia-app/app/ui/components/activity-toggle.js b/packages/insomnia-app/app/ui/components/activity-toggle.js
index bf58ec7647..e57a4e7285 100644
--- a/packages/insomnia-app/app/ui/components/activity-toggle.js
+++ b/packages/insomnia-app/app/ui/components/activity-toggle.js
@@ -4,31 +4,21 @@ import React from 'react';
 import { MultiSwitch } from 'insomnia-components';
 import type { GlobalActivity } from '../../common/constants';
 import { ACTIVITY_DEBUG, ACTIVITY_SPEC, ACTIVITY_UNIT_TEST } from '../../common/constants';
-import type { Settings } from '../../models/settings';
 import type { Workspace } from '../../models/workspace';
 
 type Props = {
   activity: GlobalActivity,
   handleActivityChange: (workspaceId: string, activity: GlobalActivity) => Promise<void>,
-  settings: Settings,
   workspace: Workspace,
 };
 
-export default function ActivityToggle({
-  activity,
-  handleActivityChange,
-  settings,
-  workspace,
-}: Props) {
+export default function ActivityToggle({ activity, handleActivityChange, workspace }: Props) {
   const choices = [
     { label: 'Design', value: ACTIVITY_SPEC },
     { label: 'Debug', value: ACTIVITY_DEBUG },
+    { label: 'Test', value: ACTIVITY_UNIT_TEST },
   ];
 
-  if (settings.enableUnitTestingBeta || activity === ACTIVITY_UNIT_TEST) {
-    choices.push({ label: 'Test', value: ACTIVITY_UNIT_TEST });
-  }
-
   return (
     <MultiSwitch
       defaultValue={activity}
diff --git a/packages/insomnia-app/app/ui/components/settings/general.js b/packages/insomnia-app/app/ui/components/settings/general.js
index 78d4839392..4fd1079bb6 100644
--- a/packages/insomnia-app/app/ui/components/settings/general.js
+++ b/packages/insomnia-app/app/ui/components/settings/general.js
@@ -10,7 +10,6 @@ import {
   EDITOR_KEY_MAP_EMACS,
   EDITOR_KEY_MAP_SUBLIME,
   EDITOR_KEY_MAP_VIM,
-  getAppId,
   HttpVersions,
   isLinux,
   isMac,
@@ -23,7 +22,6 @@ import { setFont } from '../../../plugins/misc';
 import * as session from '../../../account/session';
 import Tooltip from '../tooltip';
 import CheckForUpdatesButton from '../check-for-updates-button';
-import { APP_ID_DESIGNER } from '../../../../config';
 
 // Font family regex to match certain monospace fonts that don't get
 // recognized as monospace
@@ -510,18 +508,6 @@ class General extends React.PureComponent<Props, State> {
             {this.renderBooleanSetting('Enable version control beta', 'enableSyncBeta', '', true)}
           </React.Fragment>
         )}
-
-        {getAppId() === APP_ID_DESIGNER && (
-          <>
-            <hr />
-            {this.renderBooleanSetting(
-              'Enable unit testing beta',
-              'enableUnitTestingBeta',
-              '',
-              false,
-            )}
-          </>
-        )}
       </div>
     );
   }
diff --git a/packages/insomnia-app/app/ui/components/wrapper-debug.js b/packages/insomnia-app/app/ui/components/wrapper-debug.js
index 029cf1d07a..248c3a56b4 100644
--- a/packages/insomnia-app/app/ui/components/wrapper-debug.js
+++ b/packages/insomnia-app/app/ui/components/wrapper-debug.js
@@ -56,7 +56,7 @@ class WrapperDebug extends React.PureComponent<Props> {
     const {
       gitSyncDropdown,
       handleActivityChange,
-      wrapperProps: { activeApiSpec, activeWorkspace, settings, activity },
+      wrapperProps: { activeApiSpec, activeWorkspace, activity },
     } = this.props;
 
     return (
@@ -76,7 +76,6 @@ class WrapperDebug extends React.PureComponent<Props> {
           <ActivityToggle
             activity={activity}
             handleActivityChange={handleActivityChange}
-            settings={settings}
             workspace={activeWorkspace}
           />
         }
diff --git a/packages/insomnia-app/app/ui/components/wrapper-design.js b/packages/insomnia-app/app/ui/components/wrapper-design.js
index cf376458e7..582e779f70 100644
--- a/packages/insomnia-app/app/ui/components/wrapper-design.js
+++ b/packages/insomnia-app/app/ui/components/wrapper-design.js
@@ -191,7 +191,6 @@ class WrapperDesign extends React.PureComponent<Props, State> {
               <ActivityToggle
                 activity={activity}
                 handleActivityChange={handleActivityChange}
-                settings={settings}
                 workspace={activeWorkspace}
               />
             }
diff --git a/packages/insomnia-app/app/ui/components/wrapper-unit-test.js b/packages/insomnia-app/app/ui/components/wrapper-unit-test.js
index 74842f013b..c13555741c 100644
--- a/packages/insomnia-app/app/ui/components/wrapper-unit-test.js
+++ b/packages/insomnia-app/app/ui/components/wrapper-unit-test.js
@@ -501,7 +501,7 @@ class WrapperUnitTest extends React.PureComponent<Props, State> {
 
   render() {
     const { handleActivityChange, gitSyncDropdown } = this.props;
-    const { activeWorkspace, activity, settings, activeApiSpec } = this.props.wrapperProps;
+    const { activeWorkspace, activity, activeApiSpec } = this.props.wrapperProps;
     return (
       <PageLayout
         wrapperProps={this.props.wrapperProps}
@@ -524,7 +524,6 @@ class WrapperUnitTest extends React.PureComponent<Props, State> {
               <ActivityToggle
                 activity={activity}
                 handleActivityChange={handleActivityChange}
-                settings={settings}
                 workspace={activeWorkspace}
               />
             }
diff --git a/packages/insomnia-app/app/ui/css/components/unit-tests.less b/packages/insomnia-app/app/ui/css/components/unit-tests.less
index ec02b36d36..3a1c3b00a8 100644
--- a/packages/insomnia-app/app/ui/css/components/unit-tests.less
+++ b/packages/insomnia-app/app/ui/css/components/unit-tests.less
@@ -64,7 +64,6 @@
   }
 
   &__results {
-    padding-left: var(--padding-md);
     border-left: 1px solid var(--hl-md);
     grid-area: body-right;
     background: var(--color-bg);
diff --git a/packages/insomnia-app/config/config.core.json b/packages/insomnia-app/config/config.core.json
index 0f3c181f26..fdadc36ff6 100644
--- a/packages/insomnia-app/config/config.core.json
+++ b/packages/insomnia-app/config/config.core.json
@@ -1,5 +1,5 @@
 {
-  "version": "2020.2.2",
+  "version": "2020.3.0",
   "name": "insomnia",
   "executableName": "insomnia",
   "appId": "com.insomnia.app",
diff --git a/packages/insomnia-app/config/config.designer.json b/packages/insomnia-app/config/config.designer.json
index 7944694afb..24175857b1 100644
--- a/packages/insomnia-app/config/config.designer.json
+++ b/packages/insomnia-app/config/config.designer.json
@@ -1,5 +1,5 @@
 {
-  "version": "2020.3.0-alpha.4",
+  "version": "2020.3.0",
   "name": "insomnia-designer",
   "executableName": "insomnia-designer",
   "appId": "com.insomnia.designer",