Skip to content

Commit 77e47b3

Browse files
committedMar 6, 2025
Fix tests for Rails main
1 parent 09b4967 commit 77e47b3

File tree

1 file changed

+24
-10
lines changed

1 file changed

+24
-10
lines changed
 

‎test/ruby_lsp_rails/runner_client_test.rb

+24-10
Original file line numberDiff line numberDiff line change
@@ -33,16 +33,30 @@ class RunnerClientTest < ActiveSupport::TestCase
3333

3434
test "#model returns information for the requested model" do
3535
# These columns are from the schema in the dummy app: test/dummy/db/schema.rb
36-
columns = [
37-
["id", "integer", nil, false],
38-
["first_name", "string", "", true],
39-
["last_name", "string", nil, true],
40-
["age", "integer", "0", true],
41-
["created_at", "datetime", nil, false],
42-
["updated_at", "datetime", nil, false],
43-
["country_id", "integer", nil, false],
44-
["active", "boolean", "1", false],
45-
]
36+
# The default values behavior changed in https://github.com/rails/rails/pull/54683
37+
columns = if Gem::Version.new(::Rails.version) < Gem::Version.new("8.1.0.alpha")
38+
[
39+
["id", "integer", nil, false],
40+
["first_name", "string", "", true],
41+
["last_name", "string", nil, true],
42+
["age", "integer", "0", true],
43+
["created_at", "datetime", nil, false],
44+
["updated_at", "datetime", nil, false],
45+
["country_id", "integer", nil, false],
46+
["active", "boolean", "1", false],
47+
]
48+
else
49+
[
50+
["id", "integer", nil, false],
51+
["first_name", "string", "", true],
52+
["last_name", "string", nil, true],
53+
["age", "integer", 0, true],
54+
["created_at", "datetime", nil, false],
55+
["updated_at", "datetime", nil, false],
56+
["country_id", "integer", nil, false],
57+
["active", "boolean", true, false],
58+
]
59+
end
4660
response = T.must(@client.model("User"))
4761
assert_equal(columns, response.fetch(:columns))
4862
assert_match(%r{db/schema\.rb$}, response.fetch(:schema_file))

0 commit comments

Comments
 (0)
Failed to load comments.