td-client 0.8.79 → 0.8.80

data/spec/td/client/bulk_load_spec.rb

@@ -113,9 +113,9 @@ describe 'BulkImport API' do
       stub_api_request(:post, '/v3/bulk_loads/guess').
         with(:body => original_config.to_json).
         to_return(:body => guessed_config.to_json)
-      api.bulk_load_guess(
+      expect(api.bulk_load_guess(
         original_config
-      ).should == guessed_config
+      )).to eq(guessed_config)
     end
 
     it 'raises an error' do
@@ -134,23 +134,23 @@ describe 'BulkImport API' do
         with(:body => original_config.to_json).
         to_return(:status => 500, :body => guessed_config.to_json)
       begin
-        retry_api.bulk_load_guess(
+        expect(retry_api.bulk_load_guess(
           original_config
-        ).should != nil
+        )).to != nil
       rescue TreasureData::APIError => e
-        e.message.should =~ /^500: BulkLoad configuration guess failed/
+        expect(e.message).to match(/^500: BulkLoad configuration guess failed/)
       end
     end
 
     it 'perform retries on connection failure' do
       api = retry_api
-      api.instance_eval { @api }.stub(:post).and_raise(SocketError.new('>>'))
+      allow(api.instance_eval { @api }).to receive(:post).and_raise(SocketError.new('>>'))
       begin
         retry_api.bulk_load_guess(
           original_config
         )
       rescue SocketError => e
-        e.message.should == '>> (Retried 1 times in 1 seconds)'
+        expect(e.message).to eq('>> (Retried 1 times in 1 seconds)')
       end
     end
   end
@@ -160,9 +160,9 @@ describe 'BulkImport API' do
       stub_api_request(:post, '/v3/bulk_loads/guess').
         with(:body => original_config.to_json).
         to_return(:body => guessed_config.to_json)
-      api.bulk_load_guess(
+      expect(api.bulk_load_guess(
         original_config
-      ).should == guessed_config
+      )).to eq(guessed_config)
     end
 
     it 'raises an error' do
@@ -181,23 +181,23 @@ describe 'BulkImport API' do
         with(:body => original_config.to_json).
         to_return(:status => 500, :body => guessed_config.to_json)
       begin
-        retry_api.bulk_load_guess(
+        expect(retry_api.bulk_load_guess(
           original_config
-        ).should != nil
+        )).to != nil
       rescue TreasureData::APIError => e
-        e.message.should =~ /^500: BulkLoad configuration guess failed/
+        expect(e.message).to match(/^500: BulkLoad configuration guess failed/)
       end
     end
 
     it 'perform retries on connection failure' do
       api = retry_api
-      api.instance_eval { @api }.stub(:post).and_raise(SocketError.new('>>'))
+      allow(api.instance_eval { @api }).to receive(:post).and_raise(SocketError.new('>>'))
       begin
         retry_api.bulk_load_guess(
           original_config
         )
       rescue SocketError => e
-        e.message.should == '>> (Retried 1 times in 1 seconds)'
+        expect(e.message).to eq('>> (Retried 1 times in 1 seconds)')
       end
     end
   end
@@ -207,9 +207,9 @@ describe 'BulkImport API' do
       stub_api_request(:post, '/v3/bulk_loads/preview').
         with(:body => guessed_config.to_json).
         to_return(:body => preview_result.to_json)
-      api.bulk_load_preview(
+      expect(api.bulk_load_preview(
         guessed_config
-      ).should == preview_result
+      )).to eq(preview_result)
     end
 
     it 'raises an error' do
@@ -232,11 +232,11 @@ describe 'BulkImport API' do
       stub_api_request(:post, '/v3/job/issue/bulkload/database').
         with(:body => expected_request.to_json).
         to_return(:body => {'job_id' => 12345}.to_json)
-      api.bulk_load_issue(
+      expect(api.bulk_load_issue(
         'database',
         'table',
         guessed_config
-      ).should == '12345'
+      )).to eq('12345')
     end
   end
 
