From b905b2164cdd8e8e47a0254c62da2a6633354179 Mon Sep 17 00:00:00 2001 From: Evan Broder Date: Mon, 7 May 2012 17:24:44 -0700 Subject: [PATCH] Run the test suite once with ActiveSupport loaded, once without ActiveSupport is the source of many problems for us, so let's try to catch them pre-emptively with testing --- .travis.yml | 2 +- gemfiles/default-with-activesupport.gemfile | 3 ++ .../default-with-activesupport.gemfile.lock | 39 +++++++++++++++++++ gemfiles/json.gemfile | 1 + gemfiles/json.gemfile.lock | 5 +++ gemfiles/yajl.gemfile | 1 + gemfiles/yajl.gemfile.lock | 5 +++ test/test_stripe_with_active_support.rb | 3 ++ 8 files changed, 58 insertions(+), 1 deletion(-) create mode 100644 gemfiles/default-with-activesupport.gemfile create mode 100644 gemfiles/default-with-activesupport.gemfile.lock create mode 100644 test/test_stripe_with_active_support.rb diff --git a/.travis.yml b/.travis.yml index 86efdf3a..bd2b16fc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,6 +3,6 @@ rvm: - 1.8.7 - 1.9.3 gemfile: - - Gemfile + - gemfiles/default-with-activesupport.gemfile - gemfiles/json.gemfile - gemfiles/yajl.gemfile diff --git a/gemfiles/default-with-activesupport.gemfile b/gemfiles/default-with-activesupport.gemfile new file mode 100644 index 00000000..bc6f5747 --- /dev/null +++ b/gemfiles/default-with-activesupport.gemfile @@ -0,0 +1,3 @@ +source "https://rubygems.org" +gemspec :path => File.join(File.dirname(__FILE__), "..") +gem "activesupport" diff --git a/gemfiles/default-with-activesupport.gemfile.lock b/gemfiles/default-with-activesupport.gemfile.lock new file mode 100644 index 00000000..101c5db6 --- /dev/null +++ b/gemfiles/default-with-activesupport.gemfile.lock @@ -0,0 +1,39 @@ +PATH + remote: /home/evan/src/stripe-ruby + specs: + stripe (1.6.3) + multi_json (~> 1.1) + rest-client (~> 1.4) + +GEM + remote: https://rubygems.org/ + specs: + activesupport (3.2.3) + i18n (~> 0.6) + multi_json (~> 1.0) + i18n (0.6.0) + metaclass (0.0.1) + mime-types (1.18) + mocha (0.11.4) + metaclass (~> 0.0.1) + multi_json (1.3.4) + rake (0.9.2.2) + rest-client (1.6.7) + mime-types (>= 1.16) + shoulda (3.0.1) + shoulda-context (~> 1.0.0) + shoulda-matchers (~> 1.0.0) + shoulda-context (1.0.0) + shoulda-matchers (1.0.0) + test-unit (2.4.8) + +PLATFORMS + ruby + +DEPENDENCIES + activesupport + mocha + rake + shoulda + stripe! + test-unit diff --git a/gemfiles/json.gemfile b/gemfiles/json.gemfile index 62c6a173..bc409592 100644 --- a/gemfiles/json.gemfile +++ b/gemfiles/json.gemfile @@ -1,3 +1,4 @@ source "https://rubygems.org" gemspec :path => File.join(File.dirname(__FILE__), "..") gem "json" +gem "activesupport" diff --git a/gemfiles/json.gemfile.lock b/gemfiles/json.gemfile.lock index 83c4c715..17cebf70 100644 --- a/gemfiles/json.gemfile.lock +++ b/gemfiles/json.gemfile.lock @@ -8,6 +8,10 @@ PATH GEM remote: https://rubygems.org/ specs: + activesupport (3.2.3) + i18n (~> 0.6) + multi_json (~> 1.0) + i18n (0.6.0) json (1.7.0) metaclass (0.0.1) mime-types (1.18) @@ -28,6 +32,7 @@ PLATFORMS ruby DEPENDENCIES + activesupport json mocha rake diff --git a/gemfiles/yajl.gemfile b/gemfiles/yajl.gemfile index bc148315..67f5c6ca 100644 --- a/gemfiles/yajl.gemfile +++ b/gemfiles/yajl.gemfile @@ -1,3 +1,4 @@ source "https://rubygems.org" gemspec :path => File.join(File.dirname(__FILE__), "..") gem "yajl-ruby" +gem "activesupport" diff --git a/gemfiles/yajl.gemfile.lock b/gemfiles/yajl.gemfile.lock index 327f8815..5863355e 100644 --- a/gemfiles/yajl.gemfile.lock +++ b/gemfiles/yajl.gemfile.lock @@ -8,6 +8,10 @@ PATH GEM remote: https://rubygems.org/ specs: + activesupport (3.2.3) + i18n (~> 0.6) + multi_json (~> 1.0) + i18n (0.6.0) metaclass (0.0.1) mime-types (1.18) mocha (0.11.3) @@ -28,6 +32,7 @@ PLATFORMS ruby DEPENDENCIES + activesupport mocha rake shoulda diff --git a/test/test_stripe_with_active_support.rb b/test/test_stripe_with_active_support.rb new file mode 100644 index 00000000..8dad5246 --- /dev/null +++ b/test/test_stripe_with_active_support.rb @@ -0,0 +1,3 @@ +require 'active_support' +ActiveSupport.autoloads.each_key {|sym| ActiveSupport.const_get(sym)} +load File.expand_path(File.join(File.dirname(__FILE__), 'test_stripe.rb'))