Merge branch '10.0-release' into elevatebart/fix/nav-bar

cypress-io · Dec 8, 2021 · 3afc118 · 3afc118
2 parents 9ec2c69 + e6cbee4
commit 3afc118
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 51 deletions.
diff --git a/packages/app/src/settings/device/TestingPreferences.vue b/packages/app/src/settings/device/TestingPreferences.vue
@@ -9,22 +9,18 @@
     <div
       class="rounded border border-gray-100 px-16px divide-y divide-gray-200"
     >
-      <div
-        v-for="pref in prefs"
-        :key="pref.id"
-        class="py-16px"
-      >
+      <div class="py-16px">
         <h4 class="text-gray-800 text-size-16px leading-24px flex items-center">
-          {{ pref.title }}
+          {{ autoScrollingPreference.title }}
           <Switch
             class="mx-8px"
-            :value="props.gql.localSettings.preferences[pref.id] ?? false"
-            :name="pref.title"
-            @update="(value) => updatePref(pref.id, value)"
+            :value="props.gql.localSettings.preferences[autoScrollingPreference.id] ?? false"
+            :name="autoScrollingPreference.title"
+            @update="(value) => updatePref(value)"
           />
         </h4>
         <p class="text-size-14px leading-24px text-gray-600">
-          {{ pref.description }}
+          {{ autoScrollingPreference.description }}
         </p>
       </div>
     </div>
@@ -48,8 +44,6 @@ fragment TestingPreferences on Query {
   localSettings {
     preferences {
       autoScrollingEnabled
-      useDarkSidebar
-      watchForSpecChange
     }
   }
 }
@@ -62,27 +56,15 @@ mutation SetTestingPreferences($value: String!) {
 
 const setPreferences = useMutation(SetTestingPreferencesDocument)
 
-const prefs = [
-  {
-    id: 'autoScrollingEnabled',
-    title: t('settingsPage.testingPreferences.autoScrollingEnabled.title'),
-    description: t('settingsPage.testingPreferences.autoScrollingEnabled.description'),
-  },
-  {
-    id: 'useDarkSidebar',
-    title: t('settingsPage.testingPreferences.useDarkSidebar.title'),
-    description: t('settingsPage.testingPreferences.useDarkSidebar.description'),
-  },
-  {
-    id: 'watchForSpecChange',
-    title: t('settingsPage.testingPreferences.watchForSpecChange.title'),
-    description: t('settingsPage.testingPreferences.watchForSpecChange.description'),
-  },
-] as const
+const autoScrollingPreference = {
+  id: 'autoScrollingEnabled',
+  title: t('settingsPage.testingPreferences.autoScrollingEnabled.title'),
+  description: t('settingsPage.testingPreferences.autoScrollingEnabled.description'),
+} as const
 
-function updatePref (preferenceId: typeof prefs[number]['id'], value: boolean) {
+function updatePref (value: boolean) {
   setPreferences.executeMutation({
-    value: JSON.stringify({ [preferenceId]: value }),
+    value: JSON.stringify({ [autoScrollingPreference.id]: value }),
   })
 }
 

diff --git a/packages/frontend-shared/cypress/support/mock-graphql/clientTestContext.ts b/packages/frontend-shared/cypress/support/mock-graphql/clientTestContext.ts
@@ -96,8 +96,6 @@ export function makeClientTestContext (): ClientTestContext {
       preferences: {
         __typename: 'LocalSettingsPreferences',
         autoScrollingEnabled: true,
-        useDarkSidebar: true,
-        watchForSpecChange: true,
       },
       availableEditors: [
         {

diff --git a/packages/frontend-shared/src/locales/en-US.json b/packages/frontend-shared/src/locales/en-US.json
@@ -358,14 +358,6 @@
       "autoScrollingEnabled": {
         "title": "Auto Scrolling Enabled",
         "description": "Scroll behavior when running tests."
-      },
-      "watchForSpecChange": {
-        "title": "Watch for Spec Change",
-        "description": "Re-run specs when a file changes."
-      },
-      "useDarkSidebar": {
-        "title": "Dark sidebar",
-        "description": "Select the color theme of the app sidebar."
       }
     },
     "footer": {

diff --git a/packages/graphql/schemas/schema.graphql b/packages/graphql/schemas/schema.graphql
@@ -512,8 +512,6 @@ type LocalSettingsPreferences {
   preferredEditorBinary: String
   proxyBypass: String
   proxyServer: String
-  useDarkSidebar: Boolean
-  watchForSpecChange: Boolean
 }
 
 type Mutation {

diff --git a/packages/graphql/src/schemaTypes/objectTypes/gql-LocalSettings.ts b/packages/graphql/src/schemaTypes/objectTypes/gql-LocalSettings.ts
@@ -6,8 +6,6 @@ export const LocalSettingsPreferences = objectType({
   description: 'local setting preferences',
   definition (t) {
     t.boolean('autoScrollingEnabled')
-    t.boolean('watchForSpecChange')
-    t.boolean('useDarkSidebar')
     t.string('preferredEditorBinary')
     t.boolean('isSpecsListOpen')
     t.string('proxyServer', {

diff --git a/packages/types/src/preferences.ts b/packages/types/src/preferences.ts
@@ -1,8 +1,6 @@
 import type { Editor } from '.'
 
 export const defaultPreferences: AllowedState = {
-  watchForSpecChange: true,
-  useDarkSidebar: true,
   autoScrollingEnabled: true,
   isSpecsListOpen: true,
 }
@@ -32,8 +30,6 @@ export const allowedKeys: Readonly<Array<keyof AllowedState>> = [
   'firstOpened',
   'lastOpened',
   'promptsShown',
-  'watchForSpecChange',
-  'useDarkSidebar',
   'preferredEditorBinary',
 ] as const
 
@@ -64,7 +60,5 @@ export type AllowedState = Partial<{
   firstOpened: Maybe<number>
   lastOpened: Maybe<number>
   promptsShown: Maybe<object>
-  watchForSpecChange: Maybe<boolean>
-  useDarkSidebar: Maybe<boolean>
   preferredEditorBinary: Maybe<string>
 }>