From d672762bc15928b4225659fb05a5921af2c596d2 Mon Sep 17 00:00:00 2001
From: Shane Bryldt <shane@signalwire.com>
Date: Fri, 29 Sep 2023 18:13:17 -0600
Subject: [PATCH] More to share

---
 internal/e2e-js/fixtures.ts                 |  4 +-
 internal/e2e-js/tests/webrtcCalling.spec.ts | 74 ++++++++++++++++++---
 2 files changed, 65 insertions(+), 13 deletions(-)

diff --git a/internal/e2e-js/fixtures.ts b/internal/e2e-js/fixtures.ts
index 43bf9c0fcd..2f3c5f6c89 100644
--- a/internal/e2e-js/fixtures.ts
+++ b/internal/e2e-js/fixtures.ts
@@ -7,7 +7,8 @@ type CustomPage = Page & {
   swNetworkUp: () => Promise<void>
 }
 type CustomFixture = {
-  createCustomPage(options: { name: string }): Promise<CustomPage>
+  createCustomPage(options: { name: string }): Promise<CustomPage>,
+  createCustomVanillaPage(options: { name: string }): Promise<CustomPage>
 }
 
 const test = baseTest.extend<CustomFixture>({
@@ -32,7 +33,6 @@ const test = baseTest.extend<CustomFixture>({
     await use(maker)
 
     console.log('Cleaning up pages..')
-    return
 
     /**
      * If we have a __roomObj in the page means we tested the VideoAPI
diff --git a/internal/e2e-js/tests/webrtcCalling.spec.ts b/internal/e2e-js/tests/webrtcCalling.spec.ts
index 612443dd70..d362b3dd6f 100644
--- a/internal/e2e-js/tests/webrtcCalling.spec.ts
+++ b/internal/e2e-js/tests/webrtcCalling.spec.ts
@@ -1,3 +1,4 @@
+import { waitForVideoReady } from 'packages/js/src/utils/videoElement'
 import { test, expect } from '../fixtures'
 import {
   SERVER_URL,
@@ -5,31 +6,82 @@ import {
 } from '../utils'
 	      
 test.describe('V2Calling', () => {
-  test('should handle calling a pstn number then hangup', async ({
+  test('should handle one webrtc endpoint calling to a second webrtc endpoint waiting to answer', async ({
     createCustomVanillaPage,
   }) => {
     const page = await createCustomVanillaPage({ name: '[page]' })
     await page.goto(SERVER_URL + '/v2vanilla.html')
 
+    //let counter = 1
+    //const takeScreenshot = async (name: string) => {
+    //  await page.screenshot({ path: `${name}_${counter}.png` })
+    //  console.log('\n\n', await page.content(), '\n\n')
+    //  setTimeout(() => {
+    //    counter++
+    //    takeScreenshot(name)
+    //  }, 500)
+    //}
+    //await takeScreenshot('screenshot')    
+
+    // Project locator and env value
+    const project = page.locator('#project')
+    expect(project).not.toBe(null)
+
+    const envRelayProject = process.env.RELAY_PROJECT ?? ''
+    expect(envRelayProject).not.toBe(null)
+
+    // Token locator and generated value
+    const token = page.locator('#token')
+    expect(token).not.toBe(null)
+
     const jwt = await createTestJWTToken({ })
     expect(jwt).not.toBe(null)
 
-    const inpProject = page.locator('#project')
-    const inpToken = page.locator('#token')
+    // Connect button locator
     const btnConnect = page.locator('#btnConnect')
-    expect(inpProject).not.toBe(null)
-    expect(inpToken).not.toBe(null)
     expect(btnConnect).not.toBe(null)
 
-    expect(process.env.RELAY_PROJECT).not.toBe(null)
+    // Connect status locator
+    const connectStatus = page.locator('#connectStatus')
+    expect(connectStatus).not.toBe(null)
+
+    console.log(await connectStatus.innerText())
+
+    // To Number locator and env value
+    const number = page.locator('#number')
+    expect(number).not.toBe(null)
 
-    await inpProject.fill(process.env.RELAY_PROJECT)
-    await inpToken.fill(jwt)
+    const envVoiceDialToNumber = process.env.VOICE_DIAL_TO_NUMBER ?? ''
+    expect(envVoiceDialToNumber).not.toBe(null)
+
+    // From Number locator and env value
+    const numberFrom = page.locator('#numberFrom')
+    expect(numberFrom).not.toBe(null)
+
+    const envVoiceDialFromNumber = process.env.VOICE_DIAL_FROM_NUMBER ?? ''
+    expect(envVoiceDialFromNumber).not.toBe(null)
+
+    // Populate project and token using locators
+    await project.fill(envRelayProject)
+    await token.fill(jwt)
 
     //await page.screenshot({ path: `screenshot_1.png` })
-    await page.evaluate(() => {
-      client = window.__client
-      
+
+    // Click the connect button, which calls the connect function in the browser
+    await page.click('#btnConnect')
+    expect(await connectStatus.innerText()).toBe('Connecting...')
+
+    // How do I wait for connectStatus to contain "Connected" here?
+    //expect(await connectStatus.innerText()).toBe('Connected')
+
+    // Evaluate in the browser to gain access to the client, this can only happen after connect is called on the browser so the client exists
+    await page.evaluate(async () => {
+      const client = window.__client
+      // Hook up client events? Won't we potentially miss some events if client.connect() has already been called in connect() from clicking the button?
+      //await client.on('signalwire.ready', () => { console.log('Ready!') })
+      // Can events hooked up here be to node functions outside of this page.evaluate callback function?
     })
+    
+    // How to make node side wait for browser side elements to change like when signalwire.ready is called?
   })
 })