From a2eb26f80b5fe99e7f356f25e92cc680f348988c Mon Sep 17 00:00:00 2001 From: Kaj Magnus Lindberg Date: Mon, 28 Apr 2025 04:10:26 +0200 Subject: [PATCH 1/3] Fix two e2e test, add back a flappy test comment This needed for last build to build. --- .../embcom.sort-order-op-likes-btn-txt.2br.ec.e2e.ts | 1 + .../e2e-wdio7/specs/modn-ban-from-disc-page.2br.f.e2e.ts | 8 +++++--- tests/e2e-wdio7/utils/ty-e2e-test-browser.ts | 1 - 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/tests/e2e-wdio7/specs/embcom.sort-order-op-likes-btn-txt.2br.ec.e2e.ts b/tests/e2e-wdio7/specs/embcom.sort-order-op-likes-btn-txt.2br.ec.e2e.ts index 00f03a708..3b5a46978 100644 --- a/tests/e2e-wdio7/specs/embcom.sort-order-op-likes-btn-txt.2br.ec.e2e.ts +++ b/tests/e2e-wdio7/specs/embcom.sort-order-op-likes-btn-txt.2br.ec.e2e.ts @@ -242,6 +242,7 @@ describe("embcom.sort-order-op-likes-btn-txt.2br.ec TyTEMBSORTLIKETXT", () => { it("Maria adds a comment", async () => { // Wait until Maria's data added, otherwise if clicking Reply before that, // the login dialog pops up and the test breaks. + // E2EBUG flappy & Breaks anyway, just like before. await mariasBrowser.switchToEmbeddedCommentsIrame(); await mariasBrowser.waitForMyDataAdded(); await mariasBrowser.complex.replyToEmbeddingBlogPost("Hi I am here"); diff --git a/tests/e2e-wdio7/specs/modn-ban-from-disc-page.2br.f.e2e.ts b/tests/e2e-wdio7/specs/modn-ban-from-disc-page.2br.f.e2e.ts index dd98de092..eb0cb3543 100644 --- a/tests/e2e-wdio7/specs/modn-ban-from-disc-page.2br.f.e2e.ts +++ b/tests/e2e-wdio7/specs/modn-ban-from-disc-page.2br.f.e2e.ts @@ -302,11 +302,12 @@ describe(`modn-ban-from-disc-page.2br.f TyTEBANFROMDISC`, () => { it(`... it's been deleted`, async () => { await modya_brA.topic.waitUntilPageDeleted(); }); + /* it(`... and Mallory's two comments (same page) also deleted`, async () => { - // Ooops but these won't be loaded ,since deld. + // Ooops but [deleted_comment_not_loaded]. await modya_brA.topic.waitForPostVisibleAsDeleted(c.FirstReplyNr); await modya_brA.topic.waitForPostVisibleAsDeleted(c.SecondReplyNr); - }); + }); */ it(`Modya goes to Mallory's other new topic`, async () => { await modya_brA.go2(mallorysPagesFn().topicTwoUrl); @@ -323,7 +324,8 @@ describe(`modn-ban-from-disc-page.2br.f TyTEBANFROMDISC`, () => { const counts = await modya_brA.topic.countReplies(); assert.deepEq(counts, { numNormal: 0, numDrafts: 0, numPreviews: 0, numUnapproved: 0, - // Deleted comments aren't loaded, unless there's non-deleted replies to them. + // Currently, [deleted_comment_not_loaded], unless there's non-deleted + // replies to them. numDeleted: 0 }); }); diff --git a/tests/e2e-wdio7/utils/ty-e2e-test-browser.ts b/tests/e2e-wdio7/utils/ty-e2e-test-browser.ts index 5b457be2f..823d2e376 100644 --- a/tests/e2e-wdio7/utils/ty-e2e-test-browser.ts +++ b/tests/e2e-wdio7/utils/ty-e2e-test-browser.ts @@ -5873,7 +5873,6 @@ export class TyE2eTestBrowser { if (!isGone) throw `Not yet gone: ${submitSelector}`; }); - await this.waitUntilModalGone(); } }; From f2c0a8e46b1065717a9a6645c72f905007816230 Mon Sep 17 00:00:00 2001 From: Kaj Magnus Lindberg Date: Mon, 28 Apr 2025 04:10:59 +0200 Subject: [PATCH 2/3] Bump version to v0.2025.008. --- relchans/tyse-v0-dev | 2 +- version.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/relchans/tyse-v0-dev b/relchans/tyse-v0-dev index 467348a9d..e09294de9 160000 --- a/relchans/tyse-v0-dev +++ b/relchans/tyse-v0-dev @@ -1 +1 @@ -Subproject commit 467348a9ded613e17ac18fd04fab35ca7962f58a +Subproject commit e09294de9aa955f13ef93e066be44490be899e8c diff --git a/version.txt b/version.txt index e643e6102..2059d2ff4 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -v0.2025.007 +v0.2025.008 From a22ace547a4401b1a2779e3712dbc10b86241a40 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Fri, 4 Jul 2025 12:26:27 +0000 Subject: [PATCH 3/3] Update scalatestplus-play to 6.0.2 --- images/app/sbt | 2 +- images/fakemail/mailslurper | 2 +- images/web/lua-packages/inspect.lua | 2 +- images/web/lua-packages/lua-resty-http | 2 +- images/web/lua-packages/lua-resty-lrucache | 2 +- images/web/lua-packages/lua-resty-redis | 2 +- images/web/modules/lua-nginx-module | 2 +- images/web/modules/luajit | 2 +- images/web/modules/ngx_devel_kit | 2 +- images/web/node_modules | 2 +- project/Dependencies.scala | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/images/app/sbt b/images/app/sbt index aa78f5643..fda6e1c8c 160000 --- a/images/app/sbt +++ b/images/app/sbt @@ -1 +1 @@ -Subproject commit aa78f5643223b22f5cd2f0d66b947bb77908c449 +Subproject commit fda6e1c8c0f0b8ae2d679cd10f1eeb205163caf0 diff --git a/images/fakemail/mailslurper b/images/fakemail/mailslurper index 34ae2b6b7..5d7ca4938 160000 --- a/images/fakemail/mailslurper +++ b/images/fakemail/mailslurper @@ -1 +1 @@ -Subproject commit 34ae2b6b7c1676ac76dcc6bc55d56349551c4113 +Subproject commit 5d7ca4938115e52d04aee29277c3d3a8981db21d diff --git a/images/web/lua-packages/inspect.lua b/images/web/lua-packages/inspect.lua index b611db6bf..783a08892 160000 --- a/images/web/lua-packages/inspect.lua +++ b/images/web/lua-packages/inspect.lua @@ -1 +1 @@ -Subproject commit b611db6bfa9c12ce35dd4972032fbbd2ad5ba965 +Subproject commit 783a0889270952dd70a7f572ea9b38b131e697dc diff --git a/images/web/lua-packages/lua-resty-http b/images/web/lua-packages/lua-resty-http index a6bd2e0eb..183310324 160000 --- a/images/web/lua-packages/lua-resty-http +++ b/images/web/lua-packages/lua-resty-http @@ -1 +1 @@ -Subproject commit a6bd2e0eb1390e330e4fb10a48cced5a1f21fb66 +Subproject commit 183310324026120ab7eaf5dd82b9be90ae63aadf diff --git a/images/web/lua-packages/lua-resty-lrucache b/images/web/lua-packages/lua-resty-lrucache index 4b1c5a12f..3ff6300e6 160000 --- a/images/web/lua-packages/lua-resty-lrucache +++ b/images/web/lua-packages/lua-resty-lrucache @@ -1 +1 @@ -Subproject commit 4b1c5a12fbdf7c71da3c7ec35949ffd2846895f3 +Subproject commit 3ff6300e68b73ba20e909c7d16bd839aef2e5a4b diff --git a/images/web/lua-packages/lua-resty-redis b/images/web/lua-packages/lua-resty-redis index 403d2982e..77b46a4e5 160000 --- a/images/web/lua-packages/lua-resty-redis +++ b/images/web/lua-packages/lua-resty-redis @@ -1 +1 @@ -Subproject commit 403d2982ec1dacaa758301c788754a82c82b00d8 +Subproject commit 77b46a4e5696217124019b31a5afe1420edcedf2 diff --git a/images/web/modules/lua-nginx-module b/images/web/modules/lua-nginx-module index 28cf5ce3b..83ae875b3 160000 --- a/images/web/modules/lua-nginx-module +++ b/images/web/modules/lua-nginx-module @@ -1 +1 @@ -Subproject commit 28cf5ce3b6ec8e7ab44eadac9cc1c3b6f5c387ba +Subproject commit 83ae875b306cd94bd4759ded06e1a60b08cd2481 diff --git a/images/web/modules/luajit b/images/web/modules/luajit index f0e865dd4..f9140a622 160000 --- a/images/web/modules/luajit +++ b/images/web/modules/luajit @@ -1 +1 @@ -Subproject commit f0e865dd4861520258299d0f2a56491bd9d602e1 +Subproject commit f9140a622a0c44a99efb391cc1c2358bc8098ab7 diff --git a/images/web/modules/ngx_devel_kit b/images/web/modules/ngx_devel_kit index e44326207..bd44d1630 160000 --- a/images/web/modules/ngx_devel_kit +++ b/images/web/modules/ngx_devel_kit @@ -1 +1 @@ -Subproject commit e443262071e759c047492be60ec7e2d73c5b57ec +Subproject commit bd44d16302273052d6005d7bdb55f74e23813de3 diff --git a/images/web/node_modules b/images/web/node_modules index f68468729..fda6e1c8c 160000 --- a/images/web/node_modules +++ b/images/web/node_modules @@ -1 +1 @@ -Subproject commit f68468729cd82d7d187887eec9a96be0f80c7a8c +Subproject commit fda6e1c8c0f0b8ae2d679cd10f1eeb205163caf0 diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 2730d689c..1a9454d1b 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -238,7 +238,7 @@ object Dependencies { // See: https://github.com/playframework/scalatestplus-play/releases // and: https://mvnrepository.com/artifact/org.scalatestplus.play/scalatestplus-play // v6 is for Play 2.9, v7 for Play 3.0. - val scalaTestPlusPlay = "org.scalatestplus.play" %% "scalatestplus-play" % "6.0.1" % Test + val scalaTestPlusPlay = "org.scalatestplus.play" %% "scalatestplus-play" % "6.0.2" % Test // Don't use, migrate to ScalaTest instead, some day. val specs2 = "org.specs2" %% "specs2-core" % "4.20.9" % "test"