Resolve merge conflict

spec/google/api_client/batch_spec.rb

@@ -14,9 +14,8 @@
 
 require 'spec_helper'
 require 'google/api_client'
-require 'google/api_client/version'
 
-describe Google::APIClient::BatchRequest do
+RSpec.describe Google::APIClient::BatchRequest do
   CLIENT = Google::APIClient.new(:application_name => 'API Client Tests') unless defined?(CLIENT)
 
   after do

spec/google/api_client/discovery_spec.rb

@@ -22,9 +22,8 @@ require 'multi_json'
 require 'compat/multi_json'
 require 'signet/oauth_1/client'
 require 'google/api_client'
-require 'google/api_client/version'
 
-describe Google::APIClient do
+RSpec.describe Google::APIClient do
   include ConnectionHelpers
   CLIENT = Google::APIClient.new(:application_name => 'API Client Tests') unless defined?(CLIENT)
 

spec/google/api_client/gzip_spec.rb

@@ -15,9 +15,8 @@
 require 'spec_helper'
 
 require 'google/api_client'
-require 'google/api_client/version'
 
-describe Google::APIClient::Gzip do
+RSpec.describe Google::APIClient::Gzip do
 
   def create_connection(&block)
     Faraday.new do |b|

spec/google/api_client/media_spec.rb

@@ -15,11 +15,10 @@
 require 'spec_helper'
 
 require 'google/api_client'
-require 'google/api_client/version'
 
 fixtures_path = File.expand_path('../../../fixtures', __FILE__)
 
