Skip to content

Commit

Permalink
Bump test/unit and mocha
Browse files Browse the repository at this point in the history
  • Loading branch information
wvanbergen committed Jan 9, 2015
1 parent 814de31 commit 88c36c2
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 10 deletions.
4 changes: 2 additions & 2 deletions activemerchant.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ Gem::Specification.new do |s|
s.add_dependency("offsite_payments", "~> 2.0.0")

s.add_development_dependency('rake')
s.add_development_dependency('test-unit', '~> 1.2.3')
s.add_development_dependency('mocha', '~> 0.13.0')
s.add_development_dependency('test-unit', '~> 3')
s.add_development_dependency('mocha', '~> 1')
s.add_development_dependency('rails', '>= 3.2.14')
s.add_development_dependency('thor')
end
8 changes: 2 additions & 6 deletions test/test_helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
require 'bundler/setup'

require 'test/unit'
require 'mocha/setup'
require 'mocha/test_unit'

require 'yaml'
require 'json'
Expand All @@ -13,11 +13,7 @@

require 'active_support/core_ext/integer/time'
require 'active_support/core_ext/numeric/time'

begin
require 'active_support/core_ext/time/acts_like'
rescue LoadError
end
require 'active_support/core_ext/time/acts_like'

ActiveMerchant::Billing::Base.mode = :test

Expand Down
2 changes: 1 addition & 1 deletion test/unit/gateways/hdfc_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ def test_passing_currency
end

def test_passing_invalid_currency
assert_raise(ArgumentError, %r(unsupported currency)i) do
assert_raise(ArgumentError, 'Unsupported currency for HDFC: AOA') do
@gateway.purchase(@amount, @credit_card, :currency => "AOA")
end
end
Expand Down
1 change: 0 additions & 1 deletion test/unit/gateways/jetpay_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ def setup
@amount = 100

@options = {
:order_id => '1',
:billing_address => address(:country => 'US'),
:shipping_address => address(:country => 'US'),
:email => 'test@test.com',
Expand Down

0 comments on commit 88c36c2

Please sign in to comment.