@@ -245,14 +245,14 @@ describe 'BulkImport API' do
       stub_api_request(:get, '/v3/bulk_loads').
         to_return(:body => [bulk_load_session, bulk_load_session].to_json)
       result = api.bulk_load_list
-      result.size.should == 2
-      result.first.should == bulk_load_session
+      expect(result.size).to eq(2)
+      expect(result.first).to eq(bulk_load_session)
     end
 
     it 'returns empty' do
       stub_api_request(:get, '/v3/bulk_loads').
         to_return(:body => [].to_json)
-      api.bulk_load_list.size.should == 0
+      expect(api.bulk_load_list.size).to eq(0)
     end
   end
 
@@ -268,7 +268,7 @@ describe 'BulkImport API' do
       stub_api_request(:post, '/v3/bulk_loads').
         with(:body => expected_request.to_json).
         to_return(:body => bulk_load_session.to_json)
-      api.bulk_load_create(
+      expect(api.bulk_load_create(
         'nahi_test_1',
         'database',
         'table',
@@ -278,7 +278,7 @@ describe 'BulkImport API' do
           timezone: 'Asia/Tokyo',
           delay: 3600
         }
-      ).should == bulk_load_session
+      )).to eq(bulk_load_session)
     end
 
     it 'accepts empty option' do
@@ -289,12 +289,12 @@ describe 'BulkImport API' do
       stub_api_request(:post, '/v3/bulk_loads').
         with(:body => expected_request.to_json).
         to_return(:body => bulk_load_session.to_json)
-      api.bulk_load_create(
+      expect(api.bulk_load_create(
         'nahi_test_1',
         'database',
         'table',
         guessed_config
-      ).should == bulk_load_session
+      )).to eq(bulk_load_session)
     end
 
     it 'accepts time_column option' do
@@ -306,7 +306,7 @@ describe 'BulkImport API' do
       stub_api_request(:post, '/v3/bulk_loads').
         with(:body => expected_request.to_json).
         to_return(:body => bulk_load_session.to_json)
-      api.bulk_load_create(
+      expect(api.bulk_load_create(
         'nahi_test_1',
         'database',
         'table',
@@ -314,7 +314,7 @@ describe 'BulkImport API' do
         {
           time_column: 'c0'
         }
-      ).should == bulk_load_session
+      )).to eq(bulk_load_session)
     end
   end
 
@@ -322,7 +322,7 @@ describe 'BulkImport API' do
     it 'returns bulk_load_session' do
       stub_api_request(:get, '/v3/bulk_loads/nahi_test_1').
         to_return(:body => bulk_load_session.to_json)
-      api.bulk_load_show('nahi_test_1').should == bulk_load_session
+      expect(api.bulk_load_show('nahi_test_1')).to eq(bulk_load_session)
     end
   end
 
@@ -331,10 +331,10 @@ describe 'BulkImport API' do
       stub_api_request(:put, '/v3/bulk_loads/nahi_test_1').
         with(:body => bulk_load_session.to_json).
         to_return(:body => bulk_load_session.to_json)
-      api.bulk_load_update(
+      expect(api.bulk_load_update(
         'nahi_test_1',
         bulk_load_session
-      ).should == bulk_load_session
+      )).to eq(bulk_load_session)
     end
   end
 
@@ -342,7 +342,7 @@ describe 'BulkImport API' do
     it 'returns updated bulk_load_session' do
       stub_api_request(:delete, '/v3/bulk_loads/nahi_test_1').
         to_return(:body => bulk_load_session.to_json)
-      api.bulk_load_delete('nahi_test_1').should == bulk_load_session
+      expect(api.bulk_load_delete('nahi_test_1')).to eq(bulk_load_session)
     end
   end
 
