From e0a189b84e24f73ade2cb4c937a1104778b05607 Mon Sep 17 00:00:00 2001 From: Ivan Hernandez Date: Tue, 21 Jan 2025 21:15:45 +0000 Subject: [PATCH 1/4] fix: (appengine) update region tag in appengine/websockets/app.js --- appengine/websockets/app.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/appengine/websockets/app.js b/appengine/websockets/app.js index 270aa9d260..378a1ac2e6 100644 --- a/appengine/websockets/app.js +++ b/appengine/websockets/app.js @@ -14,6 +14,7 @@ 'use strict'; +// [START gae_websockets_app] // [START appengine_websockets_app] const app = require('express')(); app.set('view engine', 'pug'); @@ -39,5 +40,6 @@ if (module === require.main) { }); } // [END appengine_websockets_app] +// [END gae_websockets_app] module.exports = server; From 429c94e2be6533696d6e3e5fbf7284cb19210d1e Mon Sep 17 00:00:00 2001 From: Ivan Hernandez Date: Tue, 21 Jan 2025 21:22:23 +0000 Subject: [PATCH 2/4] fix: (appengine) update region tag in appengine/websockets/views/index.pug --- appengine/websockets/views/index.pug | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/appengine/websockets/views/index.pug b/appengine/websockets/views/index.pug index 142ecb72b8..6f60fd4575 100644 --- a/appengine/websockets/views/index.pug +++ b/appengine/websockets/views/index.pug @@ -12,6 +12,7 @@ //- See the License for the specific language governing permissions and //- limitations under the License. +//- [START gae_websockets_index] //- [START appengine_websockets_index] doctype html html(lang="en") @@ -27,6 +28,7 @@ html(lang="en") #messages { list-style-type: none; margin: 0; padding: 0; } #messages li { padding: 5px 10px; } #messages li:nth-child(odd) { background: #eee; } + //- [START gae_websockets_form] //- [START appengine_websockets_form] body ul(id="messages") @@ -34,10 +36,12 @@ html(lang="en") input(id="m" autocomplete="off") button Send //- [END appengine_websockets_form] + //- [END gae_websockets_form] script(src="/socket.io/socket.io.js") script(src="https://code.jquery.com/jquery-1.11.1.js") script. + // [START gae_websockets_js] // [START appengine_websockets_js] $(function () { var socket = io(); @@ -54,5 +58,7 @@ html(lang="en") }); }); // [END appengine_websockets_js] + // [END gae_websockets_js] //- [END appengine_websockets_index] +//- [END gae_websockets_index] From c422a62c7c8d89be7fa27a906db37fe7e34817ef Mon Sep 17 00:00:00 2001 From: Ivan Hernandez Date: Thu, 23 Jan 2025 13:50:27 +0000 Subject: [PATCH 3/4] fix: (websockets) correct test name fromappengine_websockets_app to gae_websockets_app --- appengine/websockets/test/index.test.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appengine/websockets/test/index.test.js b/appengine/websockets/test/index.test.js index 0a4c468ba8..a834df57a1 100644 --- a/appengine/websockets/test/index.test.js +++ b/appengine/websockets/test/index.test.js @@ -37,7 +37,7 @@ after(async () => { await app.close(); }); -describe('appengine_websockets_app', () => { +describe('gae_websockets_app', () => { it('should process chat message', async () => { await browserPage.goto('http://localhost:8080'); From a36dc97ada634ace462119af9908d56edae14f62 Mon Sep 17 00:00:00 2001 From: Ivan Hernandez Date: Thu, 23 Jan 2025 13:58:17 +0000 Subject: [PATCH 4/4] added the appengine_websockets_app test --- appengine/websockets/test/index.test.js | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/appengine/websockets/test/index.test.js b/appengine/websockets/test/index.test.js index a834df57a1..b64173bd2a 100644 --- a/appengine/websockets/test/index.test.js +++ b/appengine/websockets/test/index.test.js @@ -37,6 +37,25 @@ after(async () => { await app.close(); }); +describe('appengine_websockets_app', () => { + it('should process chat message', async () => { + await browserPage.goto('http://localhost:8080'); + + await browserPage.evaluate(() => { + document.querySelector('input').value = 'test'; + document.querySelector('button').click(); + }); + + await new Promise(resolve => setTimeout(resolve, 100)); + + const itemText = await browserPage.evaluate( + () => document.querySelector('li').textContent + ); + + assert.strictEqual(itemText, 'test'); + }); +}); + describe('gae_websockets_app', () => { it('should process chat message', async () => { await browserPage.goto('http://localhost:8080');