Skip to content

Commit

Permalink
Get tests passing with ActiveSupport 3
Browse files Browse the repository at this point in the history
  • Loading branch information
bkeepers committed May 11, 2010
1 parent 96a51e4 commit ef2a57d
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 12 deletions.
10 changes: 0 additions & 10 deletions Manifest.txt

This file was deleted.

8 changes: 6 additions & 2 deletions Rakefile
Expand Up @@ -43,5 +43,9 @@ Spec::Rake::SpecTask.new do |t|
end
task :spec => :check_dependencies

desc "Run tests"
task :default => :spec
task :default do
%w(2.3.5 3.0.0.beta3).each do |version|
puts "Running specs with Rails #{version}"
system("RAILS_VERSION=#{version} rake -s spec;")
end
end
1 change: 1 addition & 0 deletions lib/tinder.rb
@@ -1,4 +1,5 @@
require 'active_support'
require 'active_support/json'

require 'tinder/connection'
require 'tinder/multipart'
Expand Down
1 change: 1 addition & 0 deletions lib/tinder/connection.rb
@@ -1,4 +1,5 @@
require 'httparty'
require 'active_support/core_ext/hash/indifferent_access'

# override HTTParty's json parser to return a HashWithIndifferentAccess
module HTTParty
Expand Down
1 change: 1 addition & 0 deletions spec/spec_helper.rb
Expand Up @@ -2,6 +2,7 @@

require 'rubygems'
require 'spec'
gem 'activesupport', ENV['RAILS_VERSION'] if ENV['RAILS_VERSION']
require 'tinder'
require 'fakeweb'

Expand Down

0 comments on commit ef2a57d

Please sign in to comment.