Bump build timeout to 25 minutes (#599)

* Bump build timeout to 25 minutes

* Upgrade sorbet

* Revert server_test separation

Author: vinistock

.github/workflows/ci.yml

@@ -17,7 +17,7 @@ jobs:
           - gemfile: "gemfiles/Gemfile-rails-main"
             experimental: true
     runs-on: ${{ matrix.os }}
-    timeout-minutes: 15
+    timeout-minutes: 25
     env:
       BUNDLE_GEMFILE: ${{ github.workspace }}/${{ matrix.gemfile }}
     continue-on-error: ${{ !!matrix.experimental }}
@@ -38,7 +38,9 @@ jobs:
           cache-version: 7
 
       - name: Run tests
-        run: bundle exec rake
+        run: |
+          bundle exec rails db:setup
+          bundle exec rake
   lint:
     runs-on: ubuntu-latest
     steps:

Gemfile.lock

@@ -238,15 +238,15 @@ GEM
     ruby-progressbar (1.13.0)
     ruby2_keywords (0.0.5)
     securerandom (0.4.1)
-    sorbet (0.5.11966)
-      sorbet-static (= 0.5.11966)
-    sorbet-runtime (0.5.11966)
-    sorbet-static (0.5.11966-aarch64-linux)
-    sorbet-static (0.5.11966-universal-darwin)
-    sorbet-static (0.5.11966-x86_64-linux)
-    sorbet-static-and-runtime (0.5.11966)
-      sorbet (= 0.5.11966)
-      sorbet-runtime (= 0.5.11966)
+    sorbet (0.5.12046)
+      sorbet-static (= 0.5.12046)
+    sorbet-runtime (0.5.12046)
+    sorbet-static (0.5.12046-aarch64-linux)
+    sorbet-static (0.5.12046-universal-darwin)
+    sorbet-static (0.5.12046-x86_64-linux)
+    sorbet-static-and-runtime (0.5.12046)
+      sorbet (= 0.5.12046)
+      sorbet-runtime (= 0.5.12046)
     spoom (1.5.4)
       erubi (>= 1.10.0)
       prism (>= 0.28.0)

Rakefile

@@ -10,19 +10,10 @@ 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"] - ["test/ruby_lsp_rails/server_test.rb"]
+  t.test_files = FileList["test/**/*_test.rb"]
 end
 
-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]
+task default: :test

sorbet/rbi/shims/server_test.rbi

@@ -1,20 +1,9 @@
 # typed: true
 # frozen_string_literal: true
 
-# Configure Rails Environment
-ENV["RAILS_ENV"] = "test"
-require_relative "../dummy/config/environment"
-
-require "minitest/autorun"
-require "mocha/minitest"
+require "test_helper"
 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
@@ -257,7 +246,8 @@ def print_it!
       end
     end
 
-    server.print_it!
+    server #: as untyped
+      .print_it!
 
     assert_match("Content-Length: 70\r\n\r\n", stderr.string)
     assert_match(