diff --git a/Gemfile.lock b/Gemfile.lock index 23ad67d..1e1370c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,35 +1,60 @@ GEM remote: https://rubygems.org/ specs: + activesupport (7.1.3.2) + base64 + bigdecimal + concurrent-ruby (~> 1.0, >= 1.0.2) + connection_pool (>= 2.2.5) + drb + i18n (>= 1.6, < 2) + minitest (>= 5.1) + mutex_m + tzinfo (~> 2.0) ast (2.4.2) + base64 (0.2.0) + bigdecimal (3.1.6) + concurrent-ruby (1.2.3) + connection_pool (2.4.1) + drb (2.2.0) + ruby2_keywords + i18n (1.14.1) + concurrent-ruby (~> 1.0) json (2.7.1) language_server-protocol (3.17.0.3) + minitest (5.22.2) + mutex_m (0.2.0) parallel (1.24.0) - parser (3.3.0.3) + parser (3.3.0.5) ast (~> 2.4.1) racc prettier_print (1.2.1) + prism (0.24.0) racc (1.7.3) rainbow (3.1.1) regexp_parser (2.9.0) rexml (3.2.6) - rubocop (1.59.0) + rubocop (1.61.0) json (~> 2.3) language_server-protocol (>= 3.17.0) parallel (~> 1.10) - parser (>= 3.2.2.4) + parser (>= 3.3.0.2) rainbow (>= 2.2.2, < 4.0) regexp_parser (>= 1.8, < 3.0) rexml (>= 3.2.5, < 4.0) rubocop-ast (>= 1.30.0, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 2.4.0, < 3.0) - rubocop-ast (1.30.0) - parser (>= 3.2.1.0) + rubocop-ast (1.31.0) + parser (>= 3.3.0.4) + prism (>= 0.24.0) rubocop-capybara (2.20.0) rubocop (~> 1.41) - rubocop-discourse (3.6.0) + rubocop-discourse (3.7.1) + activesupport (>= 6.1) rubocop (>= 1.59.0) + rubocop-capybara (>= 2.0.0) + rubocop-factory_bot (>= 2.0.0) rubocop-rspec (>= 2.25.0) rubocop-factory_bot (2.25.1) rubocop (~> 1.41) @@ -38,8 +63,11 @@ GEM rubocop-capybara (~> 2.17) rubocop-factory_bot (~> 2.22) ruby-progressbar (1.13.0) + ruby2_keywords (0.0.5) syntax_tree (6.2.0) prettier_print (>= 1.2.0) + tzinfo (2.0.6) + concurrent-ruby (~> 1.0) unicode-display_width (2.5.0) PLATFORMS diff --git a/plugin.rb b/plugin.rb index 9a5dd84..52567fc 100644 --- a/plugin.rb +++ b/plugin.rb @@ -18,8 +18,8 @@ register_svg_icon "sort-numeric-up" register_svg_icon "sort-numeric-down" register_svg_icon "far-circle" -load File.expand_path("lib/docs/engine.rb", __dir__) -load File.expand_path("lib/docs/query.rb", __dir__) +require_relative "lib/docs/engine" +require_relative "lib/docs/query" GlobalSetting.add_default :docs_path, "docs" diff --git a/spec/plugin_spec.rb b/spec/plugin_spec.rb index 0b3e3a6..b8eaced 100644 --- a/spec/plugin_spec.rb +++ b/spec/plugin_spec.rb @@ -3,7 +3,7 @@ require "rails_helper" describe Docs do - fab!(:category) { Fabricate(:category) } + fab!(:category) fab!(:topic) { Fabricate(:topic, category: category) } fab!(:post) { Fabricate(:post, topic: topic) } fab!(:non_docs_category) { Fabricate(:category) } diff --git a/spec/requests/docs_controller_spec.rb b/spec/requests/docs_controller_spec.rb index a23c49b..e24ed64 100644 --- a/spec/requests/docs_controller_spec.rb +++ b/spec/requests/docs_controller_spec.rb @@ -3,7 +3,7 @@ require "rails_helper" describe Docs::DocsController do - fab!(:category) { Fabricate(:category) } + fab!(:category) fab!(:topic) { Fabricate(:topic, title: "I love carrot today", category: category) } fab!(:topic2) { Fabricate(:topic, title: "I love pineapple today", category: category) } fab!(:tag) { Fabricate(:tag, topics: [topic], name: "test") } diff --git a/spec/serializers/site_serializer_spec.rb b/spec/serializers/site_serializer_spec.rb index 31e62f7..e9e4a7b 100644 --- a/spec/serializers/site_serializer_spec.rb +++ b/spec/serializers/site_serializer_spec.rb @@ -3,7 +3,7 @@ require "rails_helper" describe SiteSerializer do - fab!(:user) { Fabricate(:user) } + fab!(:user) let(:guardian) { Guardian.new(user) } before do diff --git a/spec/system/docs_index_spec.rb b/spec/system/docs_index_spec.rb index ccab8c8..057ae20 100644 --- a/spec/system/docs_index_spec.rb +++ b/spec/system/docs_index_spec.rb @@ -2,7 +2,7 @@ describe "Discourse Docs | Index", type: :system do fab!(:current_user) { Fabricate(:user) } - fab!(:category) { Fabricate(:category) } + fab!(:category) fab!(:topic_1) { Fabricate(:topic, category: category) } fab!(:topic_2) { Fabricate(:topic, category: category) } fab!(:post_1) { Fabricate(:post, topic: topic_1) }