Merge branch 'main' of github.com:rogancodes/ruby-lsp-rails into fetch_indexes_and_fks_on_model_hover

Author: rogancodes

Rakefile

@@ -10,10 +10,19 @@ load "rails/tasks/statistics.rake"
 require "bundler/gem_tasks"
 require "rake/testtask"
 
+# Since `server.rb` runs within the host Rails application, we want to ensure
+# we don't accidentally depend on sorbet-runtime. `server_test` intentionally doesn't use `test_helper`.
+# We run `server_test` in a seperate Rake task.
 Rake::TestTask.new(:test) do |t|
   t.libs << "test"
   t.libs << "lib"
-  t.test_files = FileList["test/**/*_test.rb"]
+  t.test_files = FileList["test/**/*_test.rb"] - ["test/ruby_lsp_rails/server_test.rb"]
 end
 
-task default: [:"db:setup", :test]
+Rake::TestTask.new(:server_test) do |t|
+  t.libs << "test"
+  t.libs << "lib"
+  t.test_files = ["test/ruby_lsp_rails/server_test.rb"]
+end
+
+task default: [:"db:setup", :test, :server_test]

sorbet/rbi/shims/server_test.rbi

@@ -0,0 +1,11 @@
+# typed: strict
+# frozen_string_literal: true
+
+module RubyLsp
+  module Rails
+    class Server
+      # We need this since RBS doesn't yet have a replacement for T.unsafe()
+      def print_it!; end
+    end
+  end
+end

test/ruby_lsp_rails/runner_client_test.rb

@@ -33,16 +33,30 @@ class RunnerClientTest < ActiveSupport::TestCase
 
       test "#model returns information for the requested model" do
         # These columns are from the schema in the dummy app: test/dummy/db/schema.rb
-        columns = [
-          ["id", "integer", nil, false],
-          ["first_name", "string", "", true],
-          ["last_name", "string", nil, true],
-          ["age", "integer", "0", true],
-          ["created_at", "datetime", nil, false],
-          ["updated_at", "datetime", nil, false],
-          ["country_id", "integer", nil, false],
-          ["active", "boolean", "1", false],
-        ]
+        # The default values behavior changed in https://github.com/rails/rails/pull/54683
+        columns = if Gem::Version.new(::Rails.version) < Gem::Version.new("8.1.0.alpha")
+          [
+            ["id", "integer", nil, false],
+            ["first_name", "string", "", true],
+            ["last_name", "string", nil, true],
+            ["age", "integer", "0", true],
+            ["created_at", "datetime", nil, false],
+            ["updated_at", "datetime", nil, false],
+            ["country_id", "integer", nil, false],
+            ["active", "boolean", "1", false],
+          ]
+        else
+          [
+            ["id", "integer", nil, false],
+            ["first_name", "string", "", true],
+            ["last_name", "string", nil, true],
+            ["age", "integer", 0, true],
+            ["created_at", "datetime", nil, false],
+            ["updated_at", "datetime", nil, false],
+            ["country_id", "integer", nil, false],
+            ["active", "boolean", true, false],
+          ]
+        end
         foreign_keys = ["country_id"]
         indexes = [{ name: "index_users_on_country_id", columns: ["country_id"], unique: false }]
         response = T.must(@client.model("User"))

test/ruby_lsp_rails/server_test.rb

@@ -1,9 +1,20 @@
 # typed: true
 # frozen_string_literal: true
 
-require "test_helper"
+# Configure Rails Environment
+ENV["RAILS_ENV"] = "test"
+require_relative "../dummy/config/environment"
+
+require "minitest/autorun"
+require "mocha/minitest"
 require "ruby_lsp/ruby_lsp_rails/server"
 
+if defined?(T)
+  puts "T is defined, indicating that sorbet-runtime was loaded"
+  puts "This test should run without sorbet-runtime"
+  exit(1)
+end
+
 class ServerTest < ActiveSupport::TestCase
   setup do
     @stdout = StringIO.new
@@ -246,7 +257,7 @@ def print_it!
       end
     end
 
-    T.unsafe(server).print_it!
+    server.print_it!
 
     assert_match("Content-Length: 70\r\n\r\n", stderr.string)
     assert_match(