From 8d99b5b46cdd9bc80580716e63e095f92122ab97 Mon Sep 17 00:00:00 2001
From: Bob Aman <bobaman@google.com>
Date: Wed, 1 Aug 2012 00:31:24 +0300
Subject: [PATCH] Resolving constant redefinition warnings.

---
 spec/google/api_client/batch_spec.rb     | 2 +-
 spec/google/api_client/discovery_spec.rb | 2 +-
 spec/google/api_client/media_spec.rb     | 2 +-
 spec/google/api_client/result_spec.rb    | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/spec/google/api_client/batch_spec.rb b/spec/google/api_client/batch_spec.rb
index 315faaef6..087210bec 100644
--- a/spec/google/api_client/batch_spec.rb
+++ b/spec/google/api_client/batch_spec.rb
@@ -18,7 +18,7 @@ require 'google/api_client'
 require 'google/api_client/version'
 
 describe Google::APIClient::BatchRequest do
-  CLIENT = Google::APIClient.new
+  CLIENT ||= Google::APIClient.new
 
   after do
     # Reset client to not-quite-pristine state
diff --git a/spec/google/api_client/discovery_spec.rb b/spec/google/api_client/discovery_spec.rb
index 5e363d452..e196b0f53 100644
--- a/spec/google/api_client/discovery_spec.rb
+++ b/spec/google/api_client/discovery_spec.rb
@@ -29,7 +29,7 @@ require 'google/api_client'
 require 'google/api_client/version'
 
 describe Google::APIClient do
-  CLIENT = Google::APIClient.new
+  CLIENT ||= Google::APIClient.new
 
   after do
     # Reset client to not-quite-pristine state
diff --git a/spec/google/api_client/media_spec.rb b/spec/google/api_client/media_spec.rb
index fd3be5869..888a83cf8 100644
--- a/spec/google/api_client/media_spec.rb
+++ b/spec/google/api_client/media_spec.rb
@@ -58,7 +58,7 @@ describe Google::APIClient::UploadIO do
 end
 
 describe Google::APIClient::ResumableUpload do
-  CLIENT = Google::APIClient.new
+  CLIENT ||= Google::APIClient.new
 
   after do
     # Reset client to not-quite-pristine state
diff --git a/spec/google/api_client/result_spec.rb b/spec/google/api_client/result_spec.rb
index f3fb89227..d7c3326c2 100644
--- a/spec/google/api_client/result_spec.rb
+++ b/spec/google/api_client/result_spec.rb
@@ -18,7 +18,7 @@ require 'google/api_client'
 require 'google/api_client/version'
 
 describe Google::APIClient::Result do
-  CLIENT = Google::APIClient.new
+  CLIENT ||= Google::APIClient.new
 
   describe 'with the plus API' do
     before do