tugboat 3.1.0 → 4.0.0

data/spec/cli/info_image_cli_spec.rb

@@ -13,9 +13,7 @@ describe Tugboat::CLI do
         with(headers: { 'Accept' => '*/*', 'Accept-Encoding' => 'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'Authorization' => 'Bearer foo', 'Content-Type' => 'application/json', 'User-Agent' => 'Faraday v0.9.2' }).
         to_return(headers: { 'Content-Type' => 'application/json' }, status: 200, body: fixture('show_coreos_image'))
 
-      cli.info_image('745.1.0 (alpha)')
-
-      expect($stdout.string).to eq <<-eos
+      expected_string = <<-eos
 Image fuzzy name provided. Finding image ID...done\e[0m, 12789325 (745.1.0 (alpha))
 
 Name:             745.1.0 (alpha)
@@ -24,6 +22,8 @@ Distribution:     CoreOS
 Min Disk Size:    20GB
 Regions:          nyc1,sfo1,nyc2,ams2,sgp1,lon1,nyc3,ams3,fra1
       eos
+
+      expect { cli.info_image('745.1.0 (alpha)') }.to output(expected_string).to_stdout
     end
 
     it 'shows an image with an id' do
@@ -35,10 +35,7 @@ Regions:          nyc1,sfo1,nyc2,ams2,sgp1,lon1,nyc3,ams3,fra1
         with(headers: { 'Accept' => '*/*', 'Accept-Encoding' => 'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'Authorization' => 'Bearer foo', 'Content-Type' => 'application/json', 'User-Agent' => 'Faraday v0.9.2' }).
         to_return(headers: { 'Content-Type' => 'application/json' }, status: 200, body: fixture('show_redmine_image'))
 
-      cli.options = cli.options.merge(id: 12_438_838)
-      cli.info_image
-
-      expect($stdout.string).to eq <<-eos
+      expected_string = <<-eos
 Image id provided. Finding Image...done\e[0m, 12438838 (Redmine on 14.04)
 
 Name:             Redmine on 14.04
@@ -47,6 +44,9 @@ Distribution:     Ubuntu
 Min Disk Size:    20GB
 Regions:          nyc1,ams1,sfo1,nyc2,ams2,sgp1,lon1,nyc3,ams3,fra1
       eos
+
+      cli.options = cli.options.merge(id: 12_438_838)
+      expect { cli.info_image }.to output(expected_string).to_stdout
     end
 
     it 'shows an image with a name' do
@@ -58,10 +58,7 @@ Regions:          nyc1,ams1,sfo1,nyc2,ams2,sgp1,lon1,nyc3,ams3,fra1
         with(headers: { 'Accept' => '*/*', 'Accept-Encoding' => 'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'Authorization' => 'Bearer foo', 'Content-Type' => 'application/json', 'User-Agent' => 'Faraday v0.9.2' }).
         to_return(headers: { 'Content-Type' => 'application/json' }, status: 200, body: fixture('show_redmine_image'))
 
-      cli.options = cli.options.merge(name: 'Redmine on 14.04')
-      cli.info_image
-
-      expect($stdout.string).to eq <<-eos
+      expected_string = <<-eos
 Image name provided. Finding Image...done\e[0m, 12438838 (Redmine on 14.04)
 
 Name:             Redmine on 14.04
@@ -70,6 +67,9 @@ Distribution:     Ubuntu
 Min Disk Size:    20GB
 Regions:          nyc1,ams1,sfo1,nyc2,ams2,sgp1,lon1,nyc3,ams3,fra1
       eos
+
+      cli.options = cli.options.merge(name: 'Redmine on 14.04')
+      expect { cli.info_image }.to output(expected_string).to_stdout
     end
 
     it 'errors if no image with matching id is found' do
@@ -81,12 +81,12 @@ Regions:          nyc1,ams1,sfo1,nyc2,ams2,sgp1,lon1,nyc3,ams3,fra1
         with(headers: { 'Accept' => '*/*', 'Accept-Encoding' => 'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'Authorization' => 'Bearer foo', 'Content-Type' => 'application/json', 'User-Agent' => 'Faraday v0.9.2' }).
         to_return(status: 404, body: fixture('not_found'), headers: {})
 
-      cli.options = cli.options.merge(id: '123')
-      expect { cli.info_image }.to raise_error(SystemExit)
-
-      expect($stdout.string).to eq <<-eos
+      expected_string = <<-eos
 Image id provided. Finding Image...Failed to find Image: The resource you were accessing could not be found.
       eos
+
+      cli.options = cli.options.merge(id: '123')
+      expect { cli.info_image }.to raise_error(SystemExit).and output(expected_string).to_stdout
     end
 
     it 'errors if no image with matching name is found' do
@@ -95,12 +95,13 @@ Image id provided. Finding Image...Failed to find Image: The resource you were a
         to_return(headers: { 'Content-Type' => 'application/json' }, status: 200, body: fixture('show_images'))
 
       cli.options = cli.options.merge(name: 'foobarbaz')
-      expect { cli.info_image }.to raise_error(SystemExit)
 
-      expect($stdout.string).to eq <<-eos
+      expected_string = <<-eos
 Image name provided. Finding Image...error
 Unable to find an image named 'foobarbaz'.
       eos
+
+      expect { cli.info_image }.to raise_error(SystemExit).and output(expected_string).to_stdout
     end
 
     it 'errors if no image with matching fuzzy name is found' do
@@ -108,12 +109,12 @@ Unable to find an image named 'foobarbaz'.
         with(headers: { 'Accept' => '*/*', 'Accept-Encoding' => 'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'Authorization' => 'Bearer foo', 'Content-Type' => 'application/json', 'User-Agent' => 'Faraday v0.9.2' }).
         to_return(headers: { 'Content-Type' => 'application/json' }, status: 200, body: fixture('show_images'))
 
-      expect { cli.info_image('foobarbaz') }.to raise_error(SystemExit)
-
-      expect($stdout.string).to eq <<-eos
+      expected_string = <<-eos
 Image fuzzy name provided. Finding image ID...error
 Unable to find an image named 'foobarbaz'.
       eos
+
+      expect { cli.info_image('foobarbaz') }.to raise_error(SystemExit).and output(expected_string).to_stdout
     end
 
     it 'allows choice of multiple images' do
@@ -127,9 +128,7 @@ Unable to find an image named 'foobarbaz'.
 
       expect($stdin).to receive(:gets).and_return('0')
 
-      cli.info_image('ubun')
-
-      expect($stdout.string).to eq <<-eos
+      expected_string = <<-eos
 Image fuzzy name provided. Finding image ID...Multiple images found.
 
 0) 14.10 x32 (9801951)
@@ -148,6 +147,8 @@ Distribution:     Ubuntu
 Min Disk Size:    20GB
 Regions:          nyc1,ams1,sfo1,nyc2,ams2,sgp1,lon1,nyc3,ams3,fra1
       eos
+
+      expect { cli.info_image('ubun') }.to output(expected_string).to_stdout
     end
   end
 end

data/spec/cli/keys_cli_spec.rb

@@ -9,14 +9,14 @@ describe Tugboat::CLI do
         with(headers: { 'Accept' => '*/*', 'Accept-Encoding' => 'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'Authorization' => 'Bearer foo', 'Content-Type' => 'application/json', 'User-Agent' => 'Faraday v0.9.2' }).
         to_return(status: 200, body: fixture('show_keys'), headers: {})
 
-      cli.keys
-
-      expect($stdout.string).to eq <<-eos
+      expected_string =   <<-eos
 SSH Keys:
 Name: My SSH Public Key, (id: 512189), fingerprint: 3b:16:bf:e4:8b:00:8b:b8:59:8c:a9:d3:f0:19:45:fa
 Name: My Other SSH Public Key, (id: 512110), fingerprint: 3b:16:bf:d4:8b:00:8b:b8:59:8c:a9:d3:f0:19:45:fa
       eos
 
+      expect { cli.keys }.to output(expected_string).to_stdout
+
       expect(a_request(:get, 'https://api.digitalocean.com/v2/account/keys?per_page=200')).to have_been_made
     end
   end

data/spec/cli/password_reset_cli_spec.rb

@@ -18,13 +18,13 @@ describe Tugboat::CLI do
              headers: { 'Accept' => '*/*', 'Accept-Encoding' => 'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'Authorization' => 'Bearer foo', 'Content-Type' => 'application/json', 'User-Agent' => 'Faraday v0.9.2' }).
         to_return(status: 200, body: fixture('password_reset_response'), headers: {})
 
-      cli.password_reset('example.com')
-
-      expect($stdout.string).to eq <<-eos
+      expected_string =   <<-eos
 Droplet fuzzy name provided. Finding droplet ID...done\e[0m, 6918990 (example.com)
 Queuing password reset for 6918990 (example.com)...Password reset successful!
 Your new root password will be emailed to you
       eos
+
+      expect { cli.password_reset('example.com') }.to output(expected_string).to_stdout
     end
 
     it 'resets the root password given an id' do
@@ -45,14 +45,14 @@ Your new root password will be emailed to you
              headers: { 'Accept' => '*/*', 'Accept-Encoding' => 'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'Authorization' => 'Bearer foo', 'Content-Type' => 'application/json', 'User-Agent' => 'Faraday v0.9.2' }).
         to_return(status: 200, body: fixture('password_reset_response'), headers: {})
 
-      cli.options = cli.options.merge(id: 6_918_990)
-      cli.password_reset
-
-      expect($stdout.string).to eq <<-eos
+      expected_string =   <<-eos
 Droplet id provided. Finding Droplet...done\e[0m, 6918990 (example.com)
 Queuing password reset for 6918990 (example.com)...Password reset successful!
 Your new root password will be emailed to you
       eos
+
+      cli.options = cli.options.merge(id: 6_918_990)
+      expect { cli.password_reset }.to output(expected_string).to_stdout
     end
 
     it 'resets the root password given a name' do
@@ -69,14 +69,14 @@ Your new root password will be emailed to you
              headers: { 'Accept' => '*/*', 'Accept-Encoding' => 'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'Authorization' => 'Bearer foo', 'Content-Type' => 'application/json', 'User-Agent' => 'Faraday v0.9.2' }).
         to_return(status: 200, body: fixture('password_reset_response'), headers: {})
 
-      cli.options = cli.options.merge(name: 'example.com')
-      cli.password_reset
-
-      expect($stdout.string).to eq <<-eos
+      expected_string =   <<-eos
 Droplet name provided. Finding droplet ID...done\e[0m, 6918990 (example.com)
 Queuing password reset for 6918990 (example.com)...Password reset successful!
 Your new root password will be emailed to you
       eos
+
+      cli.options = cli.options.merge(name: 'example.com')
+      expect { cli.password_reset }.to output(expected_string).to_stdout
     end
 
     it 'raises SystemExit when a request fails' do
@@ -95,7 +95,7 @@ Your new root password will be emailed to you
 
       cli.options = cli.options.merge(name: 'example.com')
 
-      expect { cli.password_reset('example.com') }.to raise_error(SystemExit)
+      expect { cli.password_reset('example.com') }.to raise_error(SystemExit).and output(%r{Failed to reset password on Droplet: Some error}).to_stdout
     end
   end
 end

data/spec/cli/rebuild_cli_spec.rb

@@ -24,13 +24,13 @@ describe Tugboat::CLI do
 
       expect($stdin).to receive(:gets).and_return('y')
 
-      cli.rebuild('example.com', 'ubuntu-14-04-x64')
-
-      expect($stdout.string).to eq <<-eos
+      expected_string = <<-eos
 Droplet fuzzy name provided. Finding droplet ID...done\e[0m, 6918990 (example.com)
 Image fuzzy name provided. Finding image ID...done\e[0m, 12790328 (14.04 x64)
 Warning! Potentially destructive action. Please confirm [y/n]: Queuing rebuild for droplet 6918990 (example.com) with image 12790328 (14.04 x64)...Rebuild complete
       eos
+
+      expect { cli.rebuild('example.com', 'ubuntu-14-04-x64') }.to output(expected_string).to_stdout
     end
 
     it 'rebuilds a droplet with an id based on an image with a fuzzy name' do
@@ -54,13 +54,14 @@ Warning! Potentially destructive action. Please confirm [y/n]: Queuing rebuild f
       expect($stdin).to receive(:gets).and_return('y')
 
       cli.options = cli.options.merge(id: '12790328')
-      cli.rebuild('example.com', 'ubuntu-14-04-x64')
 
-      expect($stdout.string).to eq <<-eos
+      expected_string = <<-eos
 Droplet id provided. Finding Droplet...done\e[0m, 6918990 (example.com)
 Image fuzzy name provided. Finding image ID...done\e[0m, 12790328 (14.04 x64)
 Warning! Potentially destructive action. Please confirm [y/n]: Queuing rebuild for droplet 6918990 (example.com) with image 12790328 (14.04 x64)...Rebuild complete
       eos
+
+      expect { cli.rebuild('example.com', 'ubuntu-14-04-x64') }.to output(expected_string).to_stdout
     end
 
     it 'rebuilds a droplet with a name based on an image with a fuzzy name' do
@@ -88,13 +89,14 @@ Warning! Potentially destructive action. Please confirm [y/n]: Queuing rebuild f
       expect($stdin).to receive(:gets).and_return('y')
 
       cli.options = cli.options.merge(name: 'example.com')
-      cli.rebuild('example.com', 'ubuntu-14-04-x64')
 
-      expect($stdout.string).to eq <<-eos
+      expected_string = <<-eos
 Droplet name provided. Finding droplet ID...done\e[0m, 6918990 (example.com)
 Image fuzzy name provided. Finding image ID...done\e[0m, 12790328 (14.04 x64)
 Warning! Potentially destructive action. Please confirm [y/n]: Queuing rebuild for droplet 6918990 (example.com) with image 12790328 (14.04 x64)...Rebuild complete
       eos
+
+      expect { cli.rebuild('example.com', 'ubuntu-14-04-x64') }.to output(expected_string).to_stdout
     end
 
     it 'rebuilds a droplet with a fuzzy name based on an image with an id' do
@@ -125,14 +127,14 @@ Warning! Potentially destructive action. Please confirm [y/n]: Queuing rebuild f
 
       expect($stdin).to receive(:gets).and_return('y')
 
-      cli.options = cli.options.merge(image_id: 12_790_328)
-      cli.rebuild('example.com', 'ubuntu-14-04-x64')
-
-      expect($stdout.string).to eq <<-eos
+      expected_string = <<-eos
 Droplet fuzzy name provided. Finding droplet ID...done\e[0m, 6918990 (example.com)
 Image id provided. Finding Image...done\e[0m, 6376601 (My application image)
 Warning! Potentially destructive action. Please confirm [y/n]: Queuing rebuild for droplet 6918990 (example.com) with image 6376601 (My application image)...Rebuild complete
       eos
+
+      cli.options = cli.options.merge(image_id: 12_790_328)
+      expect { cli.rebuild('example.com', 'ubuntu-14-04-x64') }.to output(expected_string).to_stdout
     end
 
     it 'rebuilds a droplet with an id based on an image with an id' do
@@ -164,13 +166,14 @@ Warning! Potentially destructive action. Please confirm [y/n]: Queuing rebuild f
       expect($stdin).to receive(:gets).and_return('y')
 
       cli.options = cli.options.merge(id: '12790328', image_id: 12_790_328)
-      cli.rebuild('example.com', 'ubuntu-14-04-x64')
 
-      expect($stdout.string).to eq <<-eos
+      expected_string = <<-eos
 Droplet id provided. Finding Droplet...done\e[0m, 6918990 (example.com)
 Image id provided. Finding Image...done\e[0m, 6376601 (My application image)
 Warning! Potentially destructive action. Please confirm [y/n]: Queuing rebuild for droplet 6918990 (example.com) with image 6376601 (My application image)...Rebuild complete
       eos
+
+      expect { cli.rebuild('example.com', 'ubuntu-14-04-x64') }.to output(expected_string).to_stdout
     end
 
     it 'rebuilds a droplet with a name based on an image with an id' do
@@ -202,13 +205,14 @@ Warning! Potentially destructive action. Please confirm [y/n]: Queuing rebuild f
       expect($stdin).to receive(:gets).and_return('y')
 
       cli.options = cli.options.merge(name: 'example.com', image_id: 12_790_328)
-      cli.rebuild('example.com', 'ubuntu-14-04-x64')
 
-      expect($stdout.string).to eq <<-eos
+      expected_string = <<-eos
 Droplet name provided. Finding droplet ID...done\e[0m, 6918990 (example.com)
 Image id provided. Finding Image...done\e[0m, 6376601 (My application image)
 Warning! Potentially destructive action. Please confirm [y/n]: Queuing rebuild for droplet 6918990 (example.com) with image 6376601 (My application image)...Rebuild complete
       eos
+
+      expect { cli.rebuild('example.com', 'ubuntu-14-04-x64') }.to output(expected_string).to_stdout
     end
 
     it 'rebuilds a droplet with a fuzzy name based on an image with a name' do
@@ -233,13 +237,13 @@ Warning! Potentially destructive action. Please confirm [y/n]: Queuing rebuild f
 
       cli.options = cli.options.merge(image_name: '14.04 x64')
 
-      cli.rebuild('example.com', 'ubuntu-14-04-x64')
-
-      expect($stdout.string).to eq <<-eos
+      expected_string = <<-eos
 Droplet fuzzy name provided. Finding droplet ID...done\e[0m, 6918990 (example.com)
 Image name provided. Finding Image...done\e[0m, 12790328 (14.04 x64)
 Warning! Potentially destructive action. Please confirm [y/n]: Queuing rebuild for droplet 6918990 (example.com) with image 12790328 (14.04 x64)...Rebuild complete
       eos
+
+      expect { cli.rebuild('example.com', 'ubuntu-14-04-x64') }.to output(expected_string).to_stdout
     end
 
     it 'rebuilds a droplet with an id based on an image with a name' do
@@ -267,13 +271,14 @@ Warning! Potentially destructive action. Please confirm [y/n]: Queuing rebuild f
       expect($stdin).to receive(:gets).and_return('y')
 
       cli.options = cli.options.merge(id: '12790328', image_name: '14.04 x64')
-      cli.rebuild('example.com', '14.04 x64')
 
-      expect($stdout.string).to eq <<-eos
+      expected_string = <<-eos
 Droplet id provided. Finding Droplet...done\e[0m, 6918990 (example.com)
 Image name provided. Finding Image...done\e[0m, 12790328 (14.04 x64)
 Warning! Potentially destructive action. Please confirm [y/n]: Queuing rebuild for droplet 6918990 (example.com) with image 12790328 (14.04 x64)...Rebuild complete
       eos
+
+      expect { cli.rebuild('example.com', '14.04 x64') }.to output(expected_string).to_stdout
     end
 
     it 'rebuilds a droplet with a name based on an image with a name' do
@@ -297,13 +302,14 @@ Warning! Potentially destructive action. Please confirm [y/n]: Queuing rebuild f
       expect($stdin).to receive(:gets).and_return('y')
 
       cli.options = cli.options.merge(name: 'example.com', image_name: '14.04 x64')
-      cli.rebuild('example.com', '14.04 x64')
 
-      expect($stdout.string).to eq <<-eos
+      expected_string = <<-eos
 Droplet name provided. Finding droplet ID...done\e[0m, 6918990 (example.com)
 Image name provided. Finding Image...done\e[0m, 12790328 (14.04 x64)
 Warning! Potentially destructive action. Please confirm [y/n]: Queuing rebuild for droplet 6918990 (example.com) with image 12790328 (14.04 x64)...Rebuild complete
       eos
+
+      expect { cli.rebuild('example.com', '14.04 x64') }.to output(expected_string).to_stdout
     end
 
     it 'rebuilds a droplet with confirm flag set' do
@@ -325,13 +331,14 @@ Warning! Potentially destructive action. Please confirm [y/n]: Queuing rebuild f
         to_return(status: 200, body: '', headers: {})
 
       cli.options = cli.options.merge(confirm: 'no')
-      cli.rebuild('example.com', '14.04 x64')
 
-      expect($stdout.string).to eq <<-eos
+      expected_string = <<-eos
 Droplet fuzzy name provided. Finding droplet ID...done\e[0m, 6918990 (example.com)
 Image fuzzy name provided. Finding image ID...done\e[0m, 12790328 (14.04 x64)
 Queuing rebuild for droplet 6918990 (example.com) with image 12790328 (14.04 x64)...Rebuild complete
       eos
+
+      expect { cli.rebuild('example.com', '14.04 x64') }.to output(expected_string).to_stdout
     end
   end
 end

data/spec/cli/regions_cli_spec.rb

@@ -9,9 +9,7 @@ describe Tugboat::CLI do
         with(headers: { 'Accept' => '*/*', 'Accept-Encoding' => 'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'Authorization' => 'Bearer foo', 'Content-Type' => 'application/json', 'User-Agent' => 'Faraday v0.9.2' }).
         to_return(status: 200, body: fixture('show_regions'), headers: { 'Content-Type' => 'application/json' })
 
-      cli.regions
-
-      expect($stdout.string).to eq <<-eos
+      expected_string =   <<-eos
 Regions:
 Amsterdam 1 (slug: ams1)
 Amsterdam 2 (slug: ams2)
@@ -24,6 +22,8 @@ San Francisco 1 (slug: sfo1)
 Singapore 1 (slug: sgp1)
       eos
 
+      expect { cli.regions }.to output(expected_string).to_stdout
+
       expect(a_request(:get, 'https://api.digitalocean.com/v2/regions?page=1&per_page=20')).
         to have_been_made
     end

data/spec/cli/resize_cli_spec.rb

@@ -18,13 +18,13 @@ describe Tugboat::CLI do
              headers: { 'Accept' => '*/*', 'Accept-Encoding' => 'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'Authorization' => 'Bearer foo', 'Content-Type' => 'application/json', 'User-Agent' => 'Faraday v0.9.2' }).
         to_return(status: 200, body: fixture('resize_droplet'), headers: {})
 
-      cli.options = cli.options.merge(size: '1gb')
-      cli.resize('example.com')
-
-      expect($stdout.string).to eq <<-eos
+      expected_string = <<-eos
 Droplet fuzzy name provided. Finding droplet ID...done\e[0m, 6918990 (example.com)
 Queuing resize for 6918990 (example.com)...Resize complete!
       eos
+
+      cli.options = cli.options.merge(size: '1gb')
+      expect { cli.resize('example.com') }.to output(expected_string).to_stdout
     end
 
     it 'resizes a droplet with an id' do
@@ -41,13 +41,13 @@ Queuing resize for 6918990 (example.com)...Resize complete!
              headers: { 'Accept' => '*/*', 'Accept-Encoding' => 'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'Authorization' => 'Bearer foo', 'Content-Type' => 'application/json', 'User-Agent' => 'Faraday v0.9.2' }).
         to_return(status: 200, body: fixture('resize_droplet'), headers: {})
 
-      cli.options = cli.options.merge(size: '1gb', id: 6_918_990)
-      cli.resize
-
-      expect($stdout.string).to eq <<-eos
+      expected_string = <<-eos
 Droplet id provided. Finding Droplet...done\e[0m, 6918990 (example.com)
 Queuing resize for 6918990 (example.com)...Resize complete!
       eos
+
+      cli.options = cli.options.merge(size: '1gb', id: 6_918_990)
+      expect { cli.resize }.to output(expected_string).to_stdout
     end
 
     it 'resizes a droplet with a name' do
@@ -64,13 +64,13 @@ Queuing resize for 6918990 (example.com)...Resize complete!
              headers: { 'Accept' => '*/*', 'Accept-Encoding' => 'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'Authorization' => 'Bearer foo', 'Content-Type' => 'application/json', 'User-Agent' => 'Faraday v0.9.2' }).
         to_return(status: 200, body: fixture('resize_droplet'), headers: {})
 
-      cli.options = cli.options.merge(size: '1gb', name: 'example.com')
-      cli.resize
-
-      expect($stdout.string).to eq <<-eos
+      expected_string = <<-eos
 Droplet name provided. Finding droplet ID...done\e[0m, 6918990 (example.com)
 Queuing resize for 6918990 (example.com)...Resize complete!
       eos
+
+      cli.options = cli.options.merge(size: '1gb', name: 'example.com')
+      expect { cli.resize }.to output(expected_string).to_stdout
     end
 
     it 'raises SystemExit when a request fails' do
@@ -87,13 +87,13 @@ Queuing resize for 6918990 (example.com)...Resize complete!
              headers: { 'Accept' => '*/*', 'Accept-Encoding' => 'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'Authorization' => 'Bearer foo', 'Content-Type' => 'application/json', 'User-Agent' => 'Faraday v0.9.2' }).
         to_return(headers: { 'Content-Type' => 'application/json' }, status: 500, body: '{"status":"ERROR","message":"Some error"}')
 
-      cli.options = cli.options.merge(size: '1gb')
-      expect { cli.resize('example.com') }.to raise_error(SystemExit)
-
-      expect($stdout.string).to eq <<-eos
+      expected_string = <<-eos
 Droplet fuzzy name provided. Finding droplet ID...done\e[0m, 6918990 (example.com)
 Queuing resize for 6918990 (example.com)...Failed to resize Droplet: Some error
       eos
+
+      cli.options = cli.options.merge(size: '1gb')
+      expect { cli.resize('example.com') }.to raise_error(SystemExit).and output(expected_string).to_stdout
     end
   end
 end