update state in tests

Author: daveajrussell

src/browser/modules/Stream/CypherFrame/ErrorsView/ErrorsView.test.tsx

@@ -24,8 +24,8 @@ import { createBus } from 'suber'
 import { ErrorsView, ErrorsViewProps } from './ErrorsView'
 import { BrowserError } from 'services/exceptions'
 import { Provider } from 'react-redux'
-import { initialState as initialConnectionsState } from 'shared/modules/connections/connectionsDuck'
-import { initialState as initialExperimentalFeatureState } from 'shared/modules/experimentalFeatures/experimentalFeaturesDuck'
+import { initialState as initialMetaState } from 'shared/modules/dbMeta/dbMetaDuck'
+import { initialState as initialSettingsState } from 'shared/modules/settings/settingsDuck'
 
 const withProvider = (store: any, children: any) => {
   return <Provider store={store}>{children}</Provider>
@@ -48,8 +48,8 @@ const mount = (props: Partial<ErrorsViewProps>, state?: any) => {
   }
 
   const initialState = {
-    connections: initialConnectionsState,
-    experimentalFeatures: initialExperimentalFeatureState
+    meta: initialMetaState,
+    settings: initialSettingsState
   }
 
   const combinedState = { ...initialState, ...state }
@@ -114,18 +114,13 @@ describe('ErrorsView', () => {
     }
 
     const state = {
-      connections: {
-        activeConnection: 'test',
-        connectionsById: {
-          test: {
-            protocolVersion: 5.7
-          }
+      meta: {
+        server: {
+          version: '5.26.0'
         }
       },
-      experimentalFeatures: {
-        enableGqlErrors: {
-          on: true
-        }
+      settings: {
+        enableGqlErrorsAndNotifications: true
       }
     }
 
@@ -162,18 +157,13 @@ describe('ErrorsView', () => {
     }
 
     const state = {
-      connections: {
-        activeConnection: 'test',
-        connectionsById: {
-          test: {
-            protocolVersion: 5.7
-          }
+      meta: {
+        server: {
+          version: '5.26.0'
         }
       },
-      experimentalFeatures: {
-        enableGqlErrors: {
-          on: true
-        }
+      settings: {
+        enableGqlErrorsAndNotifications: true
       }
     }
 

src/browser/modules/Stream/CypherFrame/WarningsView.test.tsx

@@ -23,8 +23,8 @@ import React from 'react'
 import { WarningsView, WarningsViewProps } from './WarningsView'
 import { Provider } from 'react-redux'
 
-import { initialState as initialConnectionsState } from 'shared/modules/connections/connectionsDuck'
-import { initialState as initialExperimentalFeatureState } from 'shared/modules/experimentalFeatures/experimentalFeaturesDuck'
+import { initialState as initialMetaState } from 'shared/modules/dbMeta/dbMetaDuck'
+import { initialState as initialSettingsState } from 'shared/modules/settings/settingsDuck'
 import { createBus } from 'suber'
 import { DeepPartial } from 'shared/utils/deepPartial'
 import { notificationFilterMinimumSeverityLevel } from 'neo4j-driver-core'
@@ -46,13 +46,9 @@ const mount = (props: DeepPartial<WarningsViewProps>, state?: any) => {
   }
 
   const initialState = {
-    settings: {
-      maxRows: 1000,
-      maxFieldItems: 1000
-    },
     app: {},
-    connections: initialConnectionsState,
-    experimentalFeatures: initialExperimentalFeatureState
+    meta: initialMetaState,
+    settings: initialSettingsState
   }
 
   const combinedState = { ...initialState, ...state }
@@ -82,7 +78,7 @@ describe('WarningsView', () => {
     expect(container).toMatchSnapshot()
   })
 
-  test('does displays a warning', () => {
+  test('does display a warning', () => {
     // Given
     const props = {
       result: {
@@ -141,13 +137,13 @@ describe('WarningsView', () => {
     }
 
     const state = {
-      connections: {
-        activeConnection: 'test',
-        connectionsById: {
-          test: {
-            protocolVersion: 5.6
-          }
+      meta: {
+        server: {
+          version: '5.23.0'
         }
+      },
+      settings: {
+        enableGqlErrorsAndNotifications: true
       }
     }
 
@@ -237,13 +233,13 @@ describe('WarningsView', () => {
     }
 
     const state = {
-      connections: {
-        activeConnection: 'test',
-        connectionsById: {
-          test: {
-            protocolVersion: 5.6
-          }
+      meta: {
+        server: {
+          version: '5.23.0'
         }
+      },
+      settings: {
+        enableGqlErrorsAndNotifications: true
       }
     }
 

src/browser/modules/Stream/CypherFrame/__snapshots__/WarningsView.test.tsx.snap

@@ -2,6 +2,67 @@
 
 exports[`WarningsView displays nothing if no notifications 1`] = `<div />`;
 
+exports[`WarningsView does display a warning 1`] = `
+<div>
+  <div
+    class="sc-hGPBjI kgdIGh"
+  >
+    <div
+      class="sc-dlVxhl fwhZkz"
+    >
+      <div
+        class="sc-kfPuZi lgMZCo"
+      >
+        <div
+          class="sc-cxpSdN sc-llYSUQ cnlYxc eNTkBC"
+        >
+          WARNING
+        </div>
+        <h4
+          class="sc-kLwhqv"
+        >
+          My xx1 warning
+        </h4>
+      </div>
+      <div
+        class="sc-fKVqWL"
+      >
+        <div
+          class="sc-kfPuZi lgMZCo"
+        >
+          This is xx2 warning
+        </div>
+        <div
+          class="sc-fKVqWL"
+        >
+          <pre
+            class="sc-hiCibw jvxLJD"
+          >
+            EXPLAIN MATCH xx3
+            <br
+              class="sc-jJoQJp"
+            />
+                   
+            ^
+          </pre>
+        </div>
+      </div>
+      <div
+        class="sc-fKVqWL"
+        style="margin-top: 10px;"
+      >
+        Status code: 
+        <code
+          class="sc-ZOtfp koHcGf"
+        >
+          xx3.Warning
+        </code>
+      </div>
+    </div>
+  </div>
+</div>
+`;
+
 exports[`WarningsView does display a warning for GQL status codes 1`] = `
 <div>
   <div

src/shared/modules/experimentalFeatures/experimentalFeaturesDuck.ts

@@ -9,7 +9,6 @@ export const showFeature = (state: any, name: any) =>
   !!(state[NAME][name] || {}).on
 
 export const experimentalFeatureSelfName = 'showSelf'
-export const enableGqlErrors = 'enableGqlErrors'
 
 export const initialState = {
   [experimentalFeatureSelfName]: {