From a684897468873df366f0f175cdcb40a4a5c962d1 Mon Sep 17 00:00:00 2001 From: Martin Brennan Date: Wed, 8 Mar 2023 10:39:20 +1000 Subject: [PATCH] DEV: Change bookmarkable registration to use new plugin API (#230) Relies on core PR https://github.com/discourse/discourse/pull/20556 to be merged first. --- .discourse-compatibility | 1 + plugin.rb | 2 +- spec/lib/data_explorer_query_group_bookmarkable_spec.rb | 4 +++- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.discourse-compatibility b/.discourse-compatibility index 4fbd032..00ddc59 100644 --- a/.discourse-compatibility +++ b/.discourse-compatibility @@ -1,3 +1,4 @@ +3.1.0.beta1: 0f6b30c2d84d44978be1c845267609446ca9dbf2 2.9.0.beta8: 729e5a2add46fb4e2d8ed092da05a87ebbfcf05b 2.9.0.beta6: 272e9dd760f82e33f9756866434ddcbe470cdb8e 2.9.0.beta2: e7c19ac107dcd37618c7ac7b98530e99c7fe31db diff --git a/plugin.rb b/plugin.rb index 3cf7326..3d8a519 100644 --- a/plugin.rb +++ b/plugin.rb @@ -899,7 +899,7 @@ SQL ) # Making DataExplorer::QueryGroup Bookmarkable. - Bookmark.register_bookmarkable(DataExplorerQueryGroupBookmarkable) + register_bookmarkable(DataExplorerQueryGroupBookmarkable) require_dependency "application_controller" require_dependency File.expand_path("../lib/queries.rb", __FILE__) diff --git a/spec/lib/data_explorer_query_group_bookmarkable_spec.rb b/spec/lib/data_explorer_query_group_bookmarkable_spec.rb index 70c516a..d2471b0 100644 --- a/spec/lib/data_explorer_query_group_bookmarkable_spec.rb +++ b/spec/lib/data_explorer_query_group_bookmarkable_spec.rb @@ -31,9 +31,11 @@ describe DataExplorerQueryGroupBookmarkable do before do SiteSetting.data_explorer_enabled = true - Bookmark.register_bookmarkable(DataExplorerQueryGroupBookmarkable) + register_test_bookmarkable(DataExplorerQueryGroupBookmarkable) end + after { DiscoursePluginRegistry.reset! } + # Groups 0 and 1 have access to the Query 1. let!(:query_group1) { Fabricate(:query_group, query: query1, group: group0) } let!(:query_group2) { Fabricate(:query_group, query: query1, group: group1) }