Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lock.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ Compile / dependencyOverrides ++= {
"org.elasticsearch" % "elasticsearch-x-content" % "6.8.23",
"org.elasticsearch" % "jna" % "5.5.0",
"org.elasticsearch.client" % "elasticsearch-rest-client" % "6.8.23",
"org.elasticsearch.client" % "transport" % "6.8.23",
"org.elasticsearch.client" % "transport" % "7.17.29",
"org.elasticsearch.plugin" % "lang-mustache-client" % "6.8.23",
"org.elasticsearch.plugin" % "parent-join-client" % "6.8.23",
"org.elasticsearch.plugin" % "percolator-client" % "6.8.23",
Expand Down
2 changes: 1 addition & 1 deletion project/Dependencies.scala
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ object Dependencies {
// When upgrading to next major version, consider improving the mappings at the same
// time? Change id fields from type integer to type keyword. [es_kwd] [ty_v1]
val elasticsearchClient = "org.elasticsearch" % "elasticsearch" % "6.8.23"
val elasticsearchClientTransport = "org.elasticsearch.client" % "transport" % "6.8.23"
val elasticsearchClientTransport = "org.elasticsearch.client" % "transport" % "7.17.29"

val guava = "com.google.guava" % "guava" % "33.4.6-jre"
val findbugsJsr304 = "com.google.code.findbugs" % "jsr305" % "3.0.2" % "provided"
Expand Down
2 changes: 1 addition & 1 deletion relchans/tyse-v0-dev
Submodule tyse-v0-dev updated 1 files
+1 βˆ’0 version-tags.log
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand Down
8 changes: 5 additions & 3 deletions tests/e2e-wdio7/specs/modn-ban-from-disc-page.2br.f.e2e.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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 });
});

Expand Down
1 change: 0 additions & 1 deletion tests/e2e-wdio7/utils/ty-e2e-test-browser.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5873,7 +5873,6 @@ export class TyE2eTestBrowser {
if (!isGone)
throw `Not yet gone: ${submitSelector}`;
});
await this.waitUntilModalGone();
}
};

Expand Down
2 changes: 1 addition & 1 deletion version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v0.2025.007
v0.2025.008