From e5d48a788132753054c3a45db7021b3d0a2032a1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 2 Aug 2024 16:39:46 +0000 Subject: [PATCH 1/5] Bump rexml from 3.2.8 to 3.3.3 Bumps [rexml](https://github.com/ruby/rexml) from 3.2.8 to 3.3.3. - [Release notes](https://github.com/ruby/rexml/releases) - [Changelog](https://github.com/ruby/rexml/blob/master/NEWS.md) - [Commits](https://github.com/ruby/rexml/compare/v3.2.8...v3.3.3) --- updated-dependencies: - dependency-name: rexml dependency-type: indirect ... Signed-off-by: dependabot[bot] --- Gemfile.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 5b6c0f83..ccded01b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -9,8 +9,8 @@ GEM prettier_print (1.2.1) rainbow (3.1.1) regexp_parser (2.6.1) - rexml (3.2.8) - strscan (>= 3.0.9) + rexml (3.3.3) + strscan rubocop (1.39.0) json (~> 2.3) parallel (~> 1.10) From b49702adf3bf1221a320369a6db2d2eaacbc248d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 13 Aug 2024 13:16:48 +0000 Subject: [PATCH 2/5] Bump rexml from 3.2.8 to 3.3.3 Bumps [rexml](https://github.com/ruby/rexml) from 3.2.8 to 3.3.3. - [Release notes](https://github.com/ruby/rexml/releases) - [Changelog](https://github.com/ruby/rexml/blob/master/NEWS.md) - [Commits](https://github.com/ruby/rexml/compare/v3.2.8...v3.3.3) --- updated-dependencies: - dependency-name: rexml dependency-type: indirect ... Signed-off-by: dependabot[bot] --- Gemfile.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index d4a4a9af..faa100fb 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -10,8 +10,8 @@ GEM racc (1.8.1) rainbow (3.1.1) regexp_parser (2.6.1) - rexml (3.2.8) - strscan (>= 3.0.9) + rexml (3.3.3) + strscan rubocop (1.39.0) json (~> 2.3) parallel (~> 1.10) From a76fe5cf7581108b5be26e7fb101f0fb111331c9 Mon Sep 17 00:00:00 2001 From: Angus McLeod Date: Tue, 13 Aug 2024 21:36:43 +0800 Subject: [PATCH 3/5] Include timezone in topic list test for timezone certainty --- test/javascripts/acceptance/events-discovery-test.js | 1 + 1 file changed, 1 insertion(+) diff --git a/test/javascripts/acceptance/events-discovery-test.js b/test/javascripts/acceptance/events-discovery-test.js index 2d1852c5..da134363 100644 --- a/test/javascripts/acceptance/events-discovery-test.js +++ b/test/javascripts/acceptance/events-discovery-test.js @@ -47,6 +47,7 @@ acceptance("Events | topic list with an event", function (needs) { }); test("shows event", async function (assert) { + this.siteSettings.events_timezone_include_in_topic_list = true; await visit("/c/dev"); assert.ok( From 37bb1844411695688f2c64f5305d70b3fec13477 Mon Sep 17 00:00:00 2001 From: Angus McLeod Date: Tue, 13 Aug 2024 21:37:40 +0800 Subject: [PATCH 4/5] Bump version --- plugin.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugin.rb b/plugin.rb index 7901607b..986e849a 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.5.0 +# version: 0.5.1 # authors: Angus McLeod # contact_emails: angus@pavilion.tech # url: https://github.com/paviliondev/discourse-events From 6a73813486ab48ab662af439e74cbb4b587a99ef Mon Sep 17 00:00:00 2001 From: Angus McLeod Date: Tue, 13 Aug 2024 22:05:52 +0800 Subject: [PATCH 5/5] Update siteSettings to handle timezones in tests --- test/javascripts/acceptance/events-discovery-test.js | 1 + test/javascripts/acceptance/events-topic-test.js | 2 ++ 2 files changed, 3 insertions(+) diff --git a/test/javascripts/acceptance/events-discovery-test.js b/test/javascripts/acceptance/events-discovery-test.js index da134363..f4b73080 100644 --- a/test/javascripts/acceptance/events-discovery-test.js +++ b/test/javascripts/acceptance/events-discovery-test.js @@ -48,6 +48,7 @@ acceptance("Events | topic list with an event", function (needs) { test("shows event", async function (assert) { this.siteSettings.events_timezone_include_in_topic_list = true; + this.siteSettings.events_timezone_display = "event"; await visit("/c/dev"); assert.ok( diff --git a/test/javascripts/acceptance/events-topic-test.js b/test/javascripts/acceptance/events-topic-test.js index ede02901..a7d06646 100644 --- a/test/javascripts/acceptance/events-topic-test.js +++ b/test/javascripts/acceptance/events-topic-test.js @@ -45,6 +45,8 @@ acceptance("Events | topic with an event", function (needs) { }); test("shows event", async function (assert) { + this.siteSettings.events_timezone_include_in_topic_list = true; + this.siteSettings.events_timezone_display = "event"; await visit("/t/280"); assert.ok(