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) 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 diff --git a/test/javascripts/acceptance/events-discovery-test.js b/test/javascripts/acceptance/events-discovery-test.js index 2d1852c5..f4b73080 100644 --- a/test/javascripts/acceptance/events-discovery-test.js +++ b/test/javascripts/acceptance/events-discovery-test.js @@ -47,6 +47,8 @@ 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(