Fix controller context

Author: stefan-burke

.env.example

@@ -89,3 +89,6 @@ SIMPLE_USER_ACTIVATION=false
 
 # Whether to show units/inspections at all
 HAS_ASSESSMENTS=true
+
+# If you're building the Tapioca RBI files, enable this
+RUNNING_TAPIOCA=false

app/controllers/concerns/session_management.rb

@@ -14,7 +14,7 @@ def establish_user_session(user)
     )
 
     session[:session_token] = user_session.session_token
-    create_user_session(user)
+    create_user_session
 
     user_session
   end

app/helpers/concerns/controller_context.rb

@@ -8,38 +8,41 @@ module ControllerContext
   extend T::Sig
   extend T::Helpers
 
-  # These methods are provided by ActionController, so we just need
-  # to declare their signatures for Sorbet without marking them abstract
+  abstract!
 
-  sig { returns(T.untyped) }
+  # These methods are provided by ActionController/ActionView
+  # We declare them as abstract so Sorbet knows about them
+  # but doesn't provide implementations that would override Rails
+
+  sig { abstract.returns(T.untyped) }
   def session
   end
 
-  sig { returns(T.untyped) }
+  sig { abstract.returns(T.untyped) }
   def cookies
   end
 
-  sig { returns(T.untyped) }
+  sig { abstract.returns(T.untyped) }
   def params
   end
 
-  sig { returns(T.untyped) }
+  sig { abstract.returns(T.untyped) }
   def request
   end
 
-  sig { returns(T.untyped) }
+  sig { abstract.returns(T.untyped) }
   def flash
   end
 
-  sig { params(args: T.untyped).returns(T.untyped) }
+  sig { abstract.params(args: T.untyped).returns(T.untyped) }
   def redirect_to(*args)
   end
 
-  sig { params(args: T.untyped).returns(T.untyped) }
+  sig { abstract.params(args: T.untyped).returns(T.untyped) }
   def render(*args)
   end
 
-  sig { params(args: T.untyped, block: T.untyped).returns(T.untyped) }
+  sig { abstract.params(args: T.untyped, block: T.untyped).returns(T.untyped) }
   def respond_to(*args, &block)
   end
 end

app/helpers/sessions_helper.rb

@@ -89,8 +89,8 @@ def authenticate_user(email, password)
     User.find_by(email: email.downcase)&.authenticate(password)
   end
 
-  sig { params(user: User).void }
-  def create_user_session(_user)
+  sig { void }
+  def create_user_session
     remember_user
   end
 

spec/controllers/application_controller_spec.rb

@@ -317,15 +317,11 @@
     end
 
     describe "#n_plus_one_detection" do
-      it "is defined as a private method" do
-        expect(controller.private_methods).to include(:n_plus_one_detection)
-      end
-
       it "wraps actions with Prosopite scanning" do
         expect(Prosopite).to receive(:scan)
         expect(Prosopite).to receive(:finish)
 
-        controller.send(:n_plus_one_detection) { "test" }
+        controller.n_plus_one_detection { "test" }
       end
     end
   end

spec/helpers/sessions_helper_spec.rb

@@ -172,7 +172,7 @@
     it "remembers the user" do
       expect(helper).to receive(:remember_user)
 
-      helper.create_user_session(user)
+      helper.create_user_session
     end
   end