Skip to content

Commit 5255751

Browse files
committed
TECH-17382: Update specs to expect Ruby 3.4 hash syntax default
1 parent b565e27 commit 5255751

2 files changed

Lines changed: 11 additions & 3 deletions

File tree

spec/lib/declare_schema/migration_generator_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -899,7 +899,7 @@ class Ad < ActiveRecord::Base # rubocop:disable Lint/ConstantDefinitionInBlock
899899
end
900900
up, _down = Generators::DeclareSchema::Migration::Migrator.run
901901
ActiveRecord::Migration.class_eval(up)
902-
expect(Ad.field_specs['company'].options[:validates].inspect).to eq("{:presence=>true, :uniqueness=>{:case_sensitive=>false}}")
902+
expect(Ad.field_specs['company'].options[:validates].inspect).to eq("{presence: true, uniqueness: {case_sensitive: false}}")
903903

904904
# DeclareSchema supports has_and_belongs_to_many relationships and generates the intersection ("join") table
905905
# with appropriate primary key, indexes, and foreign keys.

spec/lib/declare_schema/model/table_options_definition_spec.rb

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,11 @@ class TableOptionsDefinitionTestModel < ActiveRecord::Base # rubocop:disable Lin
2424

2525
describe '#to_key' do
2626
subject { model.to_key }
27-
it { is_expected.to eq(['table_options_definition_test_models', "{:charset=>#{charset.inspect}, :collation=>#{collation.inspect}}"]) }
27+
if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("3.4")
28+
it { is_expected.to eq(['table_options_definition_test_models', "{:charset=>#{charset.inspect}, :collation=>#{collation.inspect}}"]) }
29+
else
30+
it { is_expected.to eq(['table_options_definition_test_models', "{charset: #{charset.inspect}, collation: #{collation.inspect}}"]) }
31+
end
2832
end
2933

3034
describe '#settings' do
@@ -56,7 +60,11 @@ class TableOptionsDefinitionTestModel < ActiveRecord::Base # rubocop:disable Lin
5660

5761
describe '#hash' do
5862
subject { model.hash }
59-
it { is_expected.to eq(['table_options_definition_test_models', "{:charset=>#{charset.inspect}, :collation=>#{collation.inspect}}"].hash) }
63+
if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("3.4")
64+
it { is_expected.to eq(['table_options_definition_test_models', "{:charset=>#{charset.inspect}, :collation=>#{collation.inspect}}"].hash) }
65+
else
66+
it { is_expected.to eq(['table_options_definition_test_models', "{charset: #{charset.inspect}, collation: #{collation.inspect}}"].hash) }
67+
end
6068
end
6169

6270
describe '#to_s' do

0 commit comments

Comments
 (0)