@@ -351,8 +351,8 @@ describe 'BulkImport API' do
       stub_api_request(:get, '/v3/bulk_loads/nahi_test_1/jobs').
         to_return(:body => [bulk_load_job, bulk_load_job].to_json)
       result = api.bulk_load_history('nahi_test_1')
-      result.size.should == 2
-      result.first.should == bulk_load_job
+      expect(result.size).to eq(2)
+      expect(result.first).to eq(bulk_load_job)
     end
   end
 
@@ -361,7 +361,7 @@ describe 'BulkImport API' do
       stub_api_request(:post, '/v3/bulk_loads/nahi_test_1/jobs').
         with(:body => '{}').
         to_return(:body => {'job_id' => 12345}.to_json)
-      api.bulk_load_run('nahi_test_1').should == '12345'
+      expect(api.bulk_load_run('nahi_test_1')).to eq('12345')
     end
 
     it 'accepts scheduled_time' do
@@ -369,7 +369,7 @@ describe 'BulkImport API' do
       stub_api_request(:post, '/v3/bulk_loads/nahi_test_1/jobs').
         with(:body => {scheduled_time: now.to_s}.to_json).
         to_return(:body => {'job_id' => 12345}.to_json)
-      api.bulk_load_run('nahi_test_1', now).should == '12345'
+      expect(api.bulk_load_run('nahi_test_1', now)).to eq('12345')
     end
   end
 

data/spec/td/client/db_api_spec.rb

@@ -18,7 +18,7 @@ describe 'Database API' do
       stub_api_request(:post, "/v3/database/create/#{e(db_name)}").
         to_return(:body => {'database' => db_name}.to_json)
 
-      api.create_database(db_name).should be true
+      expect(api.create_database(db_name)).to be true
     end
 
     it 'should return 400 error with invalid name' do

data/spec/td/client/export_api_spec.rb

@@ -20,7 +20,7 @@ describe 'Export API' do
       stub_api_request(:post, "/v3/export/run/#{e(db_name)}/#{e(table_name)}").with(:body => params.merge('storage_type' => storage_type)).
         to_return(:body => {'database' => db_name, 'job_id' => '1', 'debug' => {}}.to_json)
 
-      api.export(db_name, table_name, storage_type, params).should == '1'
+      expect(api.export(db_name, table_name, storage_type, params)).to eq('1')
     end
 
     it 'should return 400 error with invalid storage type' do

data/spec/td/client/import_api_spec.rb

@@ -25,7 +25,7 @@ describe 'Import API' do
         with(:body => '12345').
         to_return(:body => '{"elapsed_time":"1.23"}')
       File.open(t.path) do |f|
-        api.import('db', 'table', 'format', f, 5, 'unique_id').should == 1.23
+        expect(api.import('db', 'table', 'format', f, 5, 'unique_id')).to eq(1.23)
       end
     end
 
@@ -38,7 +38,7 @@ describe 'Import API' do
         with(:body => '12345').
         to_return(:body => '{"elapsed_time":"1.23"}')
       File.open(t.path) do |f|
-        api.import('db', 'table', 'format', f, 5).should == 1.23
+        expect(api.import('db', 'table', 'format', f, 5)).to eq(1.23)
       end
     end
 
@@ -51,7 +51,7 @@ describe 'Import API' do
         with(:body => '12345').
         to_return(:body => '{"elapsed_time":"1.23"}')
       File.open(t.path) do |f|
-        api_old.import('db', 'table', 'format', f, 5).should == 1.23
+        expect(api_old.import('db', 'table', 'format', f, 5)).to eq(1.23)
       end
     end
 

data/spec/td/client/job_api_spec.rb

@@ -20,7 +20,7 @@ describe 'Job API' do
     it 'should returns 20 jobs by default' do
       stub_api_request(:get, "/v3/job/list", :query => {'from' => '0'}).to_return(:body => {'jobs' => raw_jobs}.to_json)
       jobs = api.list_jobs
