Skip to content

A platform for community discussion. Free, open, simple.

DEV: rename Discourse Events site setting (#42650)

David Battersby8d2ae1391f35
diff --git a/db/structure.sql b/db/structure.sql
index ce8fda7a3e6..883237c91c8 100644
--- a/db/structure.sql
+++ b/db/structure.sql
@@ -23281,12 +23281,14 @@ ALTER TABLE ONLY public.ad_plugin_house_ads_groups
SET search_path TO "$user", public;
INSERT INTO "schema_migrations" (version) VALUES
+('20260818143417'),
('20260818081537'),
('20260818045317'),
('20260818045314'),
('20260818045311'),
('20260818045308'),
('20260818045305'),
+('20260817092359'),
('20260817054353'),
('20260817054044'),
('20260814083721'),
diff --git a/frontend/discourse/tests/unit/services/admin-search-data-source-test.js b/frontend/discourse/tests/unit/services/admin-search-data-source-test.js
index 96a7a2ad35f..39c238b74b0 100644
--- a/frontend/discourse/tests/unit/services/admin-search-data-source-test.js
+++ b/frontend/discourse/tests/unit/services/admin-search-data-source-test.js
@@ -508,7 +508,7 @@ module(
test("url is correct for a setting that belongs to a plugin not using the new show page", async function (assert) {
let setting = {
plugin: "discourse-calendar",
- setting: "calendar_enabled",
+ setting: "discourse_events_enabled",
};
let formatter = new SettingLinkFormatter(
this.router,
@@ -518,7 +518,7 @@ module(
);
assert.deepEqual(
formatter.format().url,
- "/admin/site_settings/category/discourse_calendar?filter=calendar_enabled",
+ "/admin/site_settings/category/discourse_calendar?filter=discourse_events_enabled",
"url uses the admin site settings category and setting"
);
});
diff --git a/plugins/discourse-events/app/services/discourse_calendar/categories/types/events.rb b/plugins/discourse-events/app/services/discourse_calendar/categories/types/events.rb
index f65e02a2a0f..7bf777a18e4 100644
--- a/plugins/discourse-events/app/services/discourse_calendar/categories/types/events.rb
+++ b/plugins/discourse-events/app/services/discourse_calendar/categories/types/events.rb
@@ -8,12 +8,12 @@ module DiscourseCalendar
class << self
def enable_plugin
- SiteSetting.calendar_enabled = true
+ SiteSetting.discourse_events_enabled = true
SiteSetting.discourse_post_event_enabled = true
end
def plugin_enabled?
- SiteSetting.calendar_enabled && SiteSetting.discourse_post_event_enabled
+ SiteSetting.discourse_events_enabled && SiteSetting.discourse_post_event_enabled
end
def category_matches?(category)
diff --git a/plugins/discourse-events/app/services/discourse_calendar/livestream/prepare_zoom_join.rb b/plugins/discourse-events/app/services/discourse_calendar/livestream/prepare_zoom_join.rb
index 64f5a895067..f691250db9a 100644
--- a/plugins/discourse-events/app/services/discourse_calendar/livestream/prepare_zoom_join.rb
+++ b/plugins/discourse-events/app/services/discourse_calendar/livestream/prepare_zoom_join.rb
@@ -25,7 +25,7 @@ class DiscourseCalendar::Livestream::PrepareZoomJoin
private
def livestream_available
- SiteSetting.chat_enabled && SiteSetting.calendar_enabled &&
+ SiteSetting.chat_enabled && SiteSetting.discourse_events_enabled &&
SiteSetting.discourse_post_event_enabled
end
diff --git a/plugins/discourse-events/assets/javascripts/discourse/connectors/user-custom-preferences/region.gjs b/plugins/discourse-events/assets/javascripts/discourse/connectors/user-custom-preferences/region.gjs
index 22eb16002cb..440a12368b3 100644
--- a/plugins/discourse-events/assets/javascripts/discourse/connectors/user-custom-preferences/region.gjs
+++ b/plugins/discourse-events/assets/javascripts/discourse/connectors/user-custom-preferences/region.gjs
@@ -7,7 +7,7 @@ import { TIME_ZONE_TO_REGION } from "../../lib/regions";
export default class Region extends Component {
static shouldRender(args, { siteSettings }) {
- return siteSettings.calendar_enabled;
+ return siteSettings.discourse_events_enabled;
}
@action
diff --git a/plugins/discourse-events/assets/javascripts/discourse/initializers/discourse-calendar.gjs b/plugins/discourse-events/assets/javascripts/discourse/initializers/discourse-calendar.gjs
index 0e8223c30ea..87ba3e0df5f 100644
--- a/plugins/discourse-events/assets/javascripts/discourse/initializers/discourse-calendar.gjs
+++ b/plugins/discourse-events/assets/javascripts/discourse/initializers/discourse-calendar.gjs
@@ -202,7 +202,7 @@ export default {
initialize(container) {
const siteSettings = container.lookup("service:site-settings");
- if (siteSettings.calendar_enabled) {
+ if (siteSettings.discourse_events_enabled) {
withPluginApi(initializeDiscourseCalendar);
}
},
diff --git a/plugins/discourse-events/assets/javascripts/discourse/lib/discourse-markdown/discourse-calendar.js b/plugins/discourse-events/assets/javascripts/discourse/lib/discourse-markdown/discourse-calendar.js
index f0b8e5a49e6..2db0cd23b6e 100644
--- a/plugins/discourse-events/assets/javascripts/discourse/lib/discourse-markdown/discourse-calendar.js
+++ b/plugins/discourse-events/assets/javascripts/discourse/lib/discourse-markdown/discourse-calendar.js
@@ -87,7 +87,7 @@ export function setup(helper) {
helper.registerOptions((opts, siteSettings) => {
opts.features["discourse-calendar-enabled"] =
- !!siteSettings.calendar_enabled;
+ !!siteSettings.discourse_events_enabled;
});
helper.registerPlugin((md) => {
diff --git a/plugins/discourse-events/assets/javascripts/discourse/lib/discourse-markdown/discourse-post-event-block.js b/plugins/discourse-events/assets/javascripts/discourse/lib/discourse-markdown/discourse-post-event-block.js
index 1f7bd7dbcad..96a43ccd3c7 100644
--- a/plugins/discourse-events/assets/javascripts/discourse/lib/discourse-markdown/discourse-post-event-block.js
+++ b/plugins/discourse-events/assets/javascripts/discourse/lib/discourse-markdown/discourse-post-event-block.js
@@ -31,7 +31,7 @@ export function setup(helper) {
helper.registerOptions((opts, siteSettings) => {
opts.features.discourse_post_event =
- siteSettings.calendar_enabled &&
+ siteSettings.discourse_events_enabled &&
siteSettings.discourse_post_event_enabled;
});
diff --git a/plugins/discourse-events/config/locales/server.en.yml b/plugins/discourse-events/config/locales/server.en.yml
index 2f9ec63d94a..353dac328bc 100644
--- a/plugins/discourse-events/config/locales/server.en.yml
+++ b/plugins/discourse-events/config/locales/server.en.yml
@@ -42,8 +42,8 @@ en:
site_settings:
map_events_to_color: "Assign a color to each tag or category."
map_events_title: "Overwrites 'Events' in the 'Upcoming Events' sidebar title per category."
- calendar_enabled: "Enable the Discourse Events plugin. This will add support for a [calendar][/calendar] tag in the first post of a topic."
- discourse_post_event_enabled: "Enables the Event features. Note: also needs {{setting:calendar_enabled}} to be enabled."
+ discourse_events_enabled: "Enable the Discourse Events plugin. This will add support for a [calendar][/calendar] tag in the first post of a topic."
+ discourse_post_event_enabled: "Enables the Event features. Note: also needs {{setting:discourse_events_enabled}} to be enabled."
displayed_invitees_limit: "Limits the numbers of invitees displayed on an event."
display_post_event_date_on_topic_title: "Displays the date of the event after the topic title."
use_local_event_date: "Use local date after topic title instead of relative time."
diff --git a/plugins/discourse-events/config/settings.yml b/plugins/discourse-events/config/settings.yml
index b911347d8ae..a950813b07f 100644
--- a/plugins/discourse-events/config/settings.yml
+++ b/plugins/discourse-events/config/settings.yml
@@ -1,5 +1,5 @@
discourse_calendar:
- calendar_enabled:
+ discourse_events_enabled:
default: false
client: true
holiday_calendar_topic_id:
diff --git a/plugins/discourse-events/db/migrate/20260817092359_copy_calendar_enabled_to_discourse_events_enabled.rb b/plugins/discourse-events/db/migrate/20260817092359_copy_calendar_enabled_to_discourse_events_enabled.rb
new file mode 100644
index 00000000000..1371a68a2f6
--- /dev/null
+++ b/plugins/discourse-events/db/migrate/20260817092359_copy_calendar_enabled_to_discourse_events_enabled.rb
@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+class CopyCalendarEnabledToDiscourseEventsEnabled < ActiveRecord::Migration[8.0]
+ def up
+ execute <<~SQL
+ INSERT INTO site_settings (name, data_type, value, created_at, updated_at)
+ SELECT 'discourse_events_enabled', data_type, value, created_at, updated_at
+ FROM site_settings
+ WHERE name = 'calendar_enabled'
+ ON CONFLICT (name) DO NOTHING
+ SQL
+ end
+
+ def down
+ raise ActiveRecord::IrreversibleMigration
+ end
+end
diff --git a/plugins/discourse-events/db/post_migrate/20260818143417_remove_calendar_enabled_site_setting.rb b/plugins/discourse-events/db/post_migrate/20260818143417_remove_calendar_enabled_site_setting.rb
new file mode 100644
index 00000000000..60a1b478e35
--- /dev/null
+++ b/plugins/discourse-events/db/post_migrate/20260818143417_remove_calendar_enabled_site_setting.rb
@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+class RemoveCalendarEnabledSiteSetting < ActiveRecord::Migration[8.0]
+ def up
+ execute "DELETE FROM site_settings WHERE name = 'calendar_enabled'"
+ end
+
+ def down
+ raise ActiveRecord::IrreversibleMigration
+ end
+end
diff --git a/plugins/discourse-events/jobs/scheduled/create_holiday_events.rb b/plugins/discourse-events/jobs/scheduled/create_holiday_events.rb
index 0c54b7266bd..cce52843230 100644
--- a/plugins/discourse-events/jobs/scheduled/create_holiday_events.rb
+++ b/plugins/discourse-events/jobs/scheduled/create_holiday_events.rb
@@ -6,7 +6,7 @@ module Jobs
every 10.minutes
def execute(args)
- return if !SiteSetting.calendar_enabled
+ return if !SiteSetting.discourse_events_enabled
return if !SiteSetting.calendar_automatic_holidays_enabled
return unless topic_id = SiteSetting.holiday_calendar_topic_id.presence
diff --git a/plugins/discourse-events/jobs/scheduled/delete_expired_event_posts.rb b/plugins/discourse-events/jobs/scheduled/delete_expired_event_posts.rb
index 0b97a401bea..98c93fefc63 100644
--- a/plugins/discourse-events/jobs/scheduled/delete_expired_event_posts.rb
+++ b/plugins/discourse-events/jobs/scheduled/delete_expired_event_posts.rb
@@ -6,7 +6,7 @@ module Jobs
every 10.minutes
def execute(args)
- return unless SiteSetting.calendar_enabled
+ return unless SiteSetting.discourse_events_enabled
delay = SiteSetting.delete_expired_event_posts_after
return if delay < 0
diff --git a/plugins/discourse-events/jobs/scheduled/update_holiday_usernames.rb b/plugins/discourse-events/jobs/scheduled/update_holiday_usernames.rb
index df2cd2e95b2..ce08b4faba6 100644
--- a/plugins/discourse-events/jobs/scheduled/update_holiday_usernames.rb
+++ b/plugins/discourse-events/jobs/scheduled/update_holiday_usernames.rb
@@ -6,7 +6,7 @@ module Jobs
every 10.minutes
def execute(args)
- return unless SiteSetting.calendar_enabled
+ return unless SiteSetting.discourse_events_enabled
return unless topic_id = SiteSetting.holiday_calendar_topic_id.presence
events = CalendarEvent.where(topic_id: topic_id)
diff --git a/plugins/discourse-events/plugin.rb b/plugins/discourse-events/plugin.rb
index 1c50ab922bd..c40fe95e57f 100644
--- a/plugins/discourse-events/plugin.rb
+++ b/plugins/discourse-events/plugin.rb
@@ -15,7 +15,7 @@ require_relative "lib/calendar_custom_fields_validator"
require_relative "lib/calendar_first_day_of_week"
require_relative "lib/calendar_upcoming_events_default_view"
-enabled_site_setting :calendar_enabled
+enabled_site_setting :discourse_events_enabled
register_svg_icon "calendar-days"
register_asset "stylesheets/common/full-calendar-ext.scss"
diff --git a/plugins/discourse-events/spec/integration/allowed_custom_fields_setting_spec.rb b/plugins/discourse-events/spec/integration/allowed_custom_fields_setting_spec.rb
index 0e10652e99a..c0db2f76256 100644
--- a/plugins/discourse-events/spec/integration/allowed_custom_fields_setting_spec.rb
+++ b/plugins/discourse-events/spec/integration/allowed_custom_fields_setting_spec.rb
@@ -10,7 +10,7 @@ describe "discourse_post_event_allowed_custom_fields" do
SiteSetting.discourse_post_event_allowed_custom_fields = "foo|bar|foo-bar|foo_baz"
post_event_1.update!(custom_fields: {})
- SiteSetting.calendar_enabled = true
+ SiteSetting.discourse_events_enabled = true
SiteSetting.discourse_post_event_enabled = true
Jobs.run_immediately!
end
diff --git a/plugins/discourse-events/spec/integration/invitee_spec.rb b/plugins/discourse-events/spec/integration/invitee_spec.rb
index d23b6a58410..967cd1196eb 100644
--- a/plugins/discourse-events/spec/integration/invitee_spec.rb
+++ b/plugins/discourse-events/spec/integration/invitee_spec.rb
@@ -4,7 +4,7 @@ describe DiscoursePostEvent::Invitee do
before do
freeze_time
Jobs.run_immediately!
- SiteSetting.calendar_enabled = true
+ SiteSetting.discourse_events_enabled = true
SiteSetting.discourse_post_event_enabled = true
end
diff --git a/plugins/discourse-events/spec/integration/outgoing_web_hooks_spec.rb b/plugins/discourse-events/spec/integration/outgoing_web_hooks_spec.rb
index db4aac2cf3f..36020d31889 100644
--- a/plugins/discourse-events/spec/integration/outgoing_web_hooks_spec.rb
+++ b/plugins/discourse-events/spec/integration/outgoing_web_hooks_spec.rb
@@ -5,7 +5,7 @@ RSpec.describe "Outgoing calendar event webhooks" do
fab!(:web_hook, :outgoing_calendar_event_web_hook)
before do
- SiteSetting.calendar_enabled = true
+ SiteSetting.discourse_events_enabled = true
SiteSetting.discourse_post_event_enabled = true
end
diff --git a/plugins/discourse-events/spec/integration/post_spec.rb b/plugins/discourse-events/spec/integration/post_spec.rb
index c897d839d6b..9f9a550cb40 100644
--- a/plugins/discourse-events/spec/integration/post_spec.rb
+++ b/plugins/discourse-events/spec/integration/post_spec.rb
@@ -6,7 +6,7 @@ describe Post do
before do
freeze_time
Jobs.run_immediately!
- SiteSetting.calendar_enabled = true
+ SiteSetting.discourse_events_enabled = true
SiteSetting.discourse_post_event_enabled = true
end
diff --git a/plugins/discourse-events/spec/integration/recurrence_spec.rb b/plugins/discourse-events/spec/integration/recurrence_spec.rb
index 51d4c0fe359..8a6732a6a32 100644
--- a/plugins/discourse-events/spec/integration/recurrence_spec.rb
+++ b/plugins/discourse-events/spec/integration/recurrence_spec.rb
@@ -17,7 +17,7 @@ describe "discourse_post_event_recurrence" do
before do
freeze_time(starts_at + 1.minute)
- SiteSetting.calendar_enabled = true
+ SiteSetting.discourse_events_enabled = true
SiteSetting.discourse_post_event_enabled = true
end
diff --git a/plugins/discourse-events/spec/integration/topic_spec.rb b/plugins/discourse-events/spec/integration/topic_spec.rb
index 9eb3d651813..2d9468f2dd5 100644
--- a/plugins/discourse-events/spec/integration/topic_spec.rb
+++ b/plugins/discourse-events/spec/integration/topic_spec.rb
@@ -4,7 +4,7 @@ describe Topic do
before do
freeze_time
Jobs.run_immediately!
- SiteSetting.calendar_enabled = true
+ SiteSetting.discourse_events_enabled = true
SiteSetting.discourse_post_event_enabled = true
end
diff --git a/plugins/discourse-events/spec/jobs/export_post_event_report_csv_spec.rb b/plugins/discourse-events/spec/jobs/export_post_event_report_csv_spec.rb
index d4ad91e3135..a80ba53e1b5 100644
--- a/plugins/discourse-events/spec/jobs/export_post_event_report_csv_spec.rb
+++ b/plugins/discourse-events/spec/jobs/export_post_event_report_csv_spec.rb
@@ -4,7 +4,7 @@ describe Jobs::ExportCsvFile do
before do
freeze_time
Jobs.run_immediately!
- SiteSetting.calendar_enabled = true
+ SiteSetting.discourse_events_enabled = true
SiteSetting.discourse_post_event_enabled = true
end
diff --git a/plugins/discourse-events/spec/jobs/regular/discourse_post_event/bulk_invite_spec.rb b/plugins/discourse-events/spec/jobs/regular/discourse_post_event/bulk_invite_spec.rb
index 7f880631b83..963dd8174b3 100644
--- a/plugins/discourse-events/spec/jobs/regular/discourse_post_event/bulk_invite_spec.rb
+++ b/plugins/discourse-events/spec/jobs/regular/discourse_post_event/bulk_invite_spec.rb
@@ -9,7 +9,7 @@ describe Jobs::DiscoursePostEventBulkInvite do
before do
freeze_time DateTime.parse("2018-11-10 12:00")
Jobs.run_immediately!
- SiteSetting.calendar_enabled = true
+ SiteSetting.discourse_events_enabled = true
SiteSetting.discourse_post_event_enabled = true
end
diff --git a/plugins/discourse-events/spec/jobs/regular/discourse_post_event/bump_topic_spec.rb b/plugins/discourse-events/spec/jobs/regular/discourse_post_event/bump_topic_spec.rb
index 1dcf8eefb95..4e79549446d 100644
--- a/plugins/discourse-events/spec/jobs/regular/discourse_post_event/bump_topic_spec.rb
+++ b/plugins/discourse-events/spec/jobs/regular/discourse_post_event/bump_topic_spec.rb
@@ -9,7 +9,7 @@ describe Jobs::DiscoursePostEventBumpTopic do
Jobs.run_immediately!
- SiteSetting.calendar_enabled = true
+ SiteSetting.discourse_events_enabled = true
SiteSetting.discourse_post_event_enabled = true
end
diff --git a/plugins/discourse-events/spec/jobs/regular/discourse_post_event/send_reminder_spec.rb b/plugins/discourse-events/spec/jobs/regular/discourse_post_event/send_reminder_spec.rb
index 1fd6fa3bd97..c9b8514efc8 100644
--- a/plugins/discourse-events/spec/jobs/regular/discourse_post_event/send_reminder_spec.rb
+++ b/plugins/discourse-events/spec/jobs/regular/discourse_post_event/send_reminder_spec.rb
@@ -49,7 +49,7 @@ describe Jobs::DiscoursePostEventSendReminder do
Jobs.run_immediately!
- SiteSetting.calendar_enabled = true
+ SiteSetting.discourse_events_enabled = true
SiteSetting.discourse_post_event_enabled = true
end
diff --git a/plugins/discourse-events/spec/jobs/scheduled/create_holiday_events_spec.rb b/plugins/discourse-events/spec/jobs/scheduled/create_holiday_events_spec.rb
index 0ed0ecc7ead..b01bccae19c 100644
--- a/plugins/discourse-events/spec/jobs/scheduled/create_holiday_events_spec.rb
+++ b/plugins/discourse-events/spec/jobs/scheduled/create_holiday_events_spec.rb
@@ -14,7 +14,7 @@ describe Jobs::DiscourseCalendar::CreateHolidayEvents do
before do
Jobs.run_immediately!
- SiteSetting.calendar_enabled = true
+ SiteSetting.discourse_events_enabled = true
SiteSetting.holiday_calendar_topic_id = calendar_post.topic_id
end
diff --git a/plugins/discourse-events/spec/jobs/scheduled/delete_expired_event_posts_spec.rb b/plugins/discourse-events/spec/jobs/scheduled/delete_expired_event_posts_spec.rb
index a7f0c13f8b1..404be4ce577 100644
--- a/plugins/discourse-events/spec/jobs/scheduled/delete_expired_event_posts_spec.rb
+++ b/plugins/discourse-events/spec/jobs/scheduled/delete_expired_event_posts_spec.rb
@@ -5,7 +5,7 @@ describe Jobs::DiscourseCalendar::DeleteExpiredEventPosts do
before do
Jobs.run_immediately!
- SiteSetting.calendar_enabled = true
+ SiteSetting.discourse_events_enabled = true
SiteSetting.delete_expired_event_posts_after = 1 # hour
end
diff --git a/plugins/discourse-events/spec/jobs/scheduled/update_holiday_usernames_spec.rb b/plugins/discourse-events/spec/jobs/scheduled/update_holiday_usernames_spec.rb
index a82536b6f2f..cffa7a49a4d 100644
--- a/plugins/discourse-events/spec/jobs/scheduled/update_holiday_usernames_spec.rb
+++ b/plugins/discourse-events/spec/jobs/scheduled/update_holiday_usernames_spec.rb
@@ -7,7 +7,7 @@ describe Jobs::DiscourseCalendar::UpdateHolidayUsernames do
before do
Jobs.run_immediately!
- SiteSetting.calendar_enabled = true
+ SiteSetting.discourse_events_enabled = true
SiteSetting.holiday_calendar_topic_id = calendar_post.topic_id
end
diff --git a/plugins/discourse-events/spec/lib/calendar_first_day_of_week_spec.rb b/plugins/discourse-events/spec/lib/calendar_first_day_of_week_spec.rb
index c130dfb935f..31e775bcdad 100644
--- a/plugins/discourse-events/spec/lib/calendar_first_day_of_week_spec.rb
+++ b/plugins/discourse-events/spec/lib/calendar_first_day_of_week_spec.rb
@@ -1,7 +1,7 @@
# frozen_string_literal: true
describe SiteSetting do
- before { SiteSetting.calendar_enabled = true }
+ before { SiteSetting.discourse_events_enabled = true }
it "has the correct default value" do
expect(SiteSetting.calendar_first_day_of_week).to eq("monday")
diff --git a/plugins/discourse-events/spec/lib/calendar_spec.rb b/plugins/discourse-events/spec/lib/calendar_spec.rb
index 571ea952150..71691a54824 100644
--- a/plugins/discourse-events/spec/lib/calendar_spec.rb
+++ b/plugins/discourse-events/spec/lib/calendar_spec.rb
@@ -3,7 +3,7 @@
describe DiscourseCalendar::Calendar do
before do
Jobs.run_immediately!
- SiteSetting.calendar_enabled = true
+ SiteSetting.discourse_events_enabled = true
end
let(:raw) { "[calendar]\n[/calendar]" }
diff --git a/plugins/discourse-events/spec/lib/discourse_calendar/livestream/handle_topic_chat_channel_creation_spec.rb b/plugins/discourse-events/spec/lib/discourse_calendar/livestream/handle_topic_chat_channel_creation_spec.rb
index 30b9d7293dd..d48a4b42b77 100644
--- a/plugins/discourse-events/spec/lib/discourse_calendar/livestream/handle_topic_chat_channel_creation_spec.rb
+++ b/plugins/discourse-events/spec/lib/discourse_calendar/livestream/handle_topic_chat_channel_creation_spec.rb
@@ -19,7 +19,7 @@ RSpec.describe DiscourseCalendar::Livestream do
context "when the first post is not a livestream event" do
before do
- SiteSetting.calendar_enabled = true
+ SiteSetting.discourse_events_enabled = true
post = Fabricate(:post, topic: topic)
Fabricate(:event, post: post, livestream: false)
end
@@ -33,7 +33,7 @@ RSpec.describe DiscourseCalendar::Livestream do
context "when the first post is a livestream event" do
before do
- SiteSetting.calendar_enabled = true
+ SiteSetting.discourse_events_enabled = true
SiteSetting.chat_pinned_messages = true
post = Fabricate(:post, topic: topic)
Fabricate(
@@ -157,7 +157,7 @@ RSpec.describe DiscourseCalendar::Livestream do
context "when the first post is a livestream event and pinned messages are disabled" do
before do
- SiteSetting.calendar_enabled = true
+ SiteSetting.discourse_events_enabled = true
SiteSetting.chat_pinned_messages = false
post = Fabricate(:post, topic: topic)
Fabricate(
diff --git a/plugins/discourse-events/spec/lib/discourse_post_event/event_onebox_data_spec.rb b/plugins/discourse-events/spec/lib/discourse_post_event/event_onebox_data_spec.rb
index 8ff521d2179..fe116ee16de 100644
--- a/plugins/discourse-events/spec/lib/discourse_post_event/event_onebox_data_spec.rb
+++ b/plugins/discourse-events/spec/lib/discourse_post_event/event_onebox_data_spec.rb
@@ -6,7 +6,7 @@ describe DiscoursePostEvent::EventOneboxData do
before do
freeze_time Time.utc(2018, 6, 5, 18, 40)
- SiteSetting.calendar_enabled = true
+ SiteSetting.discourse_events_enabled = true
SiteSetting.discourse_post_event_enabled = true
end
diff --git a/plugins/discourse-events/spec/lib/discourse_post_event/guardian_extensions_spec.rb b/plugins/discourse-events/spec/lib/discourse_post_event/guardian_extensions_spec.rb
index c9ee9c62cfc..8351f4733e2 100644
--- a/plugins/discourse-events/spec/lib/discourse_post_event/guardian_extensions_spec.rb
+++ b/plugins/discourse-events/spec/lib/discourse_post_event/guardian_extensions_spec.rb
@@ -19,7 +19,7 @@ RSpec.describe DiscoursePostEvent::GuardianExtensions do
let(:guardian) { user.guardian }
before do
- SiteSetting.calendar_enabled = true
+ SiteSetting.discourse_events_enabled = true
SiteSetting.discourse_post_event_enabled = true
SiteSetting.discourse_post_event_allowed_on_groups = allowed_group.id
end
diff --git a/plugins/discourse-events/spec/lib/discourse_post_event/pretty_text_spec.rb b/plugins/discourse-events/spec/lib/discourse_post_event/pretty_text_spec.rb
index 362d595a61c..fd6c6866a7e 100644
--- a/plugins/discourse-events/spec/lib/discourse_post_event/pretty_text_spec.rb
+++ b/plugins/discourse-events/spec/lib/discourse_post_event/pretty_text_spec.rb
@@ -4,7 +4,7 @@ describe PrettyText do
before do
freeze_time Time.utc(2018, 6, 5, 18, 40)
- SiteSetting.calendar_enabled = true
+ SiteSetting.discourse_events_enabled = true
SiteSetting.discourse_post_event_enabled = true
end
diff --git a/plugins/discourse-events/spec/lib/discourse_post_event/topic_extension_spec.rb b/plugins/discourse-events/spec/lib/discourse_post_event/topic_extension_spec.rb
index 09d17204d77..19141cfaf78 100644
--- a/plugins/discourse-events/spec/lib/discourse_post_event/topic_extension_spec.rb
+++ b/plugins/discourse-events/spec/lib/discourse_post_event/topic_extension_spec.rb
@@ -4,7 +4,7 @@ describe DiscoursePostEvent::TopicExtension do
before do
freeze_time
Jobs.run_immediately!
- SiteSetting.calendar_enabled = true
+ SiteSetting.discourse_events_enabled = true
SiteSetting.discourse_post_event_enabled = true
end
diff --git a/plugins/discourse-events/spec/lib/group_timezones_spec.rb b/plugins/discourse-events/spec/lib/group_timezones_spec.rb
index 56f00266ea6..0a3cf874f29 100644
--- a/plugins/discourse-events/spec/lib/group_timezones_spec.rb
+++ b/plugins/discourse-events/spec/lib/group_timezones_spec.rb
@@ -3,7 +3,7 @@
describe DiscourseCalendar::GroupTimezones do
before do
Jobs.run_immediately!
- SiteSetting.calendar_enabled = true
+ SiteSetting.discourse_events_enabled = true
end
let(:calendar_post) { create_post(raw: '[timezones group="admins"]\n[/timezones]') }
diff --git a/plugins/discourse-events/spec/models/calendar_event_spec.rb b/plugins/discourse-events/spec/models/calendar_event_spec.rb
index 5afcc280c85..4ebf95265b6 100644
--- a/plugins/discourse-events/spec/models/calendar_event_spec.rb
+++ b/plugins/discourse-events/spec/models/calendar_event_spec.rb
@@ -5,7 +5,7 @@ describe CalendarEvent do
before do
Jobs.run_immediately!
- SiteSetting.calendar_enabled = true
+ SiteSetting.discourse_events_enabled = true
SiteSetting.all_day_event_start_time = ""
SiteSetting.all_day_event_end_time = ""
end
diff --git a/plugins/discourse-events/spec/models/discourse_post_event/event_date_spec.rb b/plugins/discourse-events/spec/models/discourse_post_event/event_date_spec.rb
index 426a5480020..3a04a15afee 100644
--- a/plugins/discourse-events/spec/models/discourse_post_event/event_date_spec.rb
+++ b/plugins/discourse-events/spec/models/discourse_post_event/event_date_spec.rb
@@ -15,7 +15,7 @@ describe DiscoursePostEvent::EventDate do
before do
freeze_time DateTime.parse("2020-04-24 14:10")
Jobs.run_immediately!
- SiteSetting.calendar_enabled = true
+ SiteSetting.discourse_events_enabled = true
SiteSetting.discourse_post_event_enabled = true
end
diff --git a/plugins/discourse-events/spec/models/discourse_post_event/event_spec.rb b/plugins/discourse-events/spec/models/discourse_post_event/event_spec.rb
index 3312e1e5a9a..39b847d566f 100644
--- a/plugins/discourse-events/spec/models/discourse_post_event/event_spec.rb
+++ b/plugins/discourse-events/spec/models/discourse_post_event/event_spec.rb
@@ -4,7 +4,7 @@ describe DiscoursePostEvent::Event do
before do
freeze_time DateTime.parse("2020-04-24 14:10")
Jobs.run_immediately!
- SiteSetting.calendar_enabled = true
+ SiteSetting.discourse_events_enabled = true
SiteSetting.discourse_post_event_enabled = true
end
@@ -1458,7 +1458,7 @@ end
describe DiscoursePostEvent::Event, "#most_likely_going" do
before do
Jobs.run_immediately!
- SiteSetting.calendar_enabled = true
+ SiteSetting.discourse_events_enabled = true
SiteSetting.discourse_post_event_enabled = true
end
@@ -1514,7 +1514,7 @@ end
describe DiscoursePostEvent::Event, "#capacity" do
before do
Jobs.run_immediately!
- SiteSetting.calendar_enabled = true
+ SiteSetting.discourse_events_enabled = true
SiteSetting.discourse_post_event_enabled = true
end
diff --git a/plugins/discourse-events/spec/requests/admin/admin_holidays_controller_spec.rb b/plugins/discourse-events/spec/requests/admin/admin_holidays_controller_spec.rb
index a0d7c9acdf4..6e92ac12963 100644
--- a/plugins/discourse-events/spec/requests/admin/admin_holidays_controller_spec.rb
+++ b/plugins/discourse-events/spec/requests/admin/admin_holidays_controller_spec.rb
@@ -5,11 +5,11 @@ module Admin::DiscourseCalendar
fab!(:admin) { Fabricate(:user, admin: true, refresh_auto_groups: true) }
fab!(:member, :user)
- before { SiteSetting.calendar_enabled = calendar_enabled }
+ before { SiteSetting.discourse_events_enabled = discourse_events_enabled }
describe "#index" do
context "when the calendar plugin is enabled" do
- let(:calendar_enabled) { true }
+ let(:discourse_events_enabled) { true }
context "when an admin is signed in" do
before { sign_in(admin) }
@@ -54,7 +54,7 @@ module Admin::DiscourseCalendar
end
context "when the calendar plugin is not enabled" do
- let(:calendar_enabled) { false }
+ let(:discourse_events_enabled) { false }
it "returns a 404 for an admin" do
sign_in(admin)
@@ -74,7 +74,7 @@ module Admin::DiscourseCalendar
describe "#disable" do
context "when the calendar plugin is enabled" do
- let(:calendar_enabled) { true }
+ let(:discourse_events_enabled) { true }
let(:dia_de_la_independencia) do
{ holiday_name: "Día de la Independencia", region_code: "mx" }
end
@@ -157,7 +157,7 @@ module Admin::DiscourseCalendar
describe "#enable" do
context "when the calendar plugin is enabled" do
- let(:calendar_enabled) { true }
+ let(:discourse_events_enabled) { true }
context "when an admin is signed in" do
before { sign_in(admin) }
diff --git a/plugins/discourse-events/spec/requests/api/events_spec.rb b/plugins/discourse-events/spec/requests/api/events_spec.rb
index d764946fa6f..6286c63df91 100644
--- a/plugins/discourse-events/spec/requests/api/events_spec.rb
+++ b/plugins/discourse-events/spec/requests/api/events_spec.rb
@@ -4,7 +4,7 @@ require "swagger_helper"
RSpec.describe "events" do
before do
Jobs.run_immediately!
- SiteSetting.calendar_enabled = true
+ SiteSetting.discourse_events_enabled = true
SiteSetting.discourse_post_event_enabled = true
end
diff --git a/plugins/discourse-events/spec/requests/calendar_subscriptions_spec.rb b/plugins/discourse-events/spec/requests/calendar_subscriptions_spec.rb
index 20c9fe9b291..683b93a8f63 100644
--- a/plugins/discourse-events/spec/requests/calendar_subscriptions_spec.rb
+++ b/plugins/discourse-events/spec/requests/calendar_subscriptions_spec.rb
@@ -4,7 +4,7 @@ describe "Calendar subscription feeds" do
fab!(:user)
before do
- SiteSetting.calendar_enabled = true
+ SiteSetting.discourse_events_enabled = true
SiteSetting.discourse_post_event_enabled = true
end
diff --git a/plugins/discourse-events/spec/requests/categories_controller_spec.rb b/plugins/discourse-events/spec/requests/categories_controller_spec.rb
index ed87ce90011..42bc35d592d 100644
--- a/plugins/discourse-events/spec/requests/categories_controller_spec.rb
+++ b/plugins/discourse-events/spec/requests/categories_controller_spec.rb
@@ -5,7 +5,7 @@ describe CategoriesController do
fab!(:category)
before do
- SiteSetting.calendar_enabled = true
+ SiteSetting.discourse_events_enabled = true
SiteSetting.discourse_post_event_enabled = true
DiscourseCalendar::Categories::Types::Events.configure_category(
category,
diff --git a/plugins/discourse-events/spec/requests/chat/livestream_channels_spec.rb b/plugins/discourse-events/spec/requests/chat/livestream_channels_spec.rb
index 96d0d20e593..6a68f539fc5 100644
--- a/plugins/discourse-events/spec/requests/chat/livestream_channels_spec.rb
+++ b/plugins/discourse-events/spec/requests/chat/livestream_channels_spec.rb
@@ -6,7 +6,7 @@ RSpec.describe "Livestream channel list serialization" do
fab!(:group) { Fabricate(:group).tap { |g| g.add(user) } }
before do
- SiteSetting.calendar_enabled = true
+ SiteSetting.discourse_events_enabled = true
SiteSetting.discourse_post_event_enabled = true
SiteSetting.chat_enabled = true
SiteSetting.chat_allowed_groups = Group::AUTO_GROUPS[:everyone]
diff --git a/plugins/discourse-events/spec/requests/events_controller_spec.rb b/plugins/discourse-events/spec/requests/events_controller_spec.rb
index 95aa6406402..5ce7a24b79a 100644
--- a/plugins/discourse-events/spec/requests/events_controller_spec.rb
+++ b/plugins/discourse-events/spec/requests/events_controller_spec.rb
@@ -4,7 +4,7 @@ module DiscoursePostEvent
describe EventsController do
before do
Jobs.run_immediately!
- SiteSetting.calendar_enabled = true
+ SiteSetting.discourse_events_enabled = true
SiteSetting.discourse_post_event_enabled = true
SiteSetting.displayed_invitees_limit = 3
end
@@ -898,7 +898,7 @@ module DiscoursePostEvent
describe "bulk invite respects capacity" do
before do
- SiteSetting.calendar_enabled = true
+ SiteSetting.discourse_events_enabled = true
SiteSetting.discourse_post_event_enabled = true
end
@@ -940,7 +940,7 @@ module DiscoursePostEvent
describe "#show" do
before do
- SiteSetting.calendar_enabled = true
+ SiteSetting.discourse_events_enabled = true
SiteSetting.discourse_post_event_enabled = true
end
@@ -1013,7 +1013,7 @@ module DiscoursePostEvent
describe "anonymous access to EventsController" do
before do
- SiteSetting.calendar_enabled = true
+ SiteSetting.discourse_events_enabled = true
SiteSetting.discourse_post_event_enabled = true
end
diff --git a/plugins/discourse-events/spec/requests/group_timezones_spec.rb b/plugins/discourse-events/spec/requests/group_timezones_spec.rb
index 0538db59f85..5d5bc149251 100644
--- a/plugins/discourse-events/spec/requests/group_timezones_spec.rb
+++ b/plugins/discourse-events/spec/requests/group_timezones_spec.rb
@@ -38,7 +38,7 @@ describe "group timezones serialization" do
before do
Jobs.run_immediately!
- SiteSetting.calendar_enabled = true
+ SiteSetting.discourse_events_enabled = true
public_group.add(public_group_user)
members_group.add(member)
diff --git a/plugins/discourse-events/spec/requests/invitees_controller_spec.rb b/plugins/discourse-events/spec/requests/invitees_controller_spec.rb
index 4c572fd4c85..c2a3a5cf089 100644
--- a/plugins/discourse-events/spec/requests/invitees_controller_spec.rb
+++ b/plugins/discourse-events/spec/requests/invitees_controller_spec.rb
@@ -4,7 +4,7 @@ module DiscoursePostEvent
describe InviteesController do
before do
Jobs.run_immediately!
- SiteSetting.calendar_enabled = true
+ SiteSetting.discourse_events_enabled = true
SiteSetting.discourse_post_event_enabled = true
sign_in(user)
end
@@ -407,7 +407,7 @@ module DiscoursePostEvent
describe "anonymous access to InviteesController" do
before do
- SiteSetting.calendar_enabled = true
+ SiteSetting.discourse_events_enabled = true
SiteSetting.discourse_post_event_enabled = true
end
diff --git a/plugins/discourse-events/spec/requests/livestream_controller_spec.rb b/plugins/discourse-events/spec/requests/livestream_controller_spec.rb
index 05acb406753..936d4fd57db 100644
--- a/plugins/discourse-events/spec/requests/livestream_controller_spec.rb
+++ b/plugins/discourse-events/spec/requests/livestream_controller_spec.rb
@@ -18,7 +18,7 @@ module DiscourseCalendar
end
before do
- SiteSetting.calendar_enabled = true
+ SiteSetting.discourse_events_enabled = true
SiteSetting.discourse_post_event_enabled = true
SiteSetting.livestream_zoom_enabled = true
SiteSetting.livestream_zoom_sdk_key = "sdk-key"
diff --git a/plugins/discourse-events/spec/requests/private_event_group_invitees_spec.rb b/plugins/discourse-events/spec/requests/private_event_group_invitees_spec.rb
index afa1756a0bd..90ca98d7b91 100644
--- a/plugins/discourse-events/spec/requests/private_event_group_invitees_spec.rb
+++ b/plugins/discourse-events/spec/requests/private_event_group_invitees_spec.rb
@@ -24,7 +24,7 @@ module DiscoursePostEvent
before do
Jobs.run_immediately!
- SiteSetting.calendar_enabled = true
+ SiteSetting.discourse_events_enabled = true
SiteSetting.discourse_post_event_enabled = true
invited_group.add(invitee_user)
end
diff --git a/plugins/discourse-events/spec/requests/site_spec.rb b/plugins/discourse-events/spec/requests/site_spec.rb
index 92065eb5d03..d294bbbf2a9 100644
--- a/plugins/discourse-events/spec/requests/site_spec.rb
+++ b/plugins/discourse-events/spec/requests/site_spec.rb
@@ -5,7 +5,7 @@ describe "calendar site additions" do
let(:admin) { Fabricate(:admin) }
before do
- SiteSetting.calendar_enabled = true
+ SiteSetting.discourse_events_enabled = true
DiscourseCalendar.users_on_holiday = [user.username]
end
diff --git a/plugins/discourse-events/spec/requests/sort_event_topics_spec.rb b/plugins/discourse-events/spec/requests/sort_event_topics_spec.rb
index 42c041386eb..a01a9893a56 100644
--- a/plugins/discourse-events/spec/requests/sort_event_topics_spec.rb
+++ b/plugins/discourse-events/spec/requests/sort_event_topics_spec.rb
@@ -21,7 +21,7 @@ RSpec.describe ListController do
before do
admin
- SiteSetting.calendar_enabled = true
+ SiteSetting.discourse_events_enabled = true
SiteSetting.sort_categories_by_event_start_date_enabled = true
end
diff --git a/plugins/discourse-events/spec/serializers/chat_channel_serializer_spec.rb b/plugins/discourse-events/spec/serializers/chat_channel_serializer_spec.rb
index 79ec0edbd5d..a322fbe2f34 100644
--- a/plugins/discourse-events/spec/serializers/chat_channel_serializer_spec.rb
+++ b/plugins/discourse-events/spec/serializers/chat_channel_serializer_spec.rb
@@ -7,7 +7,7 @@ RSpec.describe Chat::ChannelSerializer do
let(:first_post) { Fabricate(:post, topic:) }
before do
- SiteSetting.calendar_enabled = true
+ SiteSetting.discourse_events_enabled = true
SiteSetting.discourse_post_event_enabled = true
SiteSetting.chat_enabled = true
# avoid the onebox-warming job making a real request
diff --git a/plugins/discourse-events/spec/serializers/discourse_post_event/basic_event_serializer_spec.rb b/plugins/discourse-events/spec/serializers/discourse_post_event/basic_event_serializer_spec.rb
index 8a1d900e600..1ff8bedea52 100644
--- a/plugins/discourse-events/spec/serializers/discourse_post_event/basic_event_serializer_spec.rb
+++ b/plugins/discourse-events/spec/serializers/discourse_post_event/basic_event_serializer_spec.rb
@@ -2,7 +2,7 @@
describe DiscoursePostEvent::BasicEventSerializer do
before do
- SiteSetting.calendar_enabled = true
+ SiteSetting.discourse_events_enabled = true
SiteSetting.discourse_post_event_enabled = true
SiteSetting.discourse_post_event_allowed_custom_fields = "team"
Jobs.run_immediately!
diff --git a/plugins/discourse-events/spec/serializers/discourse_post_event/event_serializer_spec.rb b/plugins/discourse-events/spec/serializers/discourse_post_event/event_serializer_spec.rb
index 9601739c6ac..603746c88ec 100644
--- a/plugins/discourse-events/spec/serializers/discourse_post_event/event_serializer_spec.rb
+++ b/plugins/discourse-events/spec/serializers/discourse_post_event/event_serializer_spec.rb
@@ -3,7 +3,7 @@
describe DiscoursePostEvent::EventSerializer do
before do
Jobs.run_immediately!
- SiteSetting.calendar_enabled = true
+ SiteSetting.discourse_events_enabled = true
SiteSetting.discourse_post_event_enabled = true
end
diff --git a/plugins/discourse-events/spec/serializers/discourse_post_event/post_serializer_spec.rb b/plugins/discourse-events/spec/serializers/discourse_post_event/post_serializer_spec.rb
index 2577d89db2d..435f51b9171 100644
--- a/plugins/discourse-events/spec/serializers/discourse_post_event/post_serializer_spec.rb
+++ b/plugins/discourse-events/spec/serializers/discourse_post_event/post_serializer_spec.rb
@@ -3,7 +3,7 @@
describe PostSerializer do
before do
Jobs.run_immediately!
- SiteSetting.calendar_enabled = true
+ SiteSetting.discourse_events_enabled = true
SiteSetting.discourse_post_event_enabled = true
end
diff --git a/plugins/discourse-events/spec/serializers/post_serializer_spec.rb b/plugins/discourse-events/spec/serializers/post_serializer_spec.rb
index 1970e2f3152..b11bd7eee51 100644
--- a/plugins/discourse-events/spec/serializers/post_serializer_spec.rb
+++ b/plugins/discourse-events/spec/serializers/post_serializer_spec.rb
@@ -3,7 +3,7 @@
describe PostSerializer do
before do
Jobs.run_immediately!
- SiteSetting.calendar_enabled = true
+ SiteSetting.discourse_events_enabled = true
end
it "includes calendar events" do
diff --git a/plugins/discourse-events/spec/serializers/topic_list_item_serializer_spec.rb b/plugins/discourse-events/spec/serializers/topic_list_item_serializer_spec.rb
index 402f628e5a3..61c0e25c6fd 100644
--- a/plugins/discourse-events/spec/serializers/topic_list_item_serializer_spec.rb
+++ b/plugins/discourse-events/spec/serializers/topic_list_item_serializer_spec.rb
@@ -10,7 +10,7 @@ RSpec.describe TopicListItemSerializer do
before do
freeze_time(Time.utc(2020, 4, 24, 14, 10))
Jobs.run_immediately!
- SiteSetting.calendar_enabled = true
+ SiteSetting.discourse_events_enabled = true
SiteSetting.discourse_post_event_enabled = true
DiscoursePostEvent::Event.create!(
id: first_post.id,
diff --git a/plugins/discourse-events/spec/serializers/topic_view_serializer_spec.rb b/plugins/discourse-events/spec/serializers/topic_view_serializer_spec.rb
index 8a613808efb..939f58b11de 100644
--- a/plugins/discourse-events/spec/serializers/topic_view_serializer_spec.rb
+++ b/plugins/discourse-events/spec/serializers/topic_view_serializer_spec.rb
@@ -12,7 +12,7 @@ RSpec.describe TopicViewSerializer do
before do
freeze_time(Time.utc(2020, 4, 24, 14, 10))
Jobs.run_immediately!
- SiteSetting.calendar_enabled = true
+ SiteSetting.discourse_events_enabled = true
SiteSetting.discourse_post_event_enabled = true
end
diff --git a/plugins/discourse-events/spec/serializers/user_serializer_spec.rb b/plugins/discourse-events/spec/serializers/user_serializer_spec.rb
index 070cf8a3d50..9fff3b17777 100644
--- a/plugins/discourse-events/spec/serializers/user_serializer_spec.rb
+++ b/plugins/discourse-events/spec/serializers/user_serializer_spec.rb
@@ -6,7 +6,7 @@ describe UserSerializer do
subject(:json) { described_class.new(user, scope: guardian).as_json }
before do
- SiteSetting.calendar_enabled = true
+ SiteSetting.discourse_events_enabled = true
user.upsert_custom_fields(DiscourseCalendar::REGION_CUSTOM_FIELD => "uk")
end
diff --git a/plugins/discourse-events/spec/services/discourse_calendar/categories/types/events_spec.rb b/plugins/discourse-events/spec/services/discourse_calendar/categories/types/events_spec.rb
index 3940a4d623d..bdef245084a 100644
--- a/plugins/discourse-events/spec/services/discourse_calendar/categories/types/events_spec.rb
+++ b/plugins/discourse-events/spec/services/discourse_calendar/categories/types/events_spec.rb
@@ -6,12 +6,12 @@ RSpec.describe DiscourseCalendar::Categories::Types::Events do
describe ".enable_plugin" do
it "enables calendar and post-event site settings" do
- SiteSetting.calendar_enabled = false
+ SiteSetting.discourse_events_enabled = false
SiteSetting.discourse_post_event_enabled = false
described_class.enable_plugin
- expect(SiteSetting.calendar_enabled).to eq(true)
+ expect(SiteSetting.discourse_events_enabled).to eq(true)
expect(SiteSetting.discourse_post_event_enabled).to eq(true)
end
end
@@ -190,7 +190,7 @@ RSpec.describe DiscourseCalendar::Categories::Types::Events do
)
expect(result).to be_a_success
- expect(SiteSetting.calendar_enabled).to eq(true)
+ expect(SiteSetting.discourse_events_enabled).to eq(true)
expect(SiteSetting.discourse_post_event_enabled).to eq(true)
expect(SiteSetting.events_calendar_categories).to include(category.id.to_s)
expect(SiteSetting.discourse_post_event_allowed_on_groups).to eq("1|2")
diff --git a/plugins/discourse-events/spec/services/discourse_calendar/livestream/prepare_zoom_join_spec.rb b/plugins/discourse-events/spec/services/discourse_calendar/livestream/prepare_zoom_join_spec.rb
index 4e36d4f7aa0..4ab1c226b5e 100644
--- a/plugins/discourse-events/spec/services/discourse_calendar/livestream/prepare_zoom_join_spec.rb
+++ b/plugins/discourse-events/spec/services/discourse_calendar/livestream/prepare_zoom_join_spec.rb
@@ -27,7 +27,7 @@ RSpec.describe DiscourseCalendar::Livestream::PrepareZoomJoin do
let(:params) { { topic_id: topic.id } }
before do
- SiteSetting.calendar_enabled = true
+ SiteSetting.discourse_events_enabled = true
SiteSetting.discourse_post_event_enabled = true
SiteSetting.livestream_zoom_enabled = true
SiteSetting.livestream_zoom_sdk_key = "sdk-key"
diff --git a/plugins/discourse-events/spec/services/discourse_post_event/bulk_invite_spec.rb b/plugins/discourse-events/spec/services/discourse_post_event/bulk_invite_spec.rb
index a8cb6c572cc..f6c2fd96f4f 100644
--- a/plugins/discourse-events/spec/services/discourse_post_event/bulk_invite_spec.rb
+++ b/plugins/discourse-events/spec/services/discourse_post_event/bulk_invite_spec.rb
@@ -20,7 +20,7 @@ RSpec.describe(DiscoursePostEvent::BulkInvite) do
before do
Jobs.run_immediately!
- SiteSetting.calendar_enabled = true
+ SiteSetting.discourse_events_enabled = true
SiteSetting.discourse_post_event_enabled = true
end
diff --git a/plugins/discourse-events/spec/services/discourse_post_event/create_invitee_spec.rb b/plugins/discourse-events/spec/services/discourse_post_event/create_invitee_spec.rb
index 91821cf7e8f..0ffaa045265 100644
--- a/plugins/discourse-events/spec/services/discourse_post_event/create_invitee_spec.rb
+++ b/plugins/discourse-events/spec/services/discourse_post_event/create_invitee_spec.rb
@@ -23,7 +23,7 @@ RSpec.describe(DiscoursePostEvent::CreateInvitee) do
before do
Jobs.run_immediately!
- SiteSetting.calendar_enabled = true
+ SiteSetting.discourse_events_enabled = true
SiteSetting.discourse_post_event_enabled = true
end
diff --git a/plugins/discourse-events/spec/services/discourse_post_event/csv_bulk_invite_spec.rb b/plugins/discourse-events/spec/services/discourse_post_event/csv_bulk_invite_spec.rb
index ee9a75e4c54..eaa117503a3 100644
--- a/plugins/discourse-events/spec/services/discourse_post_event/csv_bulk_invite_spec.rb
+++ b/plugins/discourse-events/spec/services/discourse_post_event/csv_bulk_invite_spec.rb
@@ -20,7 +20,7 @@ RSpec.describe(DiscoursePostEvent::CsvBulkInvite) do
before do
Jobs.run_immediately!
- SiteSetting.calendar_enabled = true
+ SiteSetting.discourse_events_enabled = true
SiteSetting.discourse_post_event_enabled = true
end
diff --git a/plugins/discourse-events/spec/services/discourse_post_event/destroy_event_spec.rb b/plugins/discourse-events/spec/services/discourse_post_event/destroy_event_spec.rb
index 81e762b72b9..ecbb6a64e30 100644
--- a/plugins/discourse-events/spec/services/discourse_post_event/destroy_event_spec.rb
+++ b/plugins/discourse-events/spec/services/discourse_post_event/destroy_event_spec.rb
@@ -18,7 +18,7 @@ RSpec.describe(DiscoursePostEvent::DestroyEvent) do
before do
Jobs.run_immediately!
- SiteSetting.calendar_enabled = true
+ SiteSetting.discourse_events_enabled = true
SiteSetting.discourse_post_event_enabled = true
end
diff --git a/plugins/discourse-events/spec/services/discourse_post_event/destroy_invitee_spec.rb b/plugins/discourse-events/spec/services/discourse_post_event/destroy_invitee_spec.rb
index b1a16b0ef4b..4511195d1a0 100644
--- a/plugins/discourse-events/spec/services/discourse_post_event/destroy_invitee_spec.rb
+++ b/plugins/discourse-events/spec/services/discourse_post_event/destroy_invitee_spec.rb
@@ -26,7 +26,7 @@ RSpec.describe(DiscoursePostEvent::DestroyInvitee) do
before do
Jobs.run_immediately!
- SiteSetting.calendar_enabled = true
+ SiteSetting.discourse_events_enabled = true
SiteSetting.discourse_post_event_enabled = true
end
diff --git a/plugins/discourse-events/spec/services/discourse_post_event/event/action/attributes_from_raw_spec.rb b/plugins/discourse-events/spec/services/discourse_post_event/event/action/attributes_from_raw_spec.rb
index 18de7ae79a2..925bc65737a 100644
--- a/plugins/discourse-events/spec/services/discourse_post_event/event/action/attributes_from_raw_spec.rb
+++ b/plugins/discourse-events/spec/services/discourse_post_event/event/action/attributes_from_raw_spec.rb
@@ -7,7 +7,7 @@ RSpec.describe DiscoursePostEvent::Event::Action::AttributesFromRaw do
let(:raw_event) { { name: "My event", start: "2030-04-24 14:15", timezone: "Europe/Paris" } }
before do
- SiteSetting.calendar_enabled = true
+ SiteSetting.discourse_events_enabled = true
SiteSetting.discourse_post_event_enabled = true
end
diff --git a/plugins/discourse-events/spec/services/discourse_post_event/event/action/resolve_image_upload_spec.rb b/plugins/discourse-events/spec/services/discourse_post_event/event/action/resolve_image_upload_spec.rb
index 35837be395c..4b598fd61f7 100644
--- a/plugins/discourse-events/spec/services/discourse_post_event/event/action/resolve_image_upload_spec.rb
+++ b/plugins/discourse-events/spec/services/discourse_post_event/event/action/resolve_image_upload_spec.rb
@@ -9,7 +9,7 @@ RSpec.describe DiscoursePostEvent::Event::Action::ResolveImageUpload do
let(:image) { nil }
before do
- SiteSetting.calendar_enabled = true
+ SiteSetting.discourse_events_enabled = true
SiteSetting.discourse_post_event_enabled = true
end
diff --git a/plugins/discourse-events/spec/services/discourse_post_event/event/sync_from_post_spec.rb b/plugins/discourse-events/spec/services/discourse_post_event/event/sync_from_post_spec.rb
index 3b3e0f32470..68e9a4ce04f 100644
--- a/plugins/discourse-events/spec/services/discourse_post_event/event/sync_from_post_spec.rb
+++ b/plugins/discourse-events/spec/services/discourse_post_event/event/sync_from_post_spec.rb
@@ -20,7 +20,7 @@ RSpec.describe DiscoursePostEvent::Event::SyncFromPost do
end
before do
- SiteSetting.calendar_enabled = true
+ SiteSetting.discourse_events_enabled = true
SiteSetting.discourse_post_event_enabled = true
Jobs.run_immediately!
diff --git a/plugins/discourse-events/spec/services/discourse_post_event/invite_spec.rb b/plugins/discourse-events/spec/services/discourse_post_event/invite_spec.rb
index f4f559c6cd0..dfb64429810 100644
--- a/plugins/discourse-events/spec/services/discourse_post_event/invite_spec.rb
+++ b/plugins/discourse-events/spec/services/discourse_post_event/invite_spec.rb
@@ -19,7 +19,7 @@ RSpec.describe(DiscoursePostEvent::Invite) do
before do
Jobs.run_immediately!
- SiteSetting.calendar_enabled = true
+ SiteSetting.discourse_events_enabled = true
SiteSetting.discourse_post_event_enabled = true
end
diff --git a/plugins/discourse-events/spec/services/discourse_post_event/list_invitees_spec.rb b/plugins/discourse-events/spec/services/discourse_post_event/list_invitees_spec.rb
index 2f2a508ce3d..72b527b834b 100644
--- a/plugins/discourse-events/spec/services/discourse_post_event/list_invitees_spec.rb
+++ b/plugins/discourse-events/spec/services/discourse_post_event/list_invitees_spec.rb
@@ -21,7 +21,7 @@ RSpec.describe(DiscoursePostEvent::ListInvitees) do
before do
Jobs.run_immediately!
- SiteSetting.calendar_enabled = true
+ SiteSetting.discourse_events_enabled = true
SiteSetting.discourse_post_event_enabled = true
event.create_invitees(
diff --git a/plugins/discourse-events/spec/services/discourse_post_event/update_invitee_spec.rb b/plugins/discourse-events/spec/services/discourse_post_event/update_invitee_spec.rb
index a5a2a52d1f7..8583a8d1489 100644
--- a/plugins/discourse-events/spec/services/discourse_post_event/update_invitee_spec.rb
+++ b/plugins/discourse-events/spec/services/discourse_post_event/update_invitee_spec.rb
@@ -31,7 +31,7 @@ RSpec.describe(DiscoursePostEvent::UpdateInvitee) do
before do
Jobs.run_immediately!
- SiteSetting.calendar_enabled = true
+ SiteSetting.discourse_events_enabled = true
SiteSetting.discourse_post_event_enabled = true
end
diff --git a/plugins/discourse-events/spec/system/anonymous_user_rsvp_event_spec.rb b/plugins/discourse-events/spec/system/anonymous_user_rsvp_event_spec.rb
index e3b0a199fd1..2101f1294aa 100644
--- a/plugins/discourse-events/spec/system/anonymous_user_rsvp_event_spec.rb
+++ b/plugins/discourse-events/spec/system/anonymous_user_rsvp_event_spec.rb
@@ -9,7 +9,7 @@ describe "Anonymous user RSVPing to an event" do
let(:login_page) { PageObjects::Pages::Login.new }
before do
- SiteSetting.calendar_enabled = true
+ SiteSetting.discourse_events_enabled = true
SiteSetting.discourse_post_event_enabled = true
SiteSetting.discourse_post_event_allowed_on_groups = Group::AUTO_GROUPS[:staff]
EmailToken.confirm(Fabricate(:email_token, user:).token)
diff --git a/plugins/discourse-events/spec/system/calendar_first_day_of_week_spec.rb b/plugins/discourse-events/spec/system/calendar_first_day_of_week_spec.rb
index 50dbc9ca788..d3cf6000401 100644
--- a/plugins/discourse-events/spec/system/calendar_first_day_of_week_spec.rb
+++ b/plugins/discourse-events/spec/system/calendar_first_day_of_week_spec.rb
@@ -6,7 +6,7 @@ describe "Calendar first day of week" do
let(:upcoming_events) { PageObjects::Pages::DiscourseCalendar::UpcomingEvents.new }
before do
- SiteSetting.calendar_enabled = true
+ SiteSetting.discourse_events_enabled = true
SiteSetting.discourse_post_event_enabled = true
sign_in(admin)
end
diff --git a/plugins/discourse-events/spec/system/category_calendar_spec.rb b/plugins/discourse-events/spec/system/category_calendar_spec.rb
index ef6b0dd2873..9ca895b3369 100644
--- a/plugins/discourse-events/spec/system/category_calendar_spec.rb
+++ b/plugins/discourse-events/spec/system/category_calendar_spec.rb
@@ -9,7 +9,7 @@ describe "Category calendar" do
context "with events_calendar_categories" do
before do
- SiteSetting.calendar_enabled = true
+ SiteSetting.discourse_events_enabled = true
SiteSetting.discourse_post_event_enabled = true
SiteSetting.events_calendar_categories = category.id.to_s
@@ -59,7 +59,7 @@ describe "Category calendar" do
context "with calendar_categories" do
before do
- SiteSetting.calendar_enabled = true
+ SiteSetting.discourse_events_enabled = true
SiteSetting.discourse_post_event_enabled = true
# postId should be irrelevant now, it's a legacy property
SiteSetting.calendar_categories = "categoryId=#{category.id};postId=2313"
@@ -99,7 +99,7 @@ describe "Category calendar" do
context "with color mapping", time: Time.utc(2026, 6, 2, 19, 00) do
before do
- SiteSetting.calendar_enabled = true
+ SiteSetting.discourse_events_enabled = true
SiteSetting.discourse_post_event_enabled = true
sign_in(user)
end
diff --git a/plugins/discourse-events/spec/system/category_event_sorting_settings_spec.rb b/plugins/discourse-events/spec/system/category_event_sorting_settings_spec.rb
index 7e8cdaa3668..06b9452b71d 100644
--- a/plugins/discourse-events/spec/system/category_event_sorting_settings_spec.rb
+++ b/plugins/discourse-events/spec/system/category_event_sorting_settings_spec.rb
@@ -10,7 +10,7 @@ RSpec.describe "Event Sorting Category Settings" do
let(:toasts) { PageObjects::Components::Toasts.new }
before do
- SiteSetting.calendar_enabled = true
+ SiteSetting.discourse_events_enabled = true
SiteSetting.sort_categories_by_event_start_date_enabled = true
SiteSetting.disable_resorting_on_categories_enabled = true
sign_in(admin)
diff --git a/plugins/discourse-events/spec/system/composer/create_event_action_spec.rb b/plugins/discourse-events/spec/system/composer/create_event_action_spec.rb
index dceb07d1b0f..72bf5d157be 100644
--- a/plugins/discourse-events/spec/system/composer/create_event_action_spec.rb
+++ b/plugins/discourse-events/spec/system/composer/create_event_action_spec.rb
@@ -8,7 +8,7 @@ describe "Composer - Create event action" do
let(:composer) { PageObjects::Components::Composer.new }
before do
- SiteSetting.calendar_enabled = true
+ SiteSetting.discourse_events_enabled = true
SiteSetting.discourse_post_event_enabled = true
DiscourseCalendar::Categories::Types::Events.configure_category(
events_category,
diff --git a/plugins/discourse-events/spec/system/composer/event_location_spec.rb b/plugins/discourse-events/spec/system/composer/event_location_spec.rb
index 66671236b75..742f0b43070 100644
--- a/plugins/discourse-events/spec/system/composer/event_location_spec.rb
+++ b/plugins/discourse-events/spec/system/composer/event_location_spec.rb
@@ -11,7 +11,7 @@ describe "Composer - Event location" do
MD
before do
- SiteSetting.calendar_enabled = true
+ SiteSetting.discourse_events_enabled = true
SiteSetting.discourse_post_event_enabled = true
sign_in(admin)
end
diff --git a/plugins/discourse-events/spec/system/composer/event_preview_focus_spec.rb b/plugins/discourse-events/spec/system/composer/event_preview_focus_spec.rb
index 97f46522a75..be1acd6c99d 100644
--- a/plugins/discourse-events/spec/system/composer/event_preview_focus_spec.rb
+++ b/plugins/discourse-events/spec/system/composer/event_preview_focus_spec.rb
@@ -6,7 +6,7 @@ describe "Composer - Event preview focus" do
let(:composer) { PageObjects::Components::Composer.new }
before do
- SiteSetting.calendar_enabled = true
+ SiteSetting.discourse_events_enabled = true
SiteSetting.discourse_post_event_enabled = true
sign_in(admin)
end
diff --git a/plugins/discourse-events/spec/system/composer/prosemirror_event_spec.rb b/plugins/discourse-events/spec/system/composer/prosemirror_event_spec.rb
index 2e8cf9395be..3b6aa33432b 100644
--- a/plugins/discourse-events/spec/system/composer/prosemirror_event_spec.rb
+++ b/plugins/discourse-events/spec/system/composer/prosemirror_event_spec.rb
@@ -4,7 +4,7 @@ describe "Composer - ProseMirror - Event Editor" do
include_context "with prosemirror editor"
before do
- SiteSetting.calendar_enabled = true
+ SiteSetting.discourse_events_enabled = true
SiteSetting.discourse_post_event_enabled = true
end
diff --git a/plugins/discourse-events/spec/system/desktop_topic_livestream_authenticated_spec.rb b/plugins/discourse-events/spec/system/desktop_topic_livestream_authenticated_spec.rb
index 562f389c098..34a5424701f 100644
--- a/plugins/discourse-events/spec/system/desktop_topic_livestream_authenticated_spec.rb
+++ b/plugins/discourse-events/spec/system/desktop_topic_livestream_authenticated_spec.rb
@@ -8,7 +8,7 @@ describe "Discourse Livestream - Topic Livestream - Desktop - Authenticated" do
let(:topic_livestream) { PageObjects::Pages::TopicLivestream.new }
before do
- SiteSetting.calendar_enabled = true
+ SiteSetting.discourse_events_enabled = true
SiteSetting.chat_enabled = true
SiteSetting.discourse_post_event_enabled = true
SiteSetting.discourse_post_event_allowed_on_groups = Group::AUTO_GROUPS[:everyone].to_s
diff --git a/plugins/discourse-events/spec/system/disable_sort_spec.rb b/plugins/discourse-events/spec/system/disable_sort_spec.rb
index d589a2166df..71bab13a249 100644
--- a/plugins/discourse-events/spec/system/disable_sort_spec.rb
+++ b/plugins/discourse-events/spec/system/disable_sort_spec.rb
@@ -5,7 +5,7 @@ describe "Disabling topic list sorting" do
let(:category_page) { PageObjects::Pages::Category.new }
before do
- SiteSetting.calendar_enabled = true
+ SiteSetting.discourse_events_enabled = true
Fabricate.times(2, :topic, category:)
end
diff --git a/plugins/discourse-events/spec/system/event_card_spec.rb b/plugins/discourse-events/spec/system/event_card_spec.rb
index 821bf75afbd..d9f18450b78 100644
--- a/plugins/discourse-events/spec/system/event_card_spec.rb
+++ b/plugins/discourse-events/spec/system/event_card_spec.rb
@@ -8,7 +8,7 @@ describe "Event card" do
let(:category_page) { PageObjects::Pages::Category.new }
before do
- SiteSetting.calendar_enabled = true
+ SiteSetting.discourse_events_enabled = true
SiteSetting.discourse_post_event_enabled = true
SiteSetting.events_calendar_categories = category.id.to_s
sign_in(admin)
diff --git a/plugins/discourse-events/spec/system/events_category_type_setup_spec.rb b/plugins/discourse-events/spec/system/events_category_type_setup_spec.rb
index 981da50bb27..c2f7c14090c 100644
--- a/plugins/discourse-events/spec/system/events_category_type_setup_spec.rb
+++ b/plugins/discourse-events/spec/system/events_category_type_setup_spec.rb
@@ -9,7 +9,7 @@ RSpec.describe "Events Category Type Setup" do
let(:toast) { PageObjects::Components::Toasts.new }
before do
- SiteSetting.calendar_enabled = true
+ SiteSetting.discourse_events_enabled = true
SiteSetting.discourse_post_event_enabled = true
sign_in(admin)
end
@@ -34,7 +34,7 @@ RSpec.describe "Events Category Type Setup" do
expect(page).to have_content(I18n.t("js.category.edit_dialog_title", categoryName: "Events"))
expect(page).to have_css(".d-nav-submenu__tabs .edit-category-events")
- expect(SiteSetting.calendar_enabled).to eq(true)
+ expect(SiteSetting.discourse_events_enabled).to eq(true)
expect(SiteSetting.discourse_post_event_enabled).to eq(true)
category = Category.find_by(name: "Events")
diff --git a/plugins/discourse-events/spec/system/group_timezones_spec.rb b/plugins/discourse-events/spec/system/group_timezones_spec.rb
index 66f510bc3a1..60ccf40befa 100644
--- a/plugins/discourse-events/spec/system/group_timezones_spec.rb
+++ b/plugins/discourse-events/spec/system/group_timezones_spec.rb
@@ -15,7 +15,7 @@ describe "Group timezones feature" do
before do
Jobs.run_immediately!
- SiteSetting.calendar_enabled = true
+ SiteSetting.discourse_events_enabled = true
end
let(:post) { create_post(raw: <<~RAW) }
diff --git a/plugins/discourse-events/spec/system/livestream_calendar_event_spec.rb b/plugins/discourse-events/spec/system/livestream_calendar_event_spec.rb
index b22ca415976..24c726bd628 100644
--- a/plugins/discourse-events/spec/system/livestream_calendar_event_spec.rb
+++ b/plugins/discourse-events/spec/system/livestream_calendar_event_spec.rb
@@ -9,7 +9,7 @@ describe "Discourse Livestream - Topic Livestream with events - Authenticated" d
let(:topic_livestream) { PageObjects::Pages::TopicLivestream.new }
before do
- SiteSetting.calendar_enabled = true
+ SiteSetting.discourse_events_enabled = true
SiteSetting.chat_enabled = true
SiteSetting.discourse_post_event_enabled = true
SiteSetting.discourse_post_event_allowed_on_groups = group.id.to_s
diff --git a/plugins/discourse-events/spec/system/livestream_zoom_webinar_spec.rb b/plugins/discourse-events/spec/system/livestream_zoom_webinar_spec.rb
index 16fdd9e3451..eb3545c1c81 100644
--- a/plugins/discourse-events/spec/system/livestream_zoom_webinar_spec.rb
+++ b/plugins/discourse-events/spec/system/livestream_zoom_webinar_spec.rb
@@ -9,7 +9,7 @@ describe "Discourse Livestream - Livestream with Zoom webinar" do
let(:topic_livestream) { PageObjects::Pages::TopicLivestream.new }
before do
- SiteSetting.calendar_enabled = true
+ SiteSetting.discourse_events_enabled = true
SiteSetting.chat_enabled = true
SiteSetting.discourse_post_event_enabled = true
SiteSetting.discourse_post_event_allowed_on_groups = group.id.to_s
diff --git a/plugins/discourse-events/spec/system/mobile_topic_livestream_authenticated_spec.rb b/plugins/discourse-events/spec/system/mobile_topic_livestream_authenticated_spec.rb
index 2c56d9e0044..664f9e4f372 100644
--- a/plugins/discourse-events/spec/system/mobile_topic_livestream_authenticated_spec.rb
+++ b/plugins/discourse-events/spec/system/mobile_topic_livestream_authenticated_spec.rb
@@ -9,7 +9,7 @@ describe "Discourse Livestream - Topic Livestream - Mobile - Authenticated", mob
let(:topic_livestream) { PageObjects::Pages::TopicLivestream.new }
before do
- SiteSetting.calendar_enabled = true
+ SiteSetting.discourse_events_enabled = true
SiteSetting.chat_enabled = true
SiteSetting.discourse_post_event_enabled = true
topic_livestream.cache_livestream_onebox
diff --git a/plugins/discourse-events/spec/system/post_calendar_spec.rb b/plugins/discourse-events/spec/system/post_calendar_spec.rb
index a3a4242b61c..516aea22135 100644
--- a/plugins/discourse-events/spec/system/post_calendar_spec.rb
+++ b/plugins/discourse-events/spec/system/post_calendar_spec.rb
@@ -9,7 +9,7 @@ describe "Post calendar" do
before do
Jobs.run_immediately!
- SiteSetting.calendar_enabled = true
+ SiteSetting.discourse_events_enabled = true
SiteSetting.discourse_post_event_enabled = true
SiteSetting.holiday_calendar_topic_id = calendar_post.topic.id
sign_in(viewer)
diff --git a/plugins/discourse-events/spec/system/post_event_spec.rb b/plugins/discourse-events/spec/system/post_event_spec.rb
index 6a1903c6615..dc74e1f081e 100644
--- a/plugins/discourse-events/spec/system/post_event_spec.rb
+++ b/plugins/discourse-events/spec/system/post_event_spec.rb
@@ -11,7 +11,7 @@ describe "Post event" do
let(:bulk_invite_modal_page) { PageObjects::Pages::DiscourseCalendar::BulkInviteModal.new }
before do
- SiteSetting.calendar_enabled = true
+ SiteSetting.discourse_events_enabled = true
SiteSetting.discourse_post_event_enabled = true
SiteSetting.discourse_post_event_allowed_custom_fields = "custom"
sign_in(admin)
diff --git a/plugins/discourse-events/spec/system/upcoming_events_spec.rb b/plugins/discourse-events/spec/system/upcoming_events_spec.rb
index 5caa2e9c496..5efb54d836b 100644
--- a/plugins/discourse-events/spec/system/upcoming_events_spec.rb
+++ b/plugins/discourse-events/spec/system/upcoming_events_spec.rb
@@ -10,7 +10,7 @@ describe "Upcoming Events" do
let(:upcoming_events) { PageObjects::Pages::DiscourseCalendar::UpcomingEvents.new }
before do
- SiteSetting.calendar_enabled = true
+ SiteSetting.discourse_events_enabled = true
SiteSetting.discourse_post_event_enabled = true
SiteSetting.calendar_upcoming_events_default_view = "month"
sign_in(admin)
diff --git a/plugins/discourse-events/test/javascripts/acceptance/admin-holidays-test.js b/plugins/discourse-events/test/javascripts/acceptance/admin-holidays-test.js
index c79a3e6ca8a..ffb166b9386 100644
--- a/plugins/discourse-events/test/javascripts/acceptance/admin-holidays-test.js
+++ b/plugins/discourse-events/test/javascripts/acceptance/admin-holidays-test.js
@@ -6,7 +6,7 @@ import selectKit from "discourse/tests/helpers/select-kit-helper";
acceptance("Admin - Events - Holidays", function (needs) {
needs.user();
needs.settings({
- calendar_enabled: true,
+ discourse_events_enabled: true,
available_locales: [{ name: "English", value: "en" }],
});
diff --git a/plugins/discourse-events/test/javascripts/acceptance/calendar-click-to-create-test.js b/plugins/discourse-events/test/javascripts/acceptance/calendar-click-to-create-test.js
index 353774e6048..71f8ff52865 100644
--- a/plugins/discourse-events/test/javascripts/acceptance/calendar-click-to-create-test.js
+++ b/plugins/discourse-events/test/javascripts/acceptance/calendar-click-to-create-test.js
@@ -11,7 +11,7 @@ function noEventsPretender(server, helper) {
}
const SETTINGS = {
- calendar_enabled: true,
+ discourse_events_enabled: true,
discourse_post_event_enabled: true,
events_calendar_categories: "1",
calendar_categories: "",
diff --git a/plugins/discourse-events/test/javascripts/acceptance/category-calendar-navigation-test.js b/plugins/discourse-events/test/javascripts/acceptance/category-calendar-navigation-test.js
index 62744014acb..6747c12c5e0 100644
--- a/plugins/discourse-events/test/javascripts/acceptance/category-calendar-navigation-test.js
+++ b/plugins/discourse-events/test/javascripts/acceptance/category-calendar-navigation-test.js
@@ -5,7 +5,7 @@ import { acceptance } from "discourse/tests/helpers/qunit-helpers";
acceptance("Category Events Calendar Navigation", function (needs) {
needs.user();
needs.settings({
- calendar_enabled: true,
+ discourse_events_enabled: true,
discourse_post_event_enabled: true,
events_calendar_categories: "1|2",
});
diff --git a/plugins/discourse-events/test/javascripts/acceptance/category-calendar-subcategories-test.js b/plugins/discourse-events/test/javascripts/acceptance/category-calendar-subcategories-test.js
index d6a90852be0..bef4ba6c516 100644
--- a/plugins/discourse-events/test/javascripts/acceptance/category-calendar-subcategories-test.js
+++ b/plugins/discourse-events/test/javascripts/acceptance/category-calendar-subcategories-test.js
@@ -7,7 +7,7 @@ import { acceptance } from "discourse/tests/helpers/qunit-helpers";
acceptance("Category Events Calendar - subcategory filter", function (needs) {
needs.user();
needs.settings({
- calendar_enabled: true,
+ discourse_events_enabled: true,
discourse_post_event_enabled: true,
events_calendar_categories: "1",
calendar_categories: "",
diff --git a/plugins/discourse-events/test/javascripts/acceptance/category-events-calendar-outlet-test.js b/plugins/discourse-events/test/javascripts/acceptance/category-events-calendar-outlet-test.js
index d45f6ee1050..e10dfd2dabf 100644
--- a/plugins/discourse-events/test/javascripts/acceptance/category-events-calendar-outlet-test.js
+++ b/plugins/discourse-events/test/javascripts/acceptance/category-events-calendar-outlet-test.js
@@ -35,7 +35,7 @@ const eventsPretender = (server, helper) => {
acceptance("Category Events Calendar Outlet None", function (needs) {
needs.user();
needs.settings({
- calendar_enabled: true,
+ discourse_events_enabled: true,
discourse_post_event_enabled: true,
events_calendar_categories: "1",
calendar_categories: "",
@@ -60,7 +60,7 @@ acceptance("Category Events Calendar Outlet None", function (needs) {
acceptance("Category Events Calendar Outlet Container Top", function (needs) {
needs.user();
needs.settings({
- calendar_enabled: true,
+ discourse_events_enabled: true,
discourse_post_event_enabled: true,
events_calendar_categories: "1",
calendar_categories: "",
@@ -87,7 +87,7 @@ acceptance(
function (needs) {
needs.user();
needs.settings({
- calendar_enabled: true,
+ discourse_events_enabled: true,
discourse_post_event_enabled: true,
events_calendar_categories: "1",
calendar_categories: "",
@@ -109,7 +109,7 @@ acceptance(
function (needs) {
needs.user();
needs.settings({
- calendar_enabled: true,
+ discourse_events_enabled: true,
discourse_post_event_enabled: true,
events_calendar_categories: "1",
calendar_categories: "",
diff --git a/plugins/discourse-events/test/javascripts/acceptance/category-events-calendar-test.js b/plugins/discourse-events/test/javascripts/acceptance/category-events-calendar-test.js
index 3a2a9aeaeff..d91c21b3874 100644
--- a/plugins/discourse-events/test/javascripts/acceptance/category-events-calendar-test.js
+++ b/plugins/discourse-events/test/javascripts/acceptance/category-events-calendar-test.js
@@ -6,7 +6,7 @@ import I18n from "discourse-i18n";
acceptance("Category Events Calendar", function (needs) {
needs.user();
needs.settings({
- calendar_enabled: true,
+ discourse_events_enabled: true,
discourse_post_event_enabled: true,
events_calendar_categories: "1",
calendar_categories: "",
diff --git a/plugins/discourse-events/test/javascripts/acceptance/create-event-composer-action-test.js b/plugins/discourse-events/test/javascripts/acceptance/create-event-composer-action-test.js
index a13897d9606..c644972cb36 100644
--- a/plugins/discourse-events/test/javascripts/acceptance/create-event-composer-action-test.js
+++ b/plugins/discourse-events/test/javascripts/acceptance/create-event-composer-action-test.js
@@ -18,7 +18,7 @@ function markCategoryAsEvents(categoryId) {
acceptance("Create event composer action", function (needs) {
needs.user({ can_create_discourse_post_event: true });
needs.settings({
- calendar_enabled: true,
+ discourse_events_enabled: true,
discourse_post_event_enabled: true,
discourse_post_event_allowed_on_groups: "",
discourse_post_event_allowed_custom_fields: "",
@@ -282,7 +282,7 @@ acceptance(
function (needs) {
needs.user({ can_create_discourse_post_event: false });
needs.settings({
- calendar_enabled: true,
+ discourse_events_enabled: true,
discourse_post_event_enabled: true,
discourse_post_event_allowed_on_groups: "",
discourse_post_event_allowed_custom_fields: "",
diff --git a/plugins/discourse-events/test/javascripts/acceptance/events-create-topic-button-test.js b/plugins/discourse-events/test/javascripts/acceptance/events-create-topic-button-test.js
index bd0a19710f8..00a8be29893 100644
--- a/plugins/discourse-events/test/javascripts/acceptance/events-create-topic-button-test.js
+++ b/plugins/discourse-events/test/javascripts/acceptance/events-create-topic-button-test.js
@@ -14,7 +14,7 @@ acceptance(
function (needs) {
needs.user({ can_create_discourse_post_event: true });
needs.settings({
- calendar_enabled: true,
+ discourse_events_enabled: true,
discourse_post_event_enabled: true,
events_calendar_categories: "1",
});
@@ -55,7 +55,7 @@ acceptance(
function (needs) {
needs.user({ can_create_discourse_post_event: false });
needs.settings({
- calendar_enabled: true,
+ discourse_events_enabled: true,
discourse_post_event_enabled: true,
events_calendar_categories: "1",
});
diff --git a/plugins/discourse-events/test/javascripts/acceptance/notifications-test.js b/plugins/discourse-events/test/javascripts/acceptance/notifications-test.js
index e1bab818806..c8ba5657598 100644
--- a/plugins/discourse-events/test/javascripts/acceptance/notifications-test.js
+++ b/plugins/discourse-events/test/javascripts/acceptance/notifications-test.js
@@ -5,7 +5,7 @@ import { i18n } from "discourse-i18n";
acceptance("Notifications", function (needs) {
needs.user({ redesigned_user_menu_enabled: true });
- needs.settings({ calendar_enabled: true });
+ needs.settings({ discourse_events_enabled: true });
needs.pretender((server, helper) => {
server.get("/notifications", () => {
diff --git a/plugins/discourse-events/test/javascripts/acceptance/post-event-builder-test.js b/plugins/discourse-events/test/javascripts/acceptance/post-event-builder-test.js
index c077579af90..92b2d9b525a 100644
--- a/plugins/discourse-events/test/javascripts/acceptance/post-event-builder-test.js
+++ b/plugins/discourse-events/test/javascripts/acceptance/post-event-builder-test.js
@@ -9,7 +9,7 @@ acceptance("Post event - composer", function (needs) {
needs.user({ admin: true, can_create_discourse_post_event: true });
needs.settings({
discourse_local_dates_enabled: true,
- discourse_calendar_enabled: true,
+ discourse_events_enabled: true,
discourse_post_event_enabled: true,
discourse_post_event_allowed_on_groups: "",
discourse_post_event_allowed_custom_fields: "",
@@ -152,7 +152,7 @@ acceptance("Post event - composer - custom fields", function (needs) {
needs.user({ admin: true, can_create_discourse_post_event: true });
needs.settings({
discourse_local_dates_enabled: true,
- discourse_calendar_enabled: true,
+ discourse_events_enabled: true,
discourse_post_event_enabled: true,
discourse_post_event_allowed_on_groups: "",
discourse_post_event_allowed_custom_fields: "fancy_field",
diff --git a/plugins/discourse-events/test/javascripts/acceptance/sidebar-upcoming-events-item-test.js b/plugins/discourse-events/test/javascripts/acceptance/sidebar-upcoming-events-item-test.js
index 514e1a9b4d9..75319931d57 100644
--- a/plugins/discourse-events/test/javascripts/acceptance/sidebar-upcoming-events-item-test.js
+++ b/plugins/discourse-events/test/javascripts/acceptance/sidebar-upcoming-events-item-test.js
@@ -6,7 +6,7 @@ acceptance("hamburger action shown", function (needs) {
needs.user();
needs.settings({
- calendar_enabled: true,
+ discourse_events_enabled: true,
discourse_post_event_enabled: true,
sidebar_show_upcoming_events: true,
});
@@ -29,7 +29,7 @@ acceptance("hamburger action shown", function (needs) {
acceptance("hamburger action hidden", function (needs) {
needs.user();
needs.settings({
- calendar_enabled: true,
+ discourse_events_enabled: true,
discourse_post_event_enabled: true,
sidebar_show_upcoming_events: false,
navigation_menu: "legacy",
@@ -45,7 +45,7 @@ acceptance("hamburger action hidden", function (needs) {
acceptance("sidebar link shown", function (needs) {
needs.user();
needs.settings({
- calendar_enabled: true,
+ discourse_events_enabled: true,
discourse_post_event_enabled: true,
sidebar_show_upcoming_events: true,
navigation_menu: "sidebar",
@@ -63,7 +63,7 @@ acceptance("sidebar link shown", function (needs) {
acceptance("sidebar link hidden", function (needs) {
needs.user();
needs.settings({
- calendar_enabled: true,
+ discourse_events_enabled: true,
discourse_post_event_enabled: true,
sidebar_show_upcoming_events: false,
navigation_menu: "sidebar",
diff --git a/plugins/discourse-events/test/javascripts/acceptance/topic-calendar-events-test.js b/plugins/discourse-events/test/javascripts/acceptance/topic-calendar-events-test.js
index 824369853fb..78872504dad 100644
--- a/plugins/discourse-events/test/javascripts/acceptance/topic-calendar-events-test.js
+++ b/plugins/discourse-events/test/javascripts/acceptance/topic-calendar-events-test.js
@@ -25,7 +25,7 @@ acceptance("Topic Calendar Events", function (needs) {
this.clock.restore();
});
- needs.settings({ calendar_enabled: true });
+ needs.settings({ discourse_events_enabled: true });
test("renders calendar events with fullDay='true'", async function (assert) {
pretender.get("/t/252.json", () => fixtureWithFullDay("true"));
diff --git a/plugins/discourse-events/test/javascripts/acceptance/topic-calendar-holidays-test.js b/plugins/discourse-events/test/javascripts/acceptance/topic-calendar-holidays-test.js
index 88d1ca6e649..d3b9c774695 100644
--- a/plugins/discourse-events/test/javascripts/acceptance/topic-calendar-holidays-test.js
+++ b/plugins/discourse-events/test/javascripts/acceptance/topic-calendar-holidays-test.js
@@ -14,7 +14,7 @@ acceptance("Topic Calendar Holidays", function (needs) {
});
needs.settings({
- calendar_enabled: true,
+ discourse_events_enabled: true,
});
needs.pretender((server, helper) => {
diff --git a/plugins/discourse-events/test/javascripts/acceptance/topic-title-decorator-test.js b/plugins/discourse-events/test/javascripts/acceptance/topic-title-decorator-test.js
index 456efe21f9f..14cacf53b11 100644
--- a/plugins/discourse-events/test/javascripts/acceptance/topic-title-decorator-test.js
+++ b/plugins/discourse-events/test/javascripts/acceptance/topic-title-decorator-test.js
@@ -8,7 +8,7 @@ import { acceptance } from "discourse/tests/helpers/qunit-helpers";
acceptance("Event Title Decorator", function (needs) {
needs.user();
needs.settings({
- calendar_enabled: true,
+ discourse_events_enabled: true,
discourse_post_event_enabled: true,
});
diff --git a/plugins/discourse-events/test/javascripts/acceptance/upcoming-events-calendar-test.js b/plugins/discourse-events/test/javascripts/acceptance/upcoming-events-calendar-test.js
index e326e391e82..b39a6ca1248 100644
--- a/plugins/discourse-events/test/javascripts/acceptance/upcoming-events-calendar-test.js
+++ b/plugins/discourse-events/test/javascripts/acceptance/upcoming-events-calendar-test.js
@@ -22,7 +22,7 @@ acceptance("Upcoming Events Calendar", function (needs) {
});
needs.user();
needs.settings({
- calendar_enabled: true,
+ discourse_events_enabled: true,
discourse_post_event_enabled: true,
events_calendar_categories: "1",
calendar_categories: "",