Merge branch 'main' into fix-money-only-cents-for-negative-money

RubyMoney · Mar 13, 2024 · 1868b87 · 1868b87
2 parents 9363e10 + 0815c28
commit 1868b87
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 3 deletions.
diff --git a/.github/workflows/ruby.yml b/.github/workflows/ruby.yml
@@ -19,12 +19,12 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby-version: ['2.6', '2.7', '3.0', '3.1', '3.2']
+        ruby-version: ['3.0', '3.1', '3.2', '3.3']
         mongodb-version: ['4.4']
         sqlite-version: ['3.0']
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Set up Ruby
     # To automatically get bug fixes and new Ruby versions for ruby/setup-ruby,
     # change this to (see https://github.com/ruby/setup-ruby#versioning):

diff --git a/money-rails.gemspec b/money-rails.gemspec
@@ -42,5 +42,6 @@ Gem::Specification.new do |s|
     s.metadata['changelog_uri'] = 'https://github.com/RubyMoney/money-rails/blob/master/CHANGELOG.md'
     s.metadata['source_code_uri'] = 'https://github.com/RubyMoney/money-rails/'
     s.metadata['bug_tracker_uri'] = 'https://github.com/RubyMoney/money-rails/issues'
+    s.metadata['rubygems_mfa_required'] = 'true'
   end
 end
diff --git a/spec/configuration_spec.rb b/spec/configuration_spec.rb
@@ -76,7 +76,7 @@
       value = Money.new(-12345600, "EUR")
       symbol = Money::Currency.find(:eur).symbol
 
-      MoneyRails.default_format = {symbol_position: :after}
+      MoneyRails.default_format = { format: '%n%u' }
       expect(value.format).to match(/#{symbol}\z/)
 
       # Override with "classic" format options for backward compatibility

diff --git a/spec/dummy/config/initializers/money.rb b/spec/dummy/config/initializers/money.rb
@@ -1,6 +1,8 @@
 # encoding : utf-8
 
 MoneyRails.configure do |config|
+  Money.locale_backend = :i18n
+  Money.rounding_mode = BigDecimal::ROUND_HALF_UP
 
   # To set the default currency
   #