-describe Google::APIClient::UploadIO do
+RSpec.describe Google::APIClient::UploadIO do
   it 'should reject invalid file paths' do
     expect(lambda do
       media = Google::APIClient::UploadIO.new('doesnotexist', 'text/plain')
@@ -57,7 +56,7 @@ describe Google::APIClient::UploadIO do
   end
 end
 
-describe Google::APIClient::RangedIO do
+RSpec.describe Google::APIClient::RangedIO do
   before do
     @source = StringIO.new("1234567890abcdef")
     @io = Google::APIClient::RangedIO.new(@source, 1, 5)
@@ -105,7 +104,7 @@ describe Google::APIClient::RangedIO do
     
 end
 
-describe Google::APIClient::ResumableUpload do
+RSpec.describe Google::APIClient::ResumableUpload do
   CLIENT = Google::APIClient.new(:application_name => 'API Client Tests') unless defined?(CLIENT)
 
   after do

spec/google/api_client/request_spec.rb

@@ -15,9 +15,8 @@
 require 'spec_helper'
 
 require 'google/api_client'
-require 'google/api_client/version'
 
-describe Google::APIClient::Request do
+RSpec.describe Google::APIClient::Request do
   CLIENT = Google::APIClient.new(:application_name => 'API Client Tests') unless defined?(CLIENT)
 
   it 'should normalize parameter names to strings' do

spec/google/api_client/result_spec.rb

@@ -15,9 +15,8 @@
 require 'spec_helper'
 
 require 'google/api_client'
-require 'google/api_client/version'
 
-describe Google::APIClient::Result do
+RSpec.describe Google::APIClient::Result do
   CLIENT = Google::APIClient.new(:application_name => 'API Client Tests') unless defined?(CLIENT)
 
   describe 'with the plus API' do

spec/google/api_client/service_account_spec.rb

@@ -18,7 +18,7 @@ require 'google/api_client'
 
 fixtures_path = File.expand_path('../../../fixtures', __FILE__)
 
-describe Google::APIClient::KeyUtils do
+RSpec.describe Google::APIClient::KeyUtils do
   it 'should read PKCS12 files from the filesystem' do
     if RUBY_PLATFORM == 'java' && RUBY_VERSION.start_with?('1.8')
       pending "Reading from PKCS12 not supported on jruby 1.8.x"
@@ -53,7 +53,7 @@ describe Google::APIClient::KeyUtils do
 
 end
 
-describe Google::APIClient::JWTAsserter do
+RSpec.describe Google::APIClient::JWTAsserter do
   include ConnectionHelpers
 
   before do
@@ -146,7 +146,7 @@ describe Google::APIClient::JWTAsserter do
   end
 end
 
-describe Google::APIClient::ComputeServiceAccount do
+RSpec.describe Google::APIClient::ComputeServiceAccount do
   include ConnectionHelpers
 
   it 'should query metadata server' do

spec/google/api_client/service_spec.rb

@@ -21,7 +21,7 @@ require 'google/api_client/service'
 
 fixtures_path = File.expand_path('../../../fixtures', __FILE__)
 
-describe Google::APIClient::Service do
+RSpec.describe Google::APIClient::Service do
   include ConnectionHelpers
 
   APPLICATION_NAME = 'API Client Tests'
@@ -288,7 +288,7 @@ describe Google::APIClient::Service do
 end
 
 
-describe Google::APIClient::Service::Result do
+RSpec.describe Google::APIClient::Service::Result do
 
   describe 'with the plus API' do
     before do
@@ -492,7 +492,7 @@ describe Google::APIClient::Service::Result do
   end
 end
 
-describe Google::APIClient::Service::BatchRequest do
+RSpec.describe Google::APIClient::Service::BatchRequest do
   describe 'with the discovery API' do
     before do
       @discovery = Google::APIClient::Service.new('discovery', 'v1',

spec/google/api_client/simple_file_store_spec.rb

@@ -18,14 +18,10 @@ require 'spec_helper'
 
 require 'google/api_client/service/simple_file_store'
 
-describe Google::APIClient::Service::SimpleFileStore do
+RSpec.describe Google::APIClient::Service::SimpleFileStore do
 
   FILE_NAME = 'test.cache'
 
-  before(:all) do
-    File.delete(FILE_NAME) if File.exists?(FILE_NAME)
-  end
-
   describe 'with no cache file' do
     before(:each) do
       File.delete(FILE_NAME) if File.exists?(FILE_NAME)

spec/google/api_client_spec.rb

@@ -17,7 +17,6 @@ require 'spec_helper'
 require 'faraday'
 require 'signet/oauth_1/client'
 require 'google/api_client'
-require 'google/api_client/version'
 
 shared_examples_for 'configurable user agent' do
   include ConnectionHelpers
@@ -55,7 +54,7 @@ shared_examples_for 'configurable user agent' do
   end
 end
 
-describe Google::APIClient do
+RSpec.describe Google::APIClient do
   include ConnectionHelpers
 
   let(:client) { Google::APIClient.new(:application_name => 'API Client Tests') }
@@ -191,7 +190,7 @@ describe Google::APIClient do
       end
 
       client.execute(  
-        :uri => 'https://www.gogole.com/foo',
+        :uri => 'https://www.google.com/foo',
         :connection => @connection
       )
     end
@@ -210,7 +209,7 @@ describe Google::APIClient do
       end
 
       client.execute(  
-        :uri => 'https://www.gogole.com/foo',
+        :uri => 'https://www.google.com/foo',
         :connection => @connection
       )
     end
@@ -227,7 +226,7 @@ describe Google::APIClient do
       end
 
       client.execute(  
-        :uri => 'https://www.gogole.com/foo',
+        :uri => 'https://www.google.com/foo',
         :connection => @connection
       )
     end
@@ -243,7 +242,7 @@ describe Google::APIClient do
       end
 
       client.execute(  
-        :uri => 'https://www.gogole.com/foo',
+        :uri => 'https://www.google.com/foo',
         :connection => @connection,
         :authenticated => false
       )
@@ -262,7 +261,7 @@ describe Google::APIClient do
       end
 
       expect(client.execute(  
-        :uri => 'https://www.gogole.com/foo',
+        :uri => 'https://www.google.com/foo',
         :connection => @connection
       ).status).to eq(200)
 
@@ -279,7 +278,7 @@ describe Google::APIClient do
       end
 
       expect(client.execute(  
-        :uri => 'https://www.gogole.com/foo',
+        :uri => 'https://www.google.com/foo',
         :connection => @connection
       ).status).to eq(500)
       expect(count).to eq(3)