Fix the test suite

byroot · Nov 3, 2022 · fa079ed · fa079ed
1 parent 0b1d3ff
commit fa079ed
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 10 deletions.
diff --git a/.github/workflows/ruby.yml b/.github/workflows/ruby.yml
@@ -5,22 +5,22 @@ on: [push, pull_request]
 jobs:
   build:
     runs-on: ubuntu-latest
-    name: Ruby ${{ matrix.ruby }}
+    name: ${{ matrix.ruby }} / Rails ${{ matrix.rails }} / TZ ${{ matrix.timezone_aware }}
     strategy:
       fail-fast: false
       matrix:
         ruby: ['2.7', '3.0', '3.1']
-        gemfile: [Gemfile.ar-6.1, Gemfile.ar-7.0, Gemfile.ar-master]
+        rails: ['6.1', '7.0', 'edge']
         timezone_aware: [0, 1]
     env:
-      BUNDLE_GEMFILE: gemfiles/${{ matrix.gemfile }}
+      BUNDLE_GEMFILE: gemfiles/Gemfile.ar-${{ matrix.rails }}
       TIMEZONE_AWARE: ${{ matrix.timezone_aware }}
       POSTGRES: 1
       MYSQL: 1
       POSTGRES_JSON: 1
     steps:
       - name: Check out code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       - name: Set up Ruby ${{ matrix.ruby }}
         uses: ruby/setup-ruby@v1
         with:

diff --git a/gemfiles/Gemfile.ar-master → gemfiles/Gemfile.ar-edge b/gemfiles/Gemfile.ar-master → gemfiles/Gemfile.ar-edge
diff --git a/spec/active_record/typed_store_spec.rb b/spec/active_record/typed_store_spec.rb
@@ -925,7 +925,7 @@
 
   it 'nested hashes are not serialized as HashWithIndifferentAccess' do
     model = described_class.create!
-    expect(model.settings_before_type_cast).not_to include('HashWithIndifferentAccess')
+    expect(model.settings_before_type_cast.to_s).not_to include('HashWithIndifferentAccess')
   end
 end
 

diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
@@ -8,6 +8,12 @@
 
 Time.zone = 'UTC'
 
+if ActiveRecord.respond_to?(:yaml_column_permitted_classes)
+  ActiveRecord.yaml_column_permitted_classes |= ['Date', 'Time', 'BigDecimal']
+elsif ActiveRecord::Base.respond_to?(:yaml_column_permitted_classes)
+  ActiveRecord::Base.yaml_column_permitted_classes |= ['Date', 'Time', 'BigDecimal']
+end
+
 RSpec.configure do |config|
   config.order = 'random'
 end
diff --git a/spec/support/models.rb b/spec/support/models.rb
@@ -1,4 +1,5 @@
 require 'active_record'
+require 'base64'
 require 'json'
 require 'yaml'
 
@@ -12,7 +13,7 @@
   }
 }
 
-def define_columns(t)
+def define_columns(t, array: false)
   t.integer :no_default
 
   t.string :name, default: '', null: false
@@ -40,11 +41,12 @@ def define_columns(t)
   t.decimal :total_price, default: 4.2, null: false, precision: 16, scale: 2
   t.decimal :shipping_cost, precision: 16, scale: 2
 
-  t.integer :grades, array: true
+  if t.is_a?(ActiveRecord::TypedStore::DSL)
+    t.integer :grades, array: true
+    t.string :tags, array: true, null: false, default: [].to_yaml
 
-  t.string :tags, array: true, null: false, default: [].to_yaml
-
-  t.string :nickname, blank: false, default: 'Please enter your nickname'
+    t.string :nickname, blank: false, default: 'Please enter your nickname'
+  end
 end
 
 def define_store_with_no_attributes(**options)