-      jobs.size.should == 20
+      expect(jobs.size).to eq(20)
     end
 
     (0...MAX_JOB).each {|i|
@@ -32,20 +32,20 @@ describe 'Job API' do
         jobs[i..i].map {|job_id, type, status, query, start_at, end_at, cpu_time,
                       result_size, result_url, priority, retry_limit, org, db,
                       duration|
-          job_id.should == job['job_id']
-          type.should == job['type']
-          status.should == job['status']
-          query.should == job['query']
-          start_at.should == job['start_at']
-          end_at.should == job['end_at']
-          cpu_time.should == job['cpu_time']
-          result_size.should == job['result_size']
-          result_url.should == job['result_url']
-          priority.should == job['priority']
-          retry_limit.should == job['retry_limit']
-          org.should == job['organization']
-          db.should == job['database']
-          duration.should == job['duration']
+          expect(job_id).to eq(job['job_id'])
+          expect(type).to eq(job['type'])
+          expect(status).to eq(job['status'])
+          expect(query).to eq(job['query'])
+          expect(start_at).to eq(job['start_at'])
+          expect(end_at).to eq(job['end_at'])
+          expect(cpu_time).to eq(job['cpu_time'])
+          expect(result_size).to eq(job['result_size'])
+          expect(result_url).to eq(job['result_url'])
+          expect(priority).to eq(job['priority'])
+          expect(retry_limit).to eq(job['retry_limit'])
+          expect(org).to eq(job['organization'])
+          expect(db).to eq(job['database'])
+          expect(duration).to eq(job['duration'])
         }
       end
     }
@@ -53,14 +53,14 @@ describe 'Job API' do
     it 'should returns 10 jobs with to parameter' do
       stub_api_request(:get, "/v3/job/list", :query => {'from' => '0', 'to' => '10'}).to_return(:body => {'jobs' => raw_jobs[0...10]}.to_json)
       jobs = api.list_jobs(0, 10)
-      jobs.size.should == 10
+      expect(jobs.size).to eq(10)
     end
 
     it 'should returns 10 jobs with to status parameter' do
       error_jobs = raw_jobs.select { |j| j['status'] == 'error' }
       stub_api_request(:get, "/v3/job/list", :query => {'from' => '0', 'status' => 'error'}).to_return(:body => {'jobs' => error_jobs}.to_json)
       jobs = api.list_jobs(0, nil, 'error')
-      jobs.size.should == error_jobs.size
+      expect(jobs.size).to eq(error_jobs.size)
     end
 
     #it 'should contain the result_size field' do
@@ -75,21 +75,21 @@ describe 'Job API' do
 
         type, query, status, url, debug, start_at, end_at, cpu_time,
           result_size, result_url, hive_result_schema, priority, retry_limit, org, db = api.show_job(i)
-        type.should == job['type']
-        query.should == job['query']
-        status.should == job['status']
-        url.should == job['url']
-        debug.should == job['debug']
-        start_at.should == job['start_at']
-        end_at.should == job['end_at']
-        cpu_time.should == job['cpu_time']
-        result_size.should == job['result_size']
-        result_url.should == job['result_url']
-        hive_result_schema.should == job['hive_result_schema']
-        result_url.should == job['result_url']
-        priority.should == job['priority']
-        org.should == job['organization']
-        db.should == job['database']
+        expect(type).to eq(job['type'])
+        expect(query).to eq(job['query'])
+        expect(status).to eq(job['status'])
+        expect(url).to eq(job['url'])
+        expect(debug).to eq(job['debug'])
+        expect(start_at).to eq(job['start_at'])
+        expect(end_at).to eq(job['end_at'])
+        expect(cpu_time).to eq(job['cpu_time'])
+        expect(result_size).to eq(job['result_size'])
+        expect(result_url).to eq(job['result_url'])
+        expect(hive_result_schema).to eq(job['hive_result_schema'])
+        expect(result_url).to eq(job['result_url'])
+        expect(priority).to eq(job['priority'])
+        expect(org).to eq(job['organization'])
+        expect(db).to eq(job['database'])
       end
     }
 
