From 4b74a53985d9ebfa86def8c83411278ab68e8284 Mon Sep 17 00:00:00 2001 From: Josua Schmid Date: Fri, 30 Aug 2024 17:36:04 +0200 Subject: [PATCH] Add support for Rails 7.1 and 7.2 --- gemfiles/rails7.1.gemfile | 17 +++++++++++++++++ gemfiles/rails7.2.gemfile | 17 +++++++++++++++++ money-rails.gemspec | 6 +++--- spec/configuration_spec.rb | 2 +- 4 files changed, 38 insertions(+), 4 deletions(-) create mode 100644 gemfiles/rails7.1.gemfile create mode 100644 gemfiles/rails7.2.gemfile diff --git a/gemfiles/rails7.1.gemfile b/gemfiles/rails7.1.gemfile new file mode 100644 index 000000000..3951f7039 --- /dev/null +++ b/gemfiles/rails7.1.gemfile @@ -0,0 +1,17 @@ +source 'https://rubygems.org' + +gem 'rails', '~> 7.1.0' +gem 'sprockets-rails' +gem 'i18n', '~> 1.6' + +platforms :jruby do + gem "activerecord-jdbc-adapter" + gem "activerecord-jdbcsqlite3-adapter" + gem "jruby-openssl" +end + +platforms :ruby do + gem "sqlite3", "~> 1.4" +end + +gemspec path: '../' diff --git a/gemfiles/rails7.2.gemfile b/gemfiles/rails7.2.gemfile new file mode 100644 index 000000000..7050731c9 --- /dev/null +++ b/gemfiles/rails7.2.gemfile @@ -0,0 +1,17 @@ +source 'https://rubygems.org' + +gem 'rails', '~> 7.2.0' +gem 'sprockets-rails' +gem 'i18n', '~> 1.6' + +platforms :jruby do + gem "activerecord-jdbc-adapter" + gem "activerecord-jdbcsqlite3-adapter" + gem "jruby-openssl" +end + +platforms :ruby do + gem "sqlite3", "~> 2.0" +end + +gemspec path: '../' diff --git a/money-rails.gemspec b/money-rails.gemspec index 4d0a05eed..defcdb43f 100644 --- a/money-rails.gemspec +++ b/money-rails.gemspec @@ -32,9 +32,9 @@ Gem::Specification.new do |s| s.add_dependency "railties", ">= 3.0" s.add_dependency "mime-types", "< 3" if RUBY_VERSION < '2.0' # mime-types > 3 depends on mime-types-data, which doesn't support ruby 1.9 - s.add_development_dependency "rails", ">= 3.0", "< 7.0" - s.add_development_dependency "rspec-rails", "~> 3.0" - s.add_development_dependency 'database_cleaner', '~> 1.6.1' + s.add_development_dependency "rails", ">= 3.0", "< 8" + s.add_development_dependency "rspec-rails", "~> 6.1.0" + s.add_development_dependency 'database_cleaner', '~> 2.0.2' s.add_development_dependency 'test-unit', '~> 3.0' if RUBY_VERSION >= '2.2' s.add_development_dependency 'bundler' diff --git a/spec/configuration_spec.rb b/spec/configuration_spec.rb index 7fb36f0b8..bfc1164cf 100644 --- a/spec/configuration_spec.rb +++ b/spec/configuration_spec.rb @@ -138,7 +138,7 @@ context "when passed an invalid value" do it "should raise an ArgumentError" do - expect(lambda{MoneyRails.rounding_mode = "booyakasha"}).to raise_error(ArgumentError, 'booyakasha is not a valid rounding mode') + expect { MoneyRails.rounding_mode = "booyakasha" }.to raise_error(ArgumentError, 'booyakasha is not a valid rounding mode') end end end