#160 - Add option to set encoding of response body

[arvados.git] / spec / google / api_client / gzip_spec.rb

diff --git a/spec/google/api_client/gzip_spec.rb b/spec/google/api_client/gzip_spec.rb
index bf5be8d025cc01d8904e8c1eca397c910d6b14b9..0539b97d9395c0eb6a2de20876a7470279599ced 100644 (file)
--- a/spec/google/api_client/gzip_spec.rb
+++ b/spec/google/api_client/gzip_spec.rb
@@ -1,3 +1,4 @@
+# Encoding: utf-8
 # Copyright 2012 Google Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,12 +16,12 @@
 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|
+      b.response :charset
       b.response :gzip
       b.adapter :test do |stub|
         stub.get '/', &block
@@ -33,7 +34,7 @@ describe Google::APIClient::Gzip do
       [200, {}, 'Hello world']
     end
     result = conn.get('/')
-    result.body.should == "Hello world"
+    expect(result.body).to eq("Hello world")
   end
 
   it 'should decompress gziped content' do
@@ -41,9 +42,20 @@ describe Google::APIClient::Gzip do
       [200, { 'Content-Encoding' => 'gzip'}, Base64.decode64('H4sICLVGwlEAA3RtcADzSM3JyVcozy/KSeECANXgObcMAAAA')]
     end
     result = conn.get('/')
-    result.body.should == "Hello world\n"
+    expect(result.body).to eq("Hello world\n")
   end
   
+  it 'should inflate with the correct charset encoding' do
+    conn = create_connection do |env|
+      [200, 
+        { 'Content-Encoding' => 'deflate', 'Content-Type' => 'application/json;charset=BIG5'}, 
+        Base64.decode64('eJxb8nLp7t2VAA8fBCI=')]
+    end
+    result = conn.get('/')
+    expect(result.body.encoding).to eq(Encoding::BIG5)
+    expect(result.body).to eq('日本語'.encode("BIG5"))
+  end
+
   describe 'with API Client' do
 
     before do
@@ -55,8 +67,8 @@ describe Google::APIClient::Gzip do
     it 'should send gzip in user agent' do
       conn = create_connection do |env|
         agent = env[:request_headers]['User-Agent']
-        agent.should_not be_nil
-        agent.should include 'gzip'
+        expect(agent).not_to be_nil
+        expect(agent).to include 'gzip'
         [200, {}, 'Hello world']
       end
       @client.execute(:uri => 'http://www.example.com/', :connection => conn)
@@ -65,8 +77,8 @@ describe Google::APIClient::Gzip do
     it 'should send gzip in accept-encoding' do
       conn = create_connection do |env|
         encoding = env[:request_headers]['Accept-Encoding']
-        encoding.should_not be_nil
-        encoding.should include 'gzip'
+        expect(encoding).not_to be_nil
+        expect(encoding).to include 'gzip'
         [200, {}, 'Hello world']
       end
       @client.execute(:uri => 'http://www.example.com/', :connection => conn)
@@ -75,7 +87,7 @@ describe Google::APIClient::Gzip do
     it 'should not send gzip in accept-encoding if disabled for request' do
       conn = create_connection do |env|
         encoding = env[:request_headers]['Accept-Encoding']
-        encoding.should_not include('gzip') unless encoding.nil?
+        expect(encoding).not_to include('gzip') unless encoding.nil?
         [200, {}, 'Hello world']
       end
       response = @client.execute(:uri => 'http://www.example.com/', :gzip => false, :connection => conn)