From 4fd8964e0cf5d047d01916ba4c7a3735a60436f4 Mon Sep 17 00:00:00 2001
From: Aaron Quint <aaron@quirkey.com>
Date: Wed, 19 May 2010 09:56:59 -0400
Subject: [PATCH] Wrapping the tests in LoadError rescues to still run the
 tests when certain gems arent available

---
 test/test_curb_request_proxy.rb     | 13 ++++++++++---
 test/test_em_http_client.rb         |  9 +++++++--
 test/test_em_http_request_proxy.rb  | 13 ++++++++++---
 test/test_typhoeus_request_proxy.rb | 13 ++++++++++---
 4 files changed, 37 insertions(+), 11 deletions(-)

diff --git a/test/test_curb_request_proxy.rb b/test/test_curb_request_proxy.rb
index 5f3039e1..ae5cb50d 100644
--- a/test/test_curb_request_proxy.rb
+++ b/test/test_curb_request_proxy.rb
@@ -1,6 +1,13 @@
-require File.dirname(__FILE__) + '/test_helper.rb'
-require 'oauth/request_proxy/curb_request'
-require 'curb'
+require 'test_helper'
+
+begin
+  require 'oauth/request_proxy/curb_request'
+  require 'curb'
+rescue LoadError => e
+  warn "! problems loading curb, skipping these tests: #{e}"
+  return
+end
+
 
 class CurbRequestProxyTest < Test::Unit::TestCase
 
diff --git a/test/test_em_http_client.rb b/test/test_em_http_client.rb
index 2b76b16e..8b8642ff 100644
--- a/test/test_em_http_client.rb
+++ b/test/test_em_http_client.rb
@@ -1,5 +1,10 @@
-require File.dirname(__FILE__) + '/test_helper.rb'
-require 'oauth/client/em_http'
+require 'test_helper'
+begin
+  require 'oauth/client/em_http'
+rescue LoadError => e
+  warn "! problem loading em-http, skipping these tests: #{e}"
+  return
+end
 
 class EmHttpClientTest < Test::Unit::TestCase
 
diff --git a/test/test_em_http_request_proxy.rb b/test/test_em_http_request_proxy.rb
index e08efb51..055a95a4 100644
--- a/test/test_em_http_request_proxy.rb
+++ b/test/test_em_http_request_proxy.rb
@@ -1,6 +1,13 @@
-require File.dirname(__FILE__) + '/test_helper.rb'
-require 'em-http'
-require 'oauth/request_proxy/em_http_request'
+require 'test_helper'
+
+begin
+  require 'em-http'
+  require 'oauth/request_proxy/em_http_request'
+rescue LoadError => e
+  warn "! problem loading em-http, skipping these tests: #{e}"
+  return
+end
+
 
 class EmHttpRequestProxyTest < Test::Unit::TestCase
   
diff --git a/test/test_typhoeus_request_proxy.rb b/test/test_typhoeus_request_proxy.rb
index 974e9f09..40446041 100644
--- a/test/test_typhoeus_request_proxy.rb
+++ b/test/test_typhoeus_request_proxy.rb
@@ -1,6 +1,13 @@
-require File.dirname(__FILE__) + '/test_helper.rb'
-require 'oauth/request_proxy/typhoeus_request'
-require 'typhoeus'
+require 'test_helper'
+
+begin
+  require 'oauth/request_proxy/typhoeus_request'
+  require 'typhoeus'
+rescue LoadError => e
+  warn "! problem loading typhoeus, skipping these tests: #{e}"
+  return
+end
+
 
 class TyphoeusRequestProxyTest < Test::Unit::TestCase