Fix web-impl tests

Author: Roaders

toolbox/fdc3-for-web/fdc3-web-impl/test/features/heartbeat.feature

@@ -10,17 +10,15 @@ Feature: Heartbeat Messages Between Apps and Server
   Scenario: App Responds to heartbeats
     When "libraryApp/a1" is opened with connection id "a1"
     And "a1" sends validate
-    And we wait for a period of "500" ms
+    And we wait for a period of "400" ms
     And "libraryApp/a1" sends a heartbeat response to eventUuid "a1_1"
-    And we wait for a period of "500" ms
+    And we wait for a period of "400" ms
     And "libraryApp/a1" sends a heartbeat response to eventUuid "a1_2"
-    And we wait for a period of "500" ms
+    And we wait for a period of "400" ms
     And "libraryApp/a1" sends a heartbeat response to eventUuid "a1_3"
-    And we wait for a period of "500" ms
+    And we wait for a period of "400" ms
     And "libraryApp/a1" sends a heartbeat response to eventUuid "a1_4"
-    And we wait for a period of "500" ms
-    And "libraryApp/a1" sends a heartbeat response to eventUuid "a1_5"
-    And we wait for a period of "500" ms
+    And we wait for a period of "400" ms
     Then I test the liveness of "libraryApp/a1"
     Then "{result}" is true
     And messaging will have outgoing posts
@@ -38,11 +36,11 @@ Feature: Heartbeat Messages Between Apps and Server
       | a1         | Connected |
 
   Scenario: App Doesn't Respond to heartbeats
-  Apps are considered dead if they don't respond to a heartbeat request within 2 seconds
+  Apps are considered dead if they don't respond to a heartbeat request within the timeout period
 
     When "libraryApp/a1" is opened with connection id "a1"
     And "a1" sends validate
-    And we wait for a period of "3000" ms
+    And we wait for a period of "3500" ms
     Then I test the liveness of "libraryApp/a1"
     Then "{result}" is false
     And messaging will have outgoing posts
@@ -51,6 +49,12 @@ Feature: Heartbeat Messages Between Apps and Server
       | heartbeatEvent   | a1            | libraryApp |
       | heartbeatEvent   | a1            | libraryApp |
       | heartbeatEvent   | a1            | libraryApp |
+      | heartbeatEvent   | a1            | libraryApp |
+      | heartbeatEvent   | a1            | libraryApp |
+      | heartbeatEvent   | a1            | libraryApp |
+      | heartbeatEvent   | a1            | libraryApp |
+      | heartbeatEvent   | a1            | libraryApp |
+      | heartbeatEvent   | a1            | libraryApp |
     And I shutdown the server
     And I get the heartbeat times
     Then "{result}" is empty

toolbox/fdc3-for-web/fdc3-web-impl/test/step-definitions/generic.steps.ts

@@ -122,7 +122,7 @@ Given('A newly instantiated FDC3 Server with heartbeat checking', function (this
   const d = new BasicDirectory(apps);
 
   this.sc = new TestServerContext(this);
-  this.server = new DefaultFDC3Server(this.sc, d, defaultChannels(), true, 2000, 2000);
+  this.server = new DefaultFDC3Server(this.sc, d, defaultChannels(), true, 2000, 1000);
 });
 
 When('I shutdown the server', function (this: CustomWorld) {

toolbox/fdc3-for-web/fdc3-web-impl/test/world/index.ts

@@ -1,4 +1,4 @@
-import { World, setWorldConstructor } from '@cucumber/cucumber';
+import { World, setWorldConstructor, After } from '@cucumber/cucumber';
 import { TestServerContext } from '../support/TestServerContext';
 import { DefaultFDC3Server } from '../../src/BasicFDC3Server';
 import { BasicDirectory } from '../../src/directory/BasicDirectory';
@@ -10,3 +10,7 @@ export class CustomWorld extends World {
 }
 
 setWorldConstructor(CustomWorld);
+
+After(function (this: CustomWorld) {
+  this.server.shutdown();
+});