From 740bfc4d7027191bb806606924f6f72c3f41b681 Mon Sep 17 00:00:00 2001 From: Angus McLeod Date: Fri, 29 Sep 2023 08:54:20 +0800 Subject: [PATCH 1/3] FIX: test intermittently fails due to render race condition See https://coop.pavilion.tech/t/discourse-events-main-does-not-work-on-tests-passed/3057 --- test/javascripts/acceptance/admin-connection-test.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/test/javascripts/acceptance/admin-connection-test.js b/test/javascripts/acceptance/admin-connection-test.js index da8ce343..7036c35c 100644 --- a/test/javascripts/acceptance/admin-connection-test.js +++ b/test/javascripts/acceptance/admin-connection-test.js @@ -5,7 +5,7 @@ import { query, } from "discourse/tests/helpers/qunit-helpers"; import { test } from "qunit"; -import { visit } from "@ember/test-helpers"; +import { visit, settled } from "@ember/test-helpers"; import { registerRoutes } from "../helpers/events-routes"; function sourceRoutes(needs) { @@ -122,6 +122,7 @@ acceptance("Events | Connection", function (needs) { const userSelect = selectKit("tr[data-connection-id=new] .connection-user"); await userSelect.expand(); await fillIn(".connection-user input.filter-input", "angus"); + await settled(); await userSelect.selectRowByValue("angus"); await selectKit("tr[data-connection-id=new] .connection-category").expand(); From 7d6c52773f77f2c52a6b9b469fc6f83998632f83 Mon Sep 17 00:00:00 2001 From: Angus McLeod Date: Fri, 29 Sep 2023 08:55:19 +0800 Subject: [PATCH 2/3] Bump version --- plugin.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugin.rb b/plugin.rb index b72134a3..70fb7f7c 100644 --- a/plugin.rb +++ b/plugin.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true # name: discourse-events # about: Allows you to manage events in Discourse -# version: 0.2.5 +# version: 0.2.6 # authors: Angus McLeod # contact_emails: development@pavilion.tech # url: https://github.com/paviliondev/discourse-events From f48fbb235e839db330d5d1062eb928c2480b829a Mon Sep 17 00:00:00 2001 From: Angus McLeod Date: Fri, 29 Sep 2023 09:30:45 +0800 Subject: [PATCH 3/3] Linting fix --- test/javascripts/acceptance/admin-connection-test.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/javascripts/acceptance/admin-connection-test.js b/test/javascripts/acceptance/admin-connection-test.js index 7036c35c..56c50008 100644 --- a/test/javascripts/acceptance/admin-connection-test.js +++ b/test/javascripts/acceptance/admin-connection-test.js @@ -5,7 +5,7 @@ import { query, } from "discourse/tests/helpers/qunit-helpers"; import { test } from "qunit"; -import { visit, settled } from "@ember/test-helpers"; +import { settled, visit } from "@ember/test-helpers"; import { registerRoutes } from "../helpers/events-routes"; function sourceRoutes(needs) {