From a48c5755e4a72568e13d269464a0a6332c6398b9 Mon Sep 17 00:00:00 2001 From: Niklas Hasselmeyer Date: Wed, 5 Jan 2022 12:37:04 +0100 Subject: [PATCH 1/2] Add tests for ruby 7.0 --- .github/workflows/test.yml | 4 +++ Gemfile.7.0.mysql2 | 15 +++++++++ Gemfile.7.0.mysql2.lock | 69 ++++++++++++++++++++++++++++++++++++++ Gemfile.7.0.pg | 15 +++++++++ Gemfile.7.0.pg.lock | 69 ++++++++++++++++++++++++++++++++++++++ spec/spec_helper.rb | 6 +++- 6 files changed, 177 insertions(+), 1 deletion(-) create mode 100644 Gemfile.7.0.mysql2 create mode 100644 Gemfile.7.0.mysql2.lock create mode 100644 Gemfile.7.0.pg create mode 100644 Gemfile.7.0.pg.lock diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index aa1c271..2aa1d99 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -33,6 +33,8 @@ jobs: gemfile: Gemfile.6.1.mysql2 - ruby: 3.0.0 gemfile: Gemfile.6.1.mysql2 + - ruby: 3.0.0 + gemfile: Gemfile.7.0.mysql2 env: BUNDLE_GEMFILE: "${{ matrix.gemfile }}" steps: @@ -76,6 +78,8 @@ jobs: gemfile: Gemfile.6.1.pg - ruby: 3.0.0 gemfile: Gemfile.6.1.pg + - ruby: 3.0.0 + gemfile: Gemfile.7.0.pg env: BUNDLE_GEMFILE: "${{ matrix.gemfile }}" steps: diff --git a/Gemfile.7.0.mysql2 b/Gemfile.7.0.mysql2 new file mode 100644 index 0000000..c0b212e --- /dev/null +++ b/Gemfile.7.0.mysql2 @@ -0,0 +1,15 @@ +source 'https://rubygems.org' + +# Runtime dependencies +gem 'activerecord', '~>7.0.0' +gem 'mysql2', '~>0.5' + +# Development dependencies +gem 'rake' +gem 'database_cleaner' +gem 'rspec', '~>3.5' +gem 'byebug' +gem 'gemika' + +# Gem under test +gem 'minidusen', :path => '.' diff --git a/Gemfile.7.0.mysql2.lock b/Gemfile.7.0.mysql2.lock new file mode 100644 index 0000000..e293a1e --- /dev/null +++ b/Gemfile.7.0.mysql2.lock @@ -0,0 +1,69 @@ +PATH + remote: . + specs: + minidusen (0.10) + activerecord (>= 3.2) + activesupport (>= 3.2) + edge_rider (>= 0.2.5) + +GEM + remote: https://rubygems.org/ + specs: + activemodel (7.0.0) + activesupport (= 7.0.0) + activerecord (7.0.0) + activemodel (= 7.0.0) + activesupport (= 7.0.0) + activesupport (7.0.0) + concurrent-ruby (~> 1.0, >= 1.0.2) + i18n (>= 1.6, < 2) + minitest (>= 5.1) + tzinfo (~> 2.0) + byebug (11.1.3) + concurrent-ruby (1.1.9) + database_cleaner (2.0.1) + database_cleaner-active_record (~> 2.0.0) + database_cleaner-active_record (2.0.1) + activerecord (>= 5.a) + database_cleaner-core (~> 2.0.0) + database_cleaner-core (2.0.1) + diff-lcs (1.5.0) + edge_rider (2.0.0) + activerecord (>= 3.2) + gemika (0.6.1) + i18n (1.8.11) + concurrent-ruby (~> 1.0) + minitest (5.15.0) + mysql2 (0.5.3) + rake (13.0.6) + rspec (3.10.0) + rspec-core (~> 3.10.0) + rspec-expectations (~> 3.10.0) + rspec-mocks (~> 3.10.0) + rspec-core (3.10.1) + rspec-support (~> 3.10.0) + rspec-expectations (3.10.1) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.10.0) + rspec-mocks (3.10.2) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.10.0) + rspec-support (3.10.3) + tzinfo (2.0.4) + concurrent-ruby (~> 1.0) + +PLATFORMS + x86_64-linux + +DEPENDENCIES + activerecord (~> 7.0.0) + byebug + database_cleaner + gemika + minidusen! + mysql2 (~> 0.5) + rake + rspec (~> 3.5) + +BUNDLED WITH + 2.2.3 diff --git a/Gemfile.7.0.pg b/Gemfile.7.0.pg new file mode 100644 index 0000000..c0d9908 --- /dev/null +++ b/Gemfile.7.0.pg @@ -0,0 +1,15 @@ +source 'https://rubygems.org' + +# Runtime dependencies +gem 'activerecord', '~>7.0.0' +gem 'pg', '~>1.1' + +# Development dependendcies +gem 'rake' +gem 'database_cleaner' +gem 'rspec', '~>3.5' +gem 'byebug' +gem 'gemika' + +# Gem under test +gem 'minidusen', :path => '.' diff --git a/Gemfile.7.0.pg.lock b/Gemfile.7.0.pg.lock new file mode 100644 index 0000000..05d48b9 --- /dev/null +++ b/Gemfile.7.0.pg.lock @@ -0,0 +1,69 @@ +PATH + remote: . + specs: + minidusen (0.10) + activerecord (>= 3.2) + activesupport (>= 3.2) + edge_rider (>= 0.2.5) + +GEM + remote: https://rubygems.org/ + specs: + activemodel (7.0.0) + activesupport (= 7.0.0) + activerecord (7.0.0) + activemodel (= 7.0.0) + activesupport (= 7.0.0) + activesupport (7.0.0) + concurrent-ruby (~> 1.0, >= 1.0.2) + i18n (>= 1.6, < 2) + minitest (>= 5.1) + tzinfo (~> 2.0) + byebug (11.1.3) + concurrent-ruby (1.1.9) + database_cleaner (2.0.1) + database_cleaner-active_record (~> 2.0.0) + database_cleaner-active_record (2.0.1) + activerecord (>= 5.a) + database_cleaner-core (~> 2.0.0) + database_cleaner-core (2.0.1) + diff-lcs (1.5.0) + edge_rider (2.0.0) + activerecord (>= 3.2) + gemika (0.6.1) + i18n (1.8.11) + concurrent-ruby (~> 1.0) + minitest (5.15.0) + pg (1.2.3) + rake (13.0.6) + rspec (3.10.0) + rspec-core (~> 3.10.0) + rspec-expectations (~> 3.10.0) + rspec-mocks (~> 3.10.0) + rspec-core (3.10.1) + rspec-support (~> 3.10.0) + rspec-expectations (3.10.1) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.10.0) + rspec-mocks (3.10.2) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.10.0) + rspec-support (3.10.3) + tzinfo (2.0.4) + concurrent-ruby (~> 1.0) + +PLATFORMS + x86_64-linux + +DEPENDENCIES + activerecord (~> 7.0.0) + byebug + database_cleaner + gemika + minidusen! + pg (~> 1.1) + rake + rspec (~> 3.5) + +BUNDLED WITH + 2.2.3 diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index f954e6a..2a62663 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -4,7 +4,11 @@ require 'byebug' require 'gemika' -ActiveRecord::Base.default_timezone = :local +if ActiveRecord::VERSION::MAJOR >= 7 + ActiveRecord.default_timezone = :local +else + ActiveRecord::Base.default_timezone = :local +end Dir["#{File.dirname(__FILE__)}/support/*.rb"].sort.each {|f| require f} Dir["#{File.dirname(__FILE__)}/shared_examples/*.rb"].sort.each {|f| require f} From 3b76bc3a824fde66d8a6378b0cb6fa6f83e60d44 Mon Sep 17 00:00:00 2001 From: Niklas Hasselmeyer Date: Wed, 5 Jan 2022 12:48:26 +0100 Subject: [PATCH 2/2] test switching to mariadb to let tests run successfully --- .github/workflows/test.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 2aa1d99..562e4d7 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -45,8 +45,8 @@ jobs: ruby-version: "${{ matrix.ruby }}" - name: Setup database run: | - sudo apt-get install -y mysql-client libmariadbclient-dev - mysql -e 'create database IF NOT EXISTS test;' -u root --password=password -P 3306 -h 127.0.0.1 + sudo apt-get install -y mariadb-client libmariadbclient-dev + mariadb -e 'create database IF NOT EXISTS test;' -u root --password=password -P 3306 -h 127.0.0.1 - name: Bundle run: | gem install bundler:1.17.3