Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,22 @@ jobs:
ruby: 3.3
- gemfile: rails_8_0
ruby: 3.4
- gemfile: rails_8_0
ruby: "4.0"
- gemfile: rails_8_1
ruby: 3.2
- gemfile: rails_8_1
ruby: 3.3
- gemfile: rails_8_1
ruby: 3.4
- gemfile: rails_8_1
ruby: "4.0"

name: ${{ matrix.gemfile }}, ruby ${{ matrix.ruby }}
env:
BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/${{ matrix.gemfile }}.gemfile
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v7

- name: Set up Ruby
uses: ruby/setup-ruby@v1
Expand Down
4 changes: 4 additions & 0 deletions Appraisals
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
appraise "rails_8_0" do
gem "rails", "~> 8.0.0"
end

appraise "rails_8_1" do
gem "rails", "~> 8.1.0"
end
13 changes: 13 additions & 0 deletions gemfiles/rails_8_1.gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
# This file was generated by Appraisal

source "https://rubygems.org"

gem "rails", "~> 8.1.0"
gem "rspec"
gem "rspec-rails", "~> 8.0"
gem "sqlite3", "~> 2.0"
gem "debug"
gem "appraisal"
gem "nokogiri"

gemspec path: "../"
14 changes: 11 additions & 3 deletions spec/validates_timeliness/orm/active_record_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,14 @@ class EmployeeWithParser < ActiveRecord::Base
context 'timezone aware' do
with_config(:default_timezone, 'Australia/Melbourne')

let(:expected_time) do
if ActiveRecord.gem_version >= Gem::Version.new('8.1')
Time.zone.local(2000, 1, 1, 12, 30)
else
'12:30'.in_time_zone
end
end

before do
unless ActiveRecord::Base.time_zone_aware_types.include?(:time)
ActiveRecord::Base.time_zone_aware_types.push(:time)
Expand All @@ -116,7 +124,7 @@ class EmployeeWithParser < ActiveRecord::Base
it 'should parse a string value' do
record.birth_time = '12:30'

expect(record.birth_time).to eq('12:30'.in_time_zone)
expect(record.birth_time).to eq(expected_time)
expect(Timeliness::Parser).to have_received(:parse)
end

Expand All @@ -130,8 +138,8 @@ class EmployeeWithParser < ActiveRecord::Base
it 'should store a Time value after parsing string' do
record.birth_time = '12:30'

expect(record.birth_time).to eq('12:30'.in_time_zone)
expect(record.birth_time.utc_offset).to eq '12:30'.in_time_zone.utc_offset
expect(record.birth_time).to eq(expected_time)
expect(record.birth_time.utc_offset).to eq expected_time.utc_offset
end
end

Expand Down