Add test for switching lobbies

Author: erikdubbelboer

features/basic.feature

@@ -75,3 +75,18 @@ Feature: Players can create and connect a network of players
     When "yellow" leaves the lobby
     Then "yellow" receives the network event "left"
     Then "blue" receives the network event "disconnected" with the argument "[Peer: h5yzwyizlwao]"
+
+  Scenario: A player changes lobbies
+    Given "blue" is connected as "1u8fw4aph5ypt" and ready for game "4307bd86-e1df-41b8-b9df-e22afcf084bd"
+    And "yellow" is connected as "h5yzwyizlwao" and ready for game "4307bd86-e1df-41b8-b9df-e22afcf084bd"
+    And "green" is connected as "19yrzmetd2bn7" and ready for game "4307bd86-e1df-41b8-b9df-e22afcf084bd"
+
+    Given "blue,yellow" are joined in a lobby
+    And "green" creates a lobby
+    When "yellow" leaves the lobby
+    Then "yellow" receives the network event "left"
+    Then "blue" receives the network event "disconnected" with the argument "[Peer: h5yzwyizlwao]"
+
+    When "yellow" connects to the lobby "prb67ouj837u"
+    And "green" receives the network event "connected" with the argument "[Peer: h5yzwyizlwao]"
+    And "blue" has not seen a new "connected" event

features/reconnect.feature

@@ -22,7 +22,7 @@ Feature: Players can create and connect a network of players
 
     And "blue" boardcasts "Hello, world!" over the reliable channel
     And "yellow" receives the network event "message" with the arguments "[Peer: 1u8fw4aph5ypt]", "reliable" and "Hello, world!"
-    And "yellow" has not seen the "reconnecting" event
+    And "yellow" has not seen any "reconnecting" event
 
 
   Scenario: Connections are reconnected when rtc is disconnected

features/support/steps/network.ts

@@ -324,13 +324,27 @@ Then('{string} should have received only these lobbies:', function (this: World,
   }
 })
 
-When('{string} has not seen the {string} event', function (this: World, playerName: string, eventName: string) {
+// "has not seen any" checks all events ever received.
+When('{string} has not seen any {string} event', function (this: World, playerName: string, eventName: string) {
   const player = this.players.get(playerName)
   if (player == null) {
     throw new Error('no such player')
   }
-  if (player.findEvent(eventName) !== undefined) {
-    throw new Error(`${playerName} has recieved a ${eventName} event`)
+  const event = player.findEvent(eventName)
+  if (event !== undefined) {
+    throw new Error(`${playerName} has recieved a ${eventName} event: ${event.eventPayload[0]}`)
+  }
+})
+
+// "has not seen a new" only checks new events since the last "receives the network event".
+When('{string} has not seen a new {string} event', function (this: World, playerName: string, eventName: string) {
+  const player = this.players.get(playerName)
+  if (player == null) {
+    throw new Error('no such player')
+  }
+  const event = player.findNewEvent(eventName)
+  if (event !== undefined) {
+    throw new Error(`${playerName} has recieved a ${eventName} event: ${event.eventPayload[0]}`)
   }
 })
 

features/support/types.ts

@@ -29,10 +29,18 @@ export class Player {
     network.on('rtcerror', _ => {})
   }
 
+  // findEvent finds the first event matching the eventName and matchArguments.
   findEvent (eventName: string, matchArguments: any[] = []): RecordedEvent | undefined {
     return this.events.find(e => matchEvent(e, eventName, matchArguments))
   }
 
+  // findRecentEvent finds events starting after the last consumed event.
+  findNewEvent (eventName: string, matchArguments: any[] = []): RecordedEvent | undefined {
+    return this.events.slice(this.scanIndex).find(e => matchEvent(e, eventName, matchArguments))
+  }
+
+  // waitForEvent waits for an event to be received, matching the eventName and matchArguments.
+  // If consume is true, the event will be consumed and the scanIndex will be incremented.
   async waitForEvent (eventName: string, matchArguments: any[] = [], consume: boolean = true): Promise<RecordedEvent> {
     if (!allEvents.includes(eventName)) {
       throw new Error(`Event type ${eventName} not tracked, add to allEvents in types.ts`)