@@ -129,7 +129,7 @@ describe 'Job API' do
         stub_api_request(:get, "/v3/job/status/#{e(job_id)}").to_return(:body => result_job.to_json)
 
         status = api.job_status(job_id)
-        status.should == (i.odd? ? 'success' : 'error')
+        expect(status).to eq(i.odd? ? 'success' : 'error')
       end
     }
   end
@@ -144,7 +144,7 @@ describe 'Job API' do
       stub_api_request(:post, "/v3/job/issue/hive/#{e(db_name)}").with(:body => params).to_return(return_body)
 
       job_id = api.hive_query(query, db_name)
-      job_id.should == '1'
+      expect(job_id).to eq('1')
     end
 
     it 'issue a query with result_url' do
@@ -152,7 +152,7 @@ describe 'Job API' do
       stub_api_request(:post, "/v3/job/issue/hive/#{e(db_name)}").with(:body => params).to_return(return_body)
 
       job_id = api.hive_query(query, db_name, 'td://@/test/table')
-      job_id.should == '1'
+      expect(job_id).to eq('1')
     end
 
     it 'issue a query with priority' do
@@ -160,7 +160,7 @@ describe 'Job API' do
       stub_api_request(:post, "/v3/job/issue/hive/#{e(db_name)}").with(:body => params).to_return(return_body)
 
       job_id = api.hive_query(query, db_name, nil, 1)
-      job_id.should == '1'
+      expect(job_id).to eq('1')
     end
   end
 
@@ -178,7 +178,40 @@ describe 'Job API' do
       stub_api_request(:get, '/v3/job/result/12345').
         with(:query => {'format' => 'msgpack'}).
         to_return(:body => packed)
-      api.job_result(12345).should == ['hello', 'world']
+      expect(api.job_result(12345)).to eq(['hello', 'world'])
+    end
+
+    it 'can resume' do
+      sz = packed.bytesize / 3
+      stub_api_request(:get, '/v3/job/result/12345').
+        with(:query => {'format' => 'msgpack'}).
+        to_return(
+          :headers => {
+            'Content-Length' => packed.bytesize,
+            'Etag' => '"abcdefghijklmn"',
+          },
+          :body => packed[0, sz]
+        )
+      stub_api_request(:get, '/v3/job/result/12345').
+        with(
+          :headers => {
+            'If-Range' => '"abcdefghijklmn"',
+            'Range' => "bytes=#{sz}-",
+          },
+          :query => {'format' => 'msgpack'}
+        ).
+        to_return(
+          :headers => {
+            'Content-Length' => packed.bytesize - sz,
+            'Content-Range' => "bytes #{sz}-#{packed.bytesize-1}/#{packed.bytesize}",
+            'Etag' => '"abcdefghijklmn"',
+          },
+          :body => packed[sz, packed.bytesize - sz]
+        )
+      expect(api).to receive(:sleep).once
+      expect($stderr).to receive(:print)
+      expect($stderr).to receive(:puts)
+      expect(api.job_result(12345)).to eq ['hello', 'world']
     end
   end
 
@@ -203,8 +236,8 @@ describe 'Job API' do
         total_size = 0
         api.job_result_format(12345, 'json', io) {|size| total_size += size }
 
-        io.string.should  == json
-        total_size.should == json.size
+        expect(io.string).to  eq(json)
+        expect(total_size).to eq(json.size)
       end
     end
 
@@ -216,7 +249,7 @@ describe 'Job API' do
             :headers => {'Content-Encoding' => 'gzip'},
             :body => packed
           )
-        api.job_result_format(12345, 'json').should == ['hello', 'world'].to_json
+        expect(api.job_result_format(12345, 'json')).to eq(['hello', 'world'].to_json)
       end
 
       it 'writes formatted job result' do
