Merge pull request #68 from github/update_ci

Update ci

.github/workflows/ci.yml

@@ -21,14 +21,14 @@ jobs:
  runs-on: ubuntu-latest
  strategy:
  matrix:
- ruby-version: ['2.7', '3.0']
- rails-version: ['7.0.0.alpha2', '6.1.0']
+ ruby-version: ['3.0', '3.1', '3.2', '3.3']
+ rails-version: ['6.1.7', '7.0.8', '7.1.3']
  env:
  RAILS_VERSION: ${{ matrix.rails-version }}
  steps:
- - uses: actions/checkout@v2
+ - uses: actions/checkout@v4
  - name: Set up Ruby
- uses: ruby/setup-ruby@473e4d8fe5dd94ee328fdfca9f8c9c7afc9dae5e
+ uses: ruby/setup-ruby@v1
  with:
  ruby-version: ${{ matrix.ruby-version }}
  bundler-cache: true

Gemfile

@@ -1,7 +1,7 @@
 source "https://rubygems.org"
 gemspec
 
-DEFAULT_RAILS_VERSION = '6.0.3.5'
+DEFAULT_RAILS_VERSION = '7.1.3'
 ENV['RAILS_VERSION'] ||= DEFAULT_RAILS_VERSION
 
 if ENV['RAILS_VERSION'] == '4.2.10'

github-ds.gemspec

@@ -33,12 +33,10 @@ Gem::Specification.new do |spec|
  spec.add_dependency "activerecord", ">= 3.2"
 
  spec.add_development_dependency "bundler", ">= 1.14"
- spec.add_development_dependency "rake", "~> 12.0"
- spec.add_development_dependency "minitest", "~> 5.0"
- spec.add_development_dependency "timecop", "~> 0.8.1"
+ spec.add_development_dependency "rake"
+ spec.add_development_dependency "minitest"
+ spec.add_development_dependency "timecop"
  spec.add_development_dependency "activesupport"
  spec.add_development_dependency "mysql2"
- spec.add_development_dependency "mocha", "~> 1.2.1"
- spec.add_development_dependency "minitest-focus", "~> 1.1.2"
- spec.add_development_dependency "pry", "~> 0.12.2"
+ spec.add_development_dependency "mocha"
 end

test/generators/github/store/active_record_generator_test.rb

@@ -1,6 +1,5 @@
 require "test_helper"
 require "rails"
-require "rails/test_help"
 require "active_record"
 require "rails/generators/test_case"
 require "generators/github/ds/active_record_generator"

test/github/sql_test.rb

@@ -285,7 +285,7 @@ def test_affected_rows_even_when_query_generates_warning
 
  def test_add_doesnt_modify_timezone_if_early_return_invoked
  begin
- original_default_timezone = ActiveRecord::Base.default_timezone
+ original_default_timezone = get_default_timezone
  refute_nil original_default_timezone
 
  ActiveRecord::Base.connection.execute("DROP TABLE IF EXISTS `repositories`")
@@ -300,16 +300,16 @@ def test_add_doesnt_modify_timezone_if_early_return_invoked
  sql = GitHub::SQL.new("SELECT * FROM repositories WHERE id = ?", force_timezone: :local)
  sql.add nil, id: 1
 
- assert_equal original_default_timezone, ActiveRecord::Base.default_timezone
+ assert_equal original_default_timezone, get_default_timezone
  ensure
- ActiveRecord::Base.default_timezone = original_default_timezone
+ set_default_timezone = original_default_timezone
  ActiveRecord::Base.connection.execute("DROP TABLE IF EXISTS `repositories`")
  end
  end
 
  def test_results_doesnt_modify_timezone_if_early_return_invoked
  begin
- original_default_timezone = ActiveRecord::Base.default_timezone
+ original_default_timezone = get_default_timezone
  refute_nil original_default_timezone
 
  ActiveRecord::Base.connection.execute("DROP TABLE IF EXISTS `repositories`")
@@ -325,12 +325,28 @@ def test_results_doesnt_modify_timezone_if_early_return_invoked
  sql.results
  sql.results
 
- assert_equal original_default_timezone, ActiveRecord::Base.default_timezone
+ assert_equal original_default_timezone, get_default_timezone
  ensure
- ActiveRecord::Base.default_timezone = original_default_timezone
+ set_default_timezone original_default_timezone
  ActiveRecord::Base.connection.execute("DROP TABLE IF EXISTS `repositories`")
  end
  end
+
+ def get_default_timezone
+ if ActiveRecord.respond_to?(:default_timezone)
+ ActiveRecord
+ else
+ ActiveRecord::Base
+ end.default_timezone
+ end
+
+ def set_default_timezone(value)
+ if ActiveRecord.respond_to?(:default_timezone)
+ ActiveRecord
+ else
+ ActiveRecord::Base
+ end.default_timezone = (value)
+ end
 end
 
 class GitHub::SQLModelTest < Minitest::Test

test/test_helper.rb

@@ -1,15 +1,12 @@
-require "bundler/setup"
-require "pp"
+
 require "pathname"
 root_path = Pathname(File.expand_path("../..", __FILE__))
-$LOAD_PATH.unshift root_path.join("lib").to_s
+$LOAD_PATH.unshift File.expand_path("../lib", __dir__)
 require "github/ds"
 require "github/kv"
 require "timecop"
 require "minitest/autorun"
-require "mocha/mini_test"
-require "minitest/focus"
-require "pry"
+require "mocha/minitest"
 
 ActiveRecord::Base.configurations = {
  "without_database" => {