Manage model for each test individually to facilitate adding new tests

TNG · Nov 24, 2021 · d8ed9c0 · d8ed9c0
1 parent 0f8d78e
commit d8ed9c0
Showing 1 changed file with 58 additions and 28 deletions.
diff --git a/src/client/components/threatbar/threatbar.test.js b/src/client/components/threatbar/threatbar.test.js
@@ -26,48 +26,78 @@ describe('<Threatbar>', () => {
     },
   };
 
-  const model = {
-    detail: {
-      diagrams: {
-        diagram1: {
-          diagramJson: {
-            cells: [
-              {
-                id: 'component1',
-                type: 'type',
-                attrs: {
-                  text: {
-                    text: 'text'
-                  }
-                },
-                threats: [
-                  {
-                    title: 'Existing Threat 1'
+  it('shows identified threats in reverse order', () => {
+    const model = {
+      detail: {
+        diagrams: {
+          diagram1: {
+            diagramJson: {
+              cells: [
+                {
+                  id: 'component1',
+                  type: 'type',
+                  attrs: {
+                    text: {
+                      text: 'text'
+                    }
                   },
-                  {
-                    title: 'Existing Threat 2'
-                  }
-                ]
-              }
-            ]
+                  threats: [
+                    {
+                      title: 'Existing Threat 1'
+                    },
+                    {
+                      title: 'Existing Threat 2'
+                    }
+                  ]
+                }
+              ]
+            }
           }
         }
       }
-    }
-  };
+    };
 
-  beforeEach(() => {
     render(<Threatbar G={G} ctx={{}} moves={{}} active names={[]} model={model}/>);
-  });
 
-  it('shows identified threats in reverse order', () => {
     const threats = screen.getAllByText(/^Identified Threat \d+$/);
     expect(threats).toHaveLength(2);
     expect(threats[0]).toHaveTextContent('Identified Threat 2');
     expect(threats[1]).toHaveTextContent('Identified Threat 1');
   });
 
   it('shows existing threats in reverse order', () => {
+    const model = {
+      detail: {
+        diagrams: {
+          diagram1: {
+            diagramJson: {
+              cells: [
+                {
+                  id: 'component1',
+                  type: 'type',
+                  attrs: {
+                    text: {
+                      text: 'text'
+                    }
+                  },
+                  threats: [
+                    {
+                      title: 'Existing Threat 1'
+                    },
+                    {
+                      title: 'Existing Threat 2'
+                    }
+                  ]
+                }
+              ]
+            }
+          }
+        }
+      }
+    };
+
+    render(<Threatbar G={G} ctx={{}} moves={{}} active names={[]} model={model}/>);
+
     const threats = screen.getAllByText(/^Existing Threat \d+$/);
     expect(threats).toHaveLength(2);
     expect(threats[0]).toHaveTextContent('Existing Threat 2');