@@ -228,7 +261,51 @@ describe 'Job API' do
           )
         s = StringIO.new
         api.job_result_format(12345, 'json', s)
-        s.string.should == ['hello', 'world'].to_json
+        expect(s.string).to eq(['hello', 'world'].to_json)
+      end
+
+      context 'can resume' do
+        before do
+          sz = packed.bytesize / 3
+          stub_api_request(:get, '/v3/job/result/12345').
+            with(:query => {'format' => 'json'}).
+            to_return(
+              :headers => {
+                'Content-Encoding' => 'gzip',
+                'Content-Length' => packed.bytesize,
+                'Etag' => '"abcdefghijklmn"',
+              },
+              :body => packed[0, sz]
+            )
+          stub_api_request(:get, '/v3/job/result/12345').
+            with(
+              :headers => {
+                'If-Range' => '"abcdefghijklmn"',
+                'Range' => "bytes=#{sz}-",
+              },
+              :query => {'format' => 'json'}
+            ).
+          to_return(
+            :headers => {
+              'Content-Encoding' => 'gzip',
+              'Content-Length' => packed.bytesize-sz,
+              'Content-Range' => "bytes #{sz}-#{packed.bytesize-1}/#{packed.bytesize}",
+              'Etag' => '"abcdefghijklmn"',
+            },
+            :body => packed[sz, packed.bytesize-sz]
+          )
+          expect(api).to receive(:sleep).once
+          expect($stderr).to receive(:print)
+          expect($stderr).to receive(:puts)
+        end
+        it 'can work with io' do
+          s = StringIO.new
+          api.job_result_format(12345, 'json', s)
+          expect(s.string).to eq ['hello', 'world'].to_json
+        end
+        it 'can work without block' do
+          expect(api.job_result_format(12345, 'json')).to eq ['hello', 'world'].to_json
+        end
       end
     end
   end
@@ -256,7 +333,45 @@ describe 'Job API' do
       api.job_result_each(12345) do |row|
         result << row
       end
-      result.should == ['hello', 'world']
+      expect(result).to eq(['hello', 'world'])
+    end
+
+    it 'can resume' do
+      sz= packed.bytesize / 3
+      stub_api_request(:get, '/v3/job/result/12345').
+        with(:query => {'format' => 'msgpack'}).
+        to_return(
+          :headers => {
+            'Content-Encoding' => 'gzip',
+            'Content-Length' => packed.bytesize,
+            'Etag' => '"abcdefghijklmn"',
+          },
+          :body => packed[0, sz]
+        )
+      stub_api_request(:get, '/v3/job/result/12345').
+        with(
+          :headers => {
+            'If-Range' => '"abcdefghijklmn"',
+            'Range' => "bytes=#{sz}-",
+          },
+          :query => {'format' => 'msgpack'}
+        ).
+        to_return(
+          :headers => {
+            'Content-Length' => packed.bytesize-sz,
+            'Content-Range' => "bytes #{sz}-#{packed.bytesize-1}/#{packed.bytesize}",
+            'Etag' => '"abcdefghijklmn"',
+          },
+          :body => packed[sz, packed.bytesize-sz]
+        )
+      expect(api).to receive(:sleep).once
+      expect($stderr).to receive(:print)
+      expect($stderr).to receive(:puts)
+      result = []
+      api.job_result_each(12345) do |row|
+        result << row
+      end
+      expect(result).to eq ['hello', 'world']
     end
   end
 
@@ -285,7 +400,45 @@ describe 'Job API' do
       api.job_result_each_with_compr_size(12345) do |row, size|
         result << [row, size]
       end
