A platform for community discussion. Free, open, simple.
DEV: Remove enable_event_schema_for_topics hidden setting (#45450)
Martin Brennan9c701e3e4a5c
diff --git a/plugins/discourse-events/app/services/discourse_events/events/build_schema_markup.rb b/plugins/discourse-events/app/services/discourse_events/events/build_schema_markup.rbindex 3d4a138ad6a..c82e1647188 100644--- a/plugins/discourse-events/app/services/discourse_events/events/build_schema_markup.rb+++ b/plugins/discourse-events/app/services/discourse_events/events/build_schema_markup.rb@@ -9,7 +9,7 @@ class DiscourseEvents::Events::BuildSchemaMarkupvalidates :topic_id, presence: trueend- policy :schema_markup_enabled+ policy :post_events_enabledmodel :topicpolicy :can_see_topicmodel :first_post@@ -18,8 +18,8 @@ class DiscourseEvents::Events::BuildSchemaMarkupprivate- def schema_markup_enabled- SiteSetting.enable_event_schema_for_topics && SiteSetting.discourse_post_event_enabled+ def post_events_enabled+ SiteSetting.discourse_post_event_enabledenddef fetch_topic(params:)diff --git a/plugins/discourse-events/config/locales/server.en.yml b/plugins/discourse-events/config/locales/server.en.ymlindex c24817dd9c6..f3107054bb9 100644--- a/plugins/discourse-events/config/locales/server.en.yml+++ b/plugins/discourse-events/config/locales/server.en.yml@@ -63,7 +63,6 @@ en:map_events_title: "Overwrites 'Events' in the 'Upcoming Events' sidebar title per category."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."- enable_event_schema_for_topics: "Add Schema.org Event data to event topic pages."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.ymlindex 81d319a6b11..435bdd06f07 100644--- a/plugins/discourse-events/config/settings.yml+++ b/plugins/discourse-events/config/settings.yml@@ -72,9 +72,6 @@ discourse_events:discourse_post_event_enabled:default: falseclient: true- enable_event_schema_for_topics:- default: false- hidden: truediscourse_post_event_allowed_on_groups:client: truetype: group_listdiff --git a/plugins/discourse-events/spec/requests/topics_controller_spec.rb b/plugins/discourse-events/spec/requests/topics_controller_spec.rbindex 5e987c975a5..a81b2cf05cd 100644--- a/plugins/discourse-events/spec/requests/topics_controller_spec.rb+++ b/plugins/discourse-events/spec/requests/topics_controller_spec.rb@@ -6,7 +6,6 @@ RSpec.describe TopicsController dobefore doSiteSetting.discourse_events_enabled = trueSiteSetting.discourse_post_event_enabled = true- SiteSetting.enable_event_schema_for_topics = trueenddescribe "#show" do@@ -16,10 +15,11 @@ RSpec.describe TopicsController do[/event]RAW- it "does not publish event schema when disabled" do- SiteSetting.enable_event_schema_for_topics = false+ it "does not publish event schema when post events are disabled" do+ topic = post.topic+ SiteSetting.discourse_post_event_enabled = false- get post.topic.url+ get topic.urlexpect(response.status).to eq(200)expect(response.body).not_to include('"@type":"Event"')diff --git a/plugins/discourse-events/spec/services/discourse_events/events/build_schema_markup_spec.rb b/plugins/discourse-events/spec/services/discourse_events/events/build_schema_markup_spec.rbindex 4b940787d03..886894f4b43 100644--- a/plugins/discourse-events/spec/services/discourse_events/events/build_schema_markup_spec.rb+++ b/plugins/discourse-events/spec/services/discourse_events/events/build_schema_markup_spec.rb@@ -17,10 +17,7 @@ RSpec.describe DiscourseEvents::Events::BuildSchemaMarkup dolet(:topic_id) { topic.id }let(:guardian) { user.guardian }- before do- SiteSetting.enable_event_schema_for_topics = true- SiteSetting.discourse_post_event_enabled = true- end+ before { SiteSetting.discourse_post_event_enabled = true }context "without a topic ID" dolet(:topic_id) { nil }@@ -28,16 +25,10 @@ RSpec.describe DiscourseEvents::Events::BuildSchemaMarkup doit { is_expected.to fail_a_contract }end- context "when event schema markup is disabled" do- before { SiteSetting.enable_event_schema_for_topics = false }-- it { is_expected.to fail_a_policy(:schema_markup_enabled) }- end-context "when post events are disabled" dobefore { SiteSetting.discourse_post_event_enabled = false }- it { is_expected.to fail_a_policy(:schema_markup_enabled) }+ it { is_expected.to fail_a_policy(:post_events_enabled) }endcontext "when the topic does not exist" do