DEV: Update rubocop-discourse to latest version

discourse · May 17, 2024 · ab40e7d · ab40e7d
1 parent c47e8bc
commit ab40e7d
Show file tree

Hide file tree

Showing 7 changed files with 50 additions and 17 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,47 +1,74 @@
 GEM
   remote: https://rubygems.org/
   specs:
+    activesupport (7.1.3.3)
+      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)
-    json (2.7.1)
+    base64 (0.2.0)
+    bigdecimal (3.1.8)
+    concurrent-ruby (1.2.3)
+    connection_pool (2.4.1)
+    drb (2.2.1)
+    i18n (1.14.5)
+      concurrent-ruby (~> 1.0)
+    json (2.7.2)
     language_server-protocol (3.17.0.3)
+    minitest (5.23.0)
+    mutex_m (0.2.0)
     parallel (1.24.0)
-    parser (3.3.0.4)
+    parser (3.3.1.0)
       ast (~> 2.4.1)
       racc
     prettier_print (1.2.1)
     racc (1.7.3)
     rainbow (3.1.1)
-    regexp_parser (2.9.0)
+    regexp_parser (2.9.2)
     rexml (3.2.8)
       strscan (>= 3.0.9)
-    rubocop (1.60.0)
+    rubocop (1.63.5)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
       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)
+      rubocop-ast (>= 1.31.1, < 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.3)
+      parser (>= 3.3.1.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)
-    rubocop-rspec (2.26.1)
+    rubocop-rspec (2.29.2)
       rubocop (~> 1.40)
       rubocop-capybara (~> 2.17)
       rubocop-factory_bot (~> 2.22)
+      rubocop-rspec_rails (~> 2.28)
+    rubocop-rspec_rails (2.28.3)
+      rubocop (~> 1.40)
     ruby-progressbar (1.13.0)
     strscan (3.1.0)
     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/app/controllers/discourse_teambuild/targets_controller.rb b/app/controllers/discourse_teambuild/targets_controller.rb
@@ -5,6 +5,8 @@
 
 module DiscourseTeambuild
   class TargetsController < ApplicationController
+    requires_plugin PLUGIN_NAME
+
     requires_login
     before_action :ensure_enabled
 

diff --git a/app/controllers/discourse_teambuild/teambuild_controller.rb b/app/controllers/discourse_teambuild/teambuild_controller.rb
@@ -5,6 +5,8 @@
 
 module DiscourseTeambuild
   class TeambuildController < ApplicationController
+    requires_plugin PLUGIN_NAME
+
     requires_login
     before_action :ensure_can_access
 

diff --git a/lib/discourse_teambuild/engine.rb b/lib/discourse_teambuild/engine.rb
@@ -1,8 +1,10 @@
 # frozen_string_literal: true
 
 module ::DiscourseTeambuild
+  PLUGIN_NAME = "discourse-teambuild"
+
   class Engine < ::Rails::Engine
-    engine_name "discourse_teambuild"
+    engine_name PLUGIN_NAME
     isolate_namespace DiscourseTeambuild
   end
 end
diff --git a/plugin.rb b/plugin.rb
@@ -7,7 +7,7 @@
 # authors: Robin Ward
 # url: https://github.com/discourse/discourse-teambuild
 
-load File.expand_path("../lib/discourse_teambuild/engine.rb", __FILE__)
+require_relative "lib/discourse_teambuild/engine"
 
 enabled_site_setting :teambuild_enabled
 

diff --git a/spec/requests/targets_controller_spec.rb b/spec/requests/targets_controller_spec.rb
@@ -32,10 +32,10 @@
         )
       end
 
-      it "returns 403 when disabled" do
+      it "returns 404 when disabled" do
         SiteSetting.teambuild_enabled = false
         get "/team-build/targets.json"
-        expect(response.code).to eq("403")
+        expect(response.code).to eq("404")
       end
 
       it "returns json" do

diff --git a/spec/requests/teambuild_controller_spec.rb b/spec/requests/teambuild_controller_spec.rb
@@ -10,14 +10,14 @@
   end
 
   context "when logged in" do
-    fab!(:user) { Fabricate(:user) }
+    fab!(:user)
     fab!(:target) do
       TeambuildTarget.create!(
         name: "test target",
         target_type_id: TeambuildTarget.target_types[:regular],
       )
     end
-    fab!(:group) { Fabricate(:group) }
+    fab!(:group)
 
     before do
       SiteSetting.teambuild_enabled = true
@@ -27,10 +27,10 @@
     end
 
     context "when enabled/disabled" do
-      it "returns 403 when disabled" do
+      it "returns 404 when disabled" do
         SiteSetting.teambuild_enabled = false
         get "/team-build/scores.json"
-        expect(response.code).to eq("403")
+        expect(response.code).to eq("404")
       end
 
       it "returns 200 when enabled" do