-      result.should == [['hello', 32], ['world', 32]]
+      expect(result).to eq([['hello', 32], ['world', 32]])
+    end
+
+    it 'can resume' do
+      sz = packed.bytesize / 3
+      stub_api_request(:get, '/v3/job/result/12345').
+        with(:query => {'format' => 'msgpack'}).
+        to_return(
+          :headers => {
+            'Content-Encoding' => 'gzip',
+            'Content-Length' => packed.bytesize,
+            'Etag' => '"abcdefghijklmn"',
+          },
+          :body => packed[0, sz]
+        )
+      stub_api_request(:get, '/v3/job/result/12345').
+        with(
+          :headers => {
+            'If-Range' => '"abcdefghijklmn"',
+            'Range' => "bytes=#{sz}-",
+          },
+          :query => {'format' => 'msgpack'}
+        ).
+        to_return(
+          :headers => {
+            'Content-Length' => packed.bytesize - sz,
+            'Content-Range' => "bytes #{sz}-#{packed.bytesize-1}/#{packed.bytesize}",
+            'Etag' => '"abcdefghijklmn"',
+          },
+          :body => packed[sz, packed.bytesize - sz]
+        )
+      expect(api).to receive(:sleep).once
+      expect($stderr).to receive(:print)
+      expect($stderr).to receive(:puts)
+      result = []
+      api.job_result_each_with_compr_size(12345) do |row, size|
+        result << [row, size]
+      end
+      expect(result).to eq [['hello', 32], ['world', 32]]
     end
   end
 
@@ -299,7 +452,7 @@ describe 'Job API' do
           to_return(:body => 'raw binary')
         api.job_result_raw(12345, 'json', io)
 
-        io.string.should == 'raw binary'
+        expect(io.string).to eq('raw binary')
       end
     end
 
@@ -308,7 +461,7 @@ describe 'Job API' do
         stub_api_request(:get, '/v3/job/result/12345').
           with(:query => {'format' => 'json'}).
           to_return(:body => 'raw binary')
-        api.job_result_raw(12345, 'json').should == 'raw binary'
+        expect(api.job_result_raw(12345, 'json')).to eq('raw binary')
       end
     end
 
@@ -326,37 +479,38 @@ describe 'Job API' do
     end
 
     it 'can resume' do
+      sz = packed.bytesize / 3
       stub_api_request(:get, '/v3/job/result/12345').
         with(:query => {'format' => 'msgpack.gz'}).
         to_return(
           :headers => {
-            'Content-Length' => 32,
+            'Content-Length' => packed.bytesize,
             'Etag' => '"abcdefghijklmn"',
           },
-          :body => packed[0, 20]
+          :body => packed[0, sz]
         )
       stub_api_request(:get, '/v3/job/result/12345').
         with(
           :headers => {
             'If-Range' => '"abcdefghijklmn"',
-            'Range' => 'bytes=20-',
+            'Range' => "bytes=#{sz}-",
           },
           :query => {'format' => 'msgpack.gz'}
         ).
         to_return(
           :headers => {
-            'Content-Length' => 12,
-            'Content-Range' => 'bytes 20-31/32',
+            'Content-Length' => packed.bytesize - sz,
+            'Content-Range' => "bytes #{sz}-#{packed.bytesize-1}/#{packed.bytesize}",
             'Etag' => '"abcdefghijklmn"',
           },
-          :body => packed[20, 12]
+          :body => packed[sz, packed.bytesize - sz]
         )
       expect(api).to receive(:sleep).once
       expect($stderr).to receive(:print)
       expect($stderr).to receive(:puts)
       sio = StringIO.new(''.force_encoding(Encoding::ASCII_8BIT))
       api.job_result_raw(12345, 'msgpack.gz', sio)
-      sio.string.should == packed
+      expect(sio.string).to eq(packed)
     end
   end
 
@@ -364,7 +518,7 @@ describe 'Job API' do
     it 'kills a job' do
       stub_api_request(:post, '/v3/job/kill/12345').
         to_return(:body => {'former_status' => 'status'}.to_json)
-      api.kill(12345).should == 'status'
+      expect(api.kill(12345)).to eq('status')
     end
   end
 end