money-rails 1.0.0 → 1.1.0

data/spec/configuration_spec.rb

@@ -5,16 +5,16 @@ describe "configuration" do
   describe "initializer" do
 
     it "sets default currency" do
-      Money.default_currency.should == Money::Currency.new(:eur)
+      expect(Money.default_currency).to eq(Money::Currency.new(:eur))
     end
 
     it "registers a custom currency" do
-      Money::Currency.table.should include(:eu4)
+      expect(Money::Currency.table).to include(:eu4)
     end
 
     it "adds exchange rates given in config initializer" do
-      Money.us_dollar(100).exchange_to("CAD").should == Money.new(124, "CAD")
-      Money.ca_dollar(100).exchange_to("USD").should == Money.new(80, "USD")
+      expect(Money.us_dollar(100).exchange_to("CAD")).to eq(Money.new(124, "CAD"))
+      expect(Money.ca_dollar(100).exchange_to("USD")).to eq(Money.new(80, "USD"))
     end
 
     it "sets no_cents_if_whole value for formatted output globally" do
@@ -23,15 +23,15 @@ describe "configuration" do
 
       value = Money.new(12345600, "EUR")
       mark = Money::Currency.find(:eur).decimal_mark
-      value.format.should =~ /#{mark}/
+      expect(value.format).to match(/#{mark}/)
 
       MoneyRails.no_cents_if_whole = true
-      value.format.should_not =~ /#{mark}/
-      value.format(no_cents_if_whole: false).should =~ /#{mark}/
+      expect(value.format).not_to match(/#{mark}/)
+      expect(value.format(no_cents_if_whole: false)).to match(/#{mark}/)
 
       MoneyRails.no_cents_if_whole = false
-      value.format.should =~ /#{mark}/
-      value.format(no_cents_if_whole: true).should_not =~ /#{mark}/
+      expect(value.format).to match(/#{mark}/)
+      expect(value.format(no_cents_if_whole: true)).not_to match(/#{mark}/)
 
       # Reset global settings
       MoneyRails.no_cents_if_whole = nil
@@ -41,15 +41,15 @@ describe "configuration" do
     it "sets symbol for formatted output globally" do
       value = Money.new(12345600, "EUR")
       symbol = Money::Currency.find(:eur).symbol
-      value.format.should =~ /#{symbol}/
+      expect(value.format).to match(/#{symbol}/)
 
       MoneyRails.symbol = false
-      value.format.should_not =~ /#{symbol}/
-      value.format(symbol: true).should =~ /#{symbol}/
+      expect(value.format).not_to match(/#{symbol}/)
+      expect(value.format(symbol: true)).to match(/#{symbol}/)
 
       MoneyRails.symbol = true
-      value.format.should =~ /#{symbol}/
-      value.format(symbol: false).should_not =~ /#{symbol}/
+      expect(value.format).to match(/#{symbol}/)
+      expect(value.format(symbol: false)).not_to match(/#{symbol}/)
 
       # Reset global setting
       MoneyRails.symbol = nil
@@ -58,26 +58,43 @@ describe "configuration" do
     it "sets the location of the negative sign for formatted output globally" do
       value = Money.new(-12345600, "EUR")
       symbol = Money::Currency.find(:eur).symbol
-      value.format.should =~ /#{symbol}-/
+      expect(value.format).to match(/#{symbol}-/)
 
       MoneyRails.sign_before_symbol = false
-      value.format.should =~ /#{symbol}-/
-      value.format(sign_before_symbol: false).should =~ /#{symbol}-/
+      expect(value.format).to match(/#{symbol}-/)
+      expect(value.format(sign_before_symbol: false)).to match(/#{symbol}-/)
 
       MoneyRails.sign_before_symbol = true
-      value.format.should =~ /-#{symbol}/
-      value.format(sign_before_symbol: true).should =~ /-#{symbol}/
+      expect(value.format).to match(/-#{symbol}/)
+      expect(value.format(sign_before_symbol: true)).to match(/-#{symbol}/)
 
       # Reset global setting
       MoneyRails.sign_before_symbol = nil
     end
 
+    it "passes through arbitrary format options" do
+      value = Money.new(-12345600, "EUR")
+      symbol = Money::Currency.find(:eur).symbol
+
+      MoneyRails.default_format = {:symbol_position => :after}
+      expect(value.format).to match(/#{symbol}\z/)
+
+      # Override with "classic" format options for backward compatibility
+      MoneyRails.default_format = {:sign_before_symbol => :false}
+      MoneyRails.sign_before_symbol = true
+      expect(value.format).to match(/-#{symbol}/)
+
+      # Reset global settings
+      MoneyRails.sign_before_symbol = nil
+      MoneyRails.default_format = nil
+    end
+
     it "changes the amount and currency column settings based on the default currency" do
       old_currency = MoneyRails.default_currency
       MoneyRails.default_currency = :inr
 
-      MoneyRails.amount_column[:postfix].should == "_#{MoneyRails.default_currency.subunit.downcase.pluralize}"
-      MoneyRails.currency_column[:default].should == MoneyRails.default_currency.iso_code
+      expect(MoneyRails.amount_column[:postfix]).to eq("_#{MoneyRails.default_currency.subunit.downcase.pluralize}")
+      expect(MoneyRails.currency_column[:default]).to eq(MoneyRails.default_currency.iso_code)
 
       # Reset global setting
       MoneyRails.default_currency = old_currency
@@ -90,7 +107,7 @@ describe "configuration" do
         MoneyRails.default_currency = :jpy
       }.to_not raise_error
 
-      MoneyRails.amount_column[:postfix].should == "_cents"
+      expect(MoneyRails.amount_column[:postfix]).to eq("_cents")
 
       # Reset global setting
       MoneyRails.default_currency = old_currency

data/spec/dummy/app/models/dummy_product.rb

@@ -5,3 +5,4 @@ class DummyProduct < ActiveRecord::Base
   # Use money-rails macros
   monetize :price_cents, :with_model_currency => :currency
 end
+

data/spec/dummy/app/models/product.rb

@@ -39,4 +39,8 @@ class Product < ActiveRecord::Base
     :less_than_or_equal_to => 100,
     :message => 'Must be greater than zero and less than $100',
   }
+
+  alias_attribute :renamed_cents, :aliased_cents
+
+  monetize :renamed_cents, allow_nil: true
 end

data/spec/dummy/config/application.rb

@@ -15,7 +15,9 @@ require "money-rails"
 module Dummy
   class Application < Rails::Application
 
-    I18n.enforce_available_locales = false # removes deprecation warning
+    if I18n.respond_to?(:enforce_available_locales)
+      I18n.enforce_available_locales = false # removes deprecation warning
+    end
 
     # Settings in config/environments/* take precedence over those specified here.
     # Application configuration should go into files in config/initializers
@@ -59,4 +61,3 @@ module Dummy
     config.assets.version = '1.0'
   end
 end
-

data/spec/dummy/config/locales/en-US.yml

@@ -0,0 +1,5 @@
+en-US:
+  number:
+    currency:
+      format:
+        delimiter: ''

data/spec/dummy/db/migrate/20141005075025_add_aliased_attr_to_products.rb

@@ -0,0 +1,5 @@
+class AddAliasedAttrToProducts < ActiveRecord::Migration
+  def change
+    add_column :products, :aliased_cents, :integer
+  end
+end

data/spec/dummy/db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20140110194016) do
+ActiveRecord::Schema.define(version: 20141005075025) do
 
   create_table "dummy_products", force: true do |t|
     t.string   "currency"
@@ -31,6 +31,7 @@ ActiveRecord::Schema.define(version: 20140110194016) do
     t.string   "sale_price_currency_code"
     t.integer  "price_in_a_range_cents"
     t.integer  "validates_method_amount_cents"
+    t.integer  "aliased_cents"
   end
 
   create_table "services", force: true do |t|

data/spec/helpers/action_view_extension_spec.rb

@@ -1,62 +1,62 @@
 require 'spec_helper'
 
-describe 'MoneyRails::ActionViewExtension' do
+describe 'MoneyRails::ActionViewExtension', :type => :helper do
   describe '#currency_symbol' do
     subject { helper.currency_symbol }
-    it { should be_a String }
-    it { should include Money.default_currency.symbol }
+    it { is_expected.to be_a String }
+    it { is_expected.to include Money.default_currency.symbol }
   end
 
   describe '#humanized_money' do
     let(:options) { {} }
     subject { helper.humanized_money Money.new(12500), options }
-    it { should be_a String }
-    it { should_not include Money.default_currency.symbol }
-    it { should_not include Money.default_currency.decimal_mark }
+    it { is_expected.to be_a String }
+    it { is_expected.not_to include Money.default_currency.symbol }
+    it { is_expected.not_to include Money.default_currency.decimal_mark }
 
     context 'with symbol options' do
       let(:options) { { :symbol => true } }
-      it { should include Money.default_currency.symbol }
+      it { is_expected.to include Money.default_currency.symbol }
     end
 
     context 'with deprecated symbol' do
       let(:options) { true }
       before(:each) do
-        helper.should_receive(:warn)
+        expect(helper).to receive(:warn)
       end
-      it { should include Money.default_currency.symbol }
+      it { is_expected.to include Money.default_currency.symbol }
     end
   end
 
   describe '#humanized_money_with_symbol' do
     subject { helper.humanized_money_with_symbol Money.new(12500) }
-    it { should be_a String }
-    it { should_not include Money.default_currency.decimal_mark }
-    it { should include Money.default_currency.symbol }
+    it { is_expected.to be_a String }
+    it { is_expected.not_to include Money.default_currency.decimal_mark }
+    it { is_expected.to include Money.default_currency.symbol }
   end
 
   describe '#money_without_cents' do
     let(:options) { {} }
     subject { helper.money_without_cents Money.new(12500), options }
-    it { should be_a String }
-    it { should_not include Money.default_currency.symbol }
-    it { should_not include Money.default_currency.decimal_mark }
+    it { is_expected.to be_a String }
+    it { is_expected.not_to include Money.default_currency.symbol }
+    it { is_expected.not_to include Money.default_currency.decimal_mark }
 
     context 'with deprecated symbol' do
       let(:options) { true }
       before(:each) do
-        helper.should_receive(:warn)
+        expect(helper).to receive(:warn)
       end
-      it { should include Money.default_currency.symbol }
+      it { is_expected.to include Money.default_currency.symbol }
     end
   end
 
   describe '#money_without_cents_and_with_symbol' do
     subject { helper.money_without_cents_and_with_symbol Money.new(12500) }
-    it { should be_a String }
-    it { should_not include Money.default_currency.decimal_mark }
-    it { should include Money.default_currency.symbol }
-    it { should_not include "00" }
+    it { is_expected.to be_a String }
+    it { is_expected.not_to include Money.default_currency.decimal_mark }
+    it { is_expected.to include Money.default_currency.symbol }
+    it { is_expected.not_to include "00" }
   end
 
   context 'respects MoneyRails::Configuration settings' do
@@ -70,18 +70,18 @@ describe 'MoneyRails::ActionViewExtension' do
 
       describe '#humanized_money' do
         subject { helper.humanized_money Money.new(12500) }
-        it { should be_a String }
-        it { should_not include Money.default_currency.decimal_mark }
-        it { should_not include Money.default_currency.symbol }
-        it { should include "00" }
+        it { is_expected.to be_a String }
+        it { is_expected.not_to include Money.default_currency.decimal_mark }
+        it { is_expected.not_to include Money.default_currency.symbol }
+        it { is_expected.to include "00" }
       end
 
       describe '#humanized_money_with_symbol' do
         subject { helper.humanized_money_with_symbol Money.new(12500) }
-        it { should be_a String }
-        it { should_not include Money.default_currency.decimal_mark }
-        it { should include Money.default_currency.symbol }
-        it { should include "00" }
+        it { is_expected.to be_a String }
+        it { is_expected.not_to include Money.default_currency.decimal_mark }
+        it { is_expected.to include Money.default_currency.symbol }
+        it { is_expected.to include "00" }
       end
     end
 
@@ -95,18 +95,18 @@ describe 'MoneyRails::ActionViewExtension' do
 
       describe '#humanized_money' do
         subject { helper.humanized_money Money.new(12500) }
-        it { should be_a String }
-        it { should_not include Money.default_currency.decimal_mark }
-        it { should_not include Money.default_currency.symbol }
-        it { should_not include "00" }
+        it { is_expected.to be_a String }
+        it { is_expected.not_to include Money.default_currency.decimal_mark }
+        it { is_expected.not_to include Money.default_currency.symbol }
+        it { is_expected.not_to include "00" }
       end
 
       describe '#humanized_money_with_symbol' do
         subject { helper.humanized_money_with_symbol Money.new(12500) }
-        it { should be_a String }
-        it { should_not include Money.default_currency.decimal_mark }
-        it { should include Money.default_currency.symbol }
-        it { should_not include "00" }
+        it { is_expected.to be_a String }
+        it { is_expected.not_to include Money.default_currency.decimal_mark }
+        it { is_expected.to include Money.default_currency.symbol }
+        it { is_expected.not_to include "00" }
       end
     end
 
@@ -120,18 +120,18 @@ describe 'MoneyRails::ActionViewExtension' do
 
       describe '#humanized_money' do
         subject { helper.humanized_money Money.new(12500) }
-        it { should be_a String }
-        it { should_not include Money.default_currency.decimal_mark }
-        it { should_not include Money.default_currency.symbol }
-        it { should_not include "00" }
+        it { is_expected.to be_a String }
+        it { is_expected.not_to include Money.default_currency.decimal_mark }
+        it { is_expected.not_to include Money.default_currency.symbol }
+        it { is_expected.not_to include "00" }
       end
 
       describe '#humanized_money_with_symbol' do
         subject { helper.humanized_money_with_symbol Money.new(12500) }
-        it { should be_a String }
-        it { should_not include Money.default_currency.decimal_mark }
-        it { should include Money.default_currency.symbol }
-        it { should_not include "00" }
+        it { is_expected.to be_a String }
+        it { is_expected.not_to include Money.default_currency.decimal_mark }
+        it { is_expected.to include Money.default_currency.symbol }
+        it { is_expected.not_to include "00" }
       end
     end
 

data/spec/helpers/form_helper_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 if defined? ActiveRecord
-  describe "Test helper in form blocks" do
+  describe "Test helper in form blocks", :type => :helper do
 
     let :product do
       Product.create(:price_cents => 3000, :discount => 150,
@@ -12,7 +12,7 @@ if defined? ActiveRecord
     context "textfield" do
       it "uses the current value of money field in textfield" do
         helper.instance_variable_set :@product, product
-        helper.text_field(:product, :price).should =~ /value=\"#{product.price.to_s}\"/
+        expect(helper.text_field(:product, :price)).to match(/value=\"#{product.price.to_s}\"/)
       end
     end
   end

data/spec/mongoid/four_spec.rb

@@ -22,18 +22,18 @@ if defined?(Mongoid) && ::Mongoid::VERSION =~ /^4(.*)/
 
     context "mongoize" do
       it "correctly mongoizes a Money object to a hash of cents and currency" do
-        priceable.price.cents.should == 100
-        priceable.price.currency.should == Money::Currency.find('EUR')
+        expect(priceable.price.cents).to eq(100)
+        expect(priceable.price.currency).to eq(Money::Currency.find('EUR'))
       end
 
       it "correctly mongoizes a Numeric object to a hash of cents and currency" do
-        priceable_from_num.price.cents.should == 100
-        priceable_from_num.price.currency.should == Money.default_currency
+        expect(priceable_from_num.price.cents).to eq(100)
+        expect(priceable_from_num.price.currency).to eq(Money.default_currency)
       end
 
       it "correctly mongoizes a String object to a hash of cents and currency" do
-        priceable_from_string.price.cents.should == 100
-        priceable_from_string.price.currency.should == Money::Currency.find('EUR')
+        expect(priceable_from_string.price.cents).to eq(100)
+        expect(priceable_from_string.price.currency).to eq(Money::Currency.find('EUR'))
       end
 
       context "when MoneyRails.raise_error_on_money_parsing is true" do
@@ -51,22 +51,22 @@ if defined?(Mongoid) && ::Mongoid::VERSION =~ /^4(.*)/
 
       context "when MoneyRails.raise_error_on_money_parsing is false" do
         it "does not correctly mongoize a String with a hyphen in its middle" do
-          priceable_from_string_with_hyphen.price.should == nil
+          expect(priceable_from_string_with_hyphen.price).to eq(nil)
         end
 
         it "does not correctly mongoize a String with an unknown currency" do
-          priceable_from_string_with_unknown_currency.price.should == nil
+          expect(priceable_from_string_with_unknown_currency.price).to eq(nil)
         end
       end
 
       it "correctly mongoizes a hash of cents and currency" do
-        priceable_from_hash.price.cents.should == 100
-        priceable_from_hash.price.currency.should == Money::Currency.find('EUR')
+        expect(priceable_from_hash.price.cents).to eq(100)
+        expect(priceable_from_hash.price.currency).to eq(Money::Currency.find('EUR'))
       end
 
       it "correctly mongoizes a HashWithIndifferentAccess of cents and currency" do
-        priceable_from_hash_with_indifferent_access.price.cents.should == 100
-        priceable_from_hash_with_indifferent_access.price.currency.should == Money::Currency.find('EUR')
+        expect(priceable_from_hash_with_indifferent_access.price.cents).to eq(100)
+        expect(priceable_from_hash_with_indifferent_access.price.currency).to eq(Money::Currency.find('EUR'))
       end
 
       context "infinite_precision = true" do
@@ -79,36 +79,36 @@ if defined?(Mongoid) && ::Mongoid::VERSION =~ /^4(.*)/
         end
 
         it "correctly mongoizes a Money object to a hash of cents and currency" do
-          priceable_with_infinite_precision.price.cents.should == BigDecimal.new('100.1')
-          priceable_with_infinite_precision.price.currency.should == Money::Currency.find('EUR')
+          expect(priceable_with_infinite_precision.price.cents).to eq(BigDecimal.new('100.1'))
+          expect(priceable_with_infinite_precision.price.currency).to eq(Money::Currency.find('EUR'))
         end
       end
     end
 
     it "correctly serializes a Hash field containing Money objects" do
-      priceable_with_hash_field.price_hash[:key1][:cents].should == 100
-      priceable_with_hash_field.price_hash[:key2][:cents].should == 200
-      priceable_with_hash_field.price_hash[:key1][:currency_iso].should == 'EUR'
-      priceable_with_hash_field.price_hash[:key2][:currency_iso].should == 'USD'
+      expect(priceable_with_hash_field.price_hash[:key1][:cents]).to eq(100)
+      expect(priceable_with_hash_field.price_hash[:key2][:cents]).to eq(200)
+      expect(priceable_with_hash_field.price_hash[:key1][:currency_iso]).to eq('EUR')
+      expect(priceable_with_hash_field.price_hash[:key2][:currency_iso]).to eq('USD')
     end
 
     context "demongoize" do
       subject { Priceable.first.price }
-      it { should be_an_instance_of(Money) }
-      it { should == Money.new(100, 'EUR') }
+      it { is_expected.to be_an_instance_of(Money) }
+      it { is_expected.to eq(Money.new(100, 'EUR')) }
       it "returns nil if a nil value was stored" do
         nil_priceable = Priceable.create(:price => nil)
-        nil_priceable.price.should be_nil
+        expect(nil_priceable.price).to be_nil
       end
       it 'returns nil if an unknown value was stored' do
         zero_priceable = Priceable.create(:price => [])
-        zero_priceable.price.should be_nil
+        expect(zero_priceable.price).to be_nil
       end
     end
 
     context "evolve" do
       it "correctly transforms a Money object into a Mongo friendly value" do
-        Priceable.where(:price => Money.new(100, 'EUR')).first.should == priceable
+        expect(Priceable.where(:price => Money.new(100, 'EUR')).first).to eq(priceable)
       end
     end
   end

data/spec/mongoid/three_spec.rb

@@ -22,18 +22,18 @@ if defined?(Mongoid) && ::Mongoid::VERSION =~ /^3(.*)/
 
     context "mongoize" do
       it "mongoizes correctly a Money object to a hash of cents and currency" do
-        priceable.price.cents.should == 100
-        priceable.price.currency.should == Money::Currency.find('EUR')
+        expect(priceable.price.cents).to eq(100)
+        expect(priceable.price.currency).to eq(Money::Currency.find('EUR'))
       end
 
       it "mongoizes correctly a Numeric object to a hash of cents and currency" do
-        priceable_from_num.price.cents.should == 100
-        priceable_from_num.price.currency.should == Money.default_currency
+        expect(priceable_from_num.price.cents).to eq(100)
+        expect(priceable_from_num.price.currency).to eq(Money.default_currency)
       end
 
       it "mongoizes correctly a String object to a hash of cents and currency" do
-        priceable_from_string.price.cents.should == 100
-        priceable_from_string.price.currency.should == Money::Currency.find('EUR')
+        expect(priceable_from_string.price.cents).to eq(100)
+        expect(priceable_from_string.price.currency).to eq(Money::Currency.find('EUR'))
       end
 
       context "when MoneyRails.raise_error_on_money_parsing is true" do
@@ -51,22 +51,22 @@ if defined?(Mongoid) && ::Mongoid::VERSION =~ /^3(.*)/
 
       context "when MoneyRails.raise_error_on_money_parsing is false" do
         it "does not mongoizes correctly a String with hyphen in its middle" do
-          priceable_from_string_with_hyphen.price.should == nil
+          expect(priceable_from_string_with_hyphen.price).to eq(nil)
         end
 
         it "does not mongoize correctly a String with an unknown currency" do
-          priceable_from_string_with_unknown_currency.price.should == nil
+          expect(priceable_from_string_with_unknown_currency.price).to eq(nil)
         end
       end
 
       it "mongoizes correctly a hash of cents and currency" do
-        priceable_from_hash.price.cents.should == 100
-        priceable_from_hash.price.currency.should == Money::Currency.find('EUR')
+        expect(priceable_from_hash.price.cents).to eq(100)
+        expect(priceable_from_hash.price.currency).to eq(Money::Currency.find('EUR'))
       end
 
       it "mongoizes correctly a HashWithIndifferentAccess of cents and currency" do
-        priceable_from_hash_with_indifferent_access.price.cents.should == 100
-        priceable_from_hash_with_indifferent_access.price.currency.should == Money::Currency.find('EUR')
+        expect(priceable_from_hash_with_indifferent_access.price.cents).to eq(100)
+        expect(priceable_from_hash_with_indifferent_access.price.currency).to eq(Money::Currency.find('EUR'))
       end
 
       context "infinite_precision = true" do
@@ -79,36 +79,36 @@ if defined?(Mongoid) && ::Mongoid::VERSION =~ /^3(.*)/
         end
 
         it "mongoizes correctly a Money object to a hash of cents and currency" do
-          priceable_with_infinite_precision.price.cents.should == BigDecimal.new('100.1')
-          priceable_with_infinite_precision.price.currency.should == Money::Currency.find('EUR')
+          expect(priceable_with_infinite_precision.price.cents).to eq(BigDecimal.new('100.1'))
+          expect(priceable_with_infinite_precision.price.currency).to eq(Money::Currency.find('EUR'))
         end
       end
     end
 
     it "serializes correctly a Hash field containing Money objects" do
-      priceable_with_hash_field.price_hash[:key1][:cents].should == 100
-      priceable_with_hash_field.price_hash[:key2][:cents].should == 200
-      priceable_with_hash_field.price_hash[:key1][:currency_iso].should == 'EUR'
-      priceable_with_hash_field.price_hash[:key2][:currency_iso].should == 'USD'
+      expect(priceable_with_hash_field.price_hash[:key1][:cents]).to eq(100)
+      expect(priceable_with_hash_field.price_hash[:key2][:cents]).to eq(200)
+      expect(priceable_with_hash_field.price_hash[:key1][:currency_iso]).to eq('EUR')
+      expect(priceable_with_hash_field.price_hash[:key2][:currency_iso]).to eq('USD')
     end
 
     context "demongoize" do
       subject { Priceable.first.price }
-      it { should be_an_instance_of(Money) }
-      it { should == Money.new(100, 'EUR') }
+      it { is_expected.to be_an_instance_of(Money) }
+      it { is_expected.to eq(Money.new(100, 'EUR')) }
       it "returns nil if a nil value was stored" do
         nil_priceable = Priceable.create(:price => nil)
-        nil_priceable.price.should be_nil
+        expect(nil_priceable.price).to be_nil
       end
       it 'returns nil if an unknown value was stored' do
         zero_priceable = Priceable.create(:price => [])
-        zero_priceable.price.should be_nil
+        expect(zero_priceable.price).to be_nil
       end
     end
 
     context "evolve" do
       it "transforms correctly a Money object to a Mongo friendly value" do
-        Priceable.where(:price => Money.new(100, 'EUR')).first.should == priceable
+        expect(Priceable.where(:price => Money.new(100, 'EUR')).first).to eq(priceable)
       end
     end
   end

data/spec/mongoid/two_spec.rb

@@ -11,18 +11,18 @@ if defined?(Mongoid) && ::Mongoid::VERSION =~ /^2(.*)/
 
     context "serialize" do
       it "serializes correctly a Money object to a hash of cents and currency" do
-        priceable.price.cents.should == 100
-        priceable.price.currency.should == Money::Currency.find('EUR')
+        expect(priceable.price.cents).to eq(100)
+        expect(priceable.price.currency).to eq(Money::Currency.find('EUR'))
       end
 
       it "mongoizes correctly a Numeric object to a hash of cents and currency" do
-        priceable_from_num.price.cents.should == 100
-        priceable_from_num.price.currency.should == Money.default_currency
+        expect(priceable_from_num.price.cents).to eq(100)
+        expect(priceable_from_num.price.currency).to eq(Money.default_currency)
       end
 
       it "mongoizes correctly a String object to a hash of cents and currency" do
-        priceable_from_string.price.cents.should == 100
-        priceable_from_string.price.currency.should == Money::Currency.find('EUR')
+        expect(priceable_from_string.price.cents).to eq(100)
+        expect(priceable_from_string.price.currency).to eq(Money::Currency.find('EUR'))
       end
 
       context "infinite_precision = true" do
@@ -35,8 +35,8 @@ if defined?(Mongoid) && ::Mongoid::VERSION =~ /^2(.*)/
         end
 
         it "mongoizes correctly a Money object to a hash of cents and currency" do
-          priceable_with_infinite_precision.price.cents.should == BigDecimal.new('100.1')
-          priceable_with_infinite_precision.price.currency.should == Money::Currency.find('EUR')
+          expect(priceable_with_infinite_precision.price.cents).to eq(BigDecimal.new('100.1'))
+          expect(priceable_with_infinite_precision.price.currency).to eq(Money::Currency.find('EUR'))
         end
       end
 
@@ -51,22 +51,22 @@ if defined?(Mongoid) && ::Mongoid::VERSION =~ /^2(.*)/
 
       context "when MoneyRails.raise_error_on_money_parsing is false" do
         it "does not mongoizes correctly a String with hyphen in its middle" do
-          priceable_from_string_with_hyphen.price.should == nil
+          expect(priceable_from_string_with_hyphen.price).to eq(nil)
         end
       end
     end
 
     context "deserialize" do
       subject { priceable.price }
-      it { should be_an_instance_of(Money) }
-      it { should == Money.new(100, 'EUR') }
+      it { is_expected.to be_an_instance_of(Money) }
+      it { is_expected.to eq(Money.new(100, 'EUR')) }
       it "returns nil if a nil value was stored" do
         nil_priceable = Priceable.create(:price => nil)
-        nil_priceable.price.should be_nil
+        expect(nil_priceable.price).to be_nil
       end
       it 'returns nil if an unknown value was stored' do
         zero_priceable = Priceable.create(:price => [])
-        zero_priceable.price.should be_nil
+        expect(zero_priceable.price).to be_nil
       end
     end
   end