Prepare for upgrade to rspec 3.0.0.rc1

* remove rspec-instafail, it is not compatible
* convert some uses of `should`'s to `expect`

Signed-off-by: John Foley <[email protected]>

.rspec

@@ -1,5 +1,2 @@
 --color
 --format progress
---profile
---require rspec/instafail
---format RSpec::Instafail

Gemfile

@@ -53,7 +53,6 @@ group :development, :test do
 
   gem 'rspec', '3.0.0.beta1'
   gem 'rspec-its'
-  gem 'rspec-instafail'
 
   gem 'rubocop', require: false
   gem 'parallel_tests'

Gemfile.lock

@@ -375,8 +375,9 @@ GEM
     rspec-expectations (3.0.0.beta1)
       diff-lcs (>= 1.1.3, < 2.0)
       rspec-support (= 3.0.0.beta1)
-    rspec-instafail (0.2.4)
-    rspec-its (1.0.0.pre)
+    rspec-its (1.0.1)
+      rspec-core (>= 2.99.0.beta1)
+      rspec-expectations (>= 2.99.0.beta1)
     rspec-mocks (3.0.0.beta1)
       rspec-support (= 3.0.0.beta1)
     rspec-support (3.0.0.beta1)
@@ -494,7 +495,6 @@ DEPENDENCIES
   redis
   rest-client
   rspec (= 3.0.0.beta1)
-  rspec-instafail
   rspec-its
   rubocop
   ruby_gntp

agent_client/.rspec

@@ -1,5 +1,2 @@
 --color
 --format progress
---profile
---require rspec/instafail
---format RSpec::Instafail

bat/.rspec

@@ -1,5 +1,2 @@
 --color
 --format progress
---profile
---require rspec/instafail
---format RSpec::Instafail

bat/spec/bat/bosh_runner_spec.rb

@@ -27,7 +27,7 @@
     end
 
     it 'returns the result of Bosh::Exec' do
-      bosh_exec.stub(sh: bosh_exec_result)
+      allow(bosh_exec).to receive(sh).and_return(bosh_exec_result)
 
       expect(subject.bosh('FAKE_ARGS')).to eq(bosh_exec_result)
     end
@@ -60,7 +60,7 @@
 
     context 'when a block is passed' do
       it 'yields the Bosh::Exec result' do
-        bosh_exec.stub(sh: bosh_exec_result)
+        allow(bosh_exec).to receive(sh).and_return(bosh_exec_result)
 
         expect { |b|
           subject.bosh('fake arg', &b)

blobstore_client/.rspec

@@ -1,7 +1,4 @@
 --color
 --format progress
---profile
---require rspec/instafail
---format RSpec::Instafail
 --tag ~s3_credentials
 --tag ~nginx

bosh-core/.rspec

@@ -1,5 +1,2 @@
 --color
 --format progress
---profile
---require rspec/instafail
---format RSpec::Instafail

bosh-dev/.rspec

@@ -1,5 +1,2 @@
 --color
 --format progress
---profile
---require rspec/instafail
---format RSpec::Instafail

bosh-director-core/.rspec

@@ -1,5 +1,2 @@
 --color
 --format progress
---profile
---require rspec/instafail
---format RSpec::Instafail

bosh-director/.rspec

@@ -1,5 +1,2 @@
 --color
 --format progress
---profile
---require rspec/instafail
---format RSpec::Instafail

bosh-director/spec/unit/deployment_plan/assembler_spec.rb

@@ -292,14 +292,14 @@ module DeploymentPlan
           deployment_plan.stub(:network).with('bar').and_return(bar_network)
 
           foo_reservation = nil
-          foo_network.should_receive(:reserve).and_return do |reservation|
+          foo_network.should_receive(:reserve) do |reservation|
             reservation.ip.should == NetAddr::CIDR.create('1.2.3.4').to_i
             reservation.reserved = true
             foo_reservation = reservation
             true
           end
 
-          bar_network.should_receive(:reserve).and_return do |reservation|
+          bar_network.should_receive(:reserve) do |reservation|
             reservation.ip.should == NetAddr::CIDR.create('10.20.30.40').to_i
             reservation.reserved = false
             false

bosh-director/spec/unit/deployment_plan/dns_binder_spec.rb

@@ -16,8 +16,7 @@ module Bosh::Director
 
         it "should create the domain if it doesn't exist" do
           domain = nil
-          deployment.should_receive(:dns_domain=).
-            and_return { |*args| domain = args.first }
+          deployment.should_receive(:dns_domain=) { |*args| domain = args.first }
           subject.bind_deployment
 
           Models::Dns::Domain.count.should == 1

bosh-director/spec/unit/deployment_plan/multi_job_updater_spec.rb

@@ -81,9 +81,9 @@
 
       it 'enqueues all given jobs to run in parallel' do
         enqueued = []
-        expect(thread_pool).to receive(:process).twice.and_return { |&blk| enqueued << blk }
+        expect(thread_pool).to receive(:process).twice { |&blk| enqueued << blk }
 
-        expect(thread_pool).to receive(:wrap).and_return do |&blk|
+        expect(thread_pool).to receive(:wrap) do |&blk|
           blk.call(thread_pool)
           # all jobs were enqueued by the time wrap block executes
           expect(enqueued.size).to eq(2)

bosh-director/spec/unit/jobs/update_release_spec.rb

@@ -475,7 +475,7 @@ def create_package(files)
       it 'should create a proper template and upload job bits to blobstore' do
         File.open(@tarball, 'w') { |f| f.write(@job_bits) }
 
-        blobstore.should_receive(:create).and_return do |f|
+        blobstore.should_receive(:create) do |f|
           f.rewind
           Digest::SHA1.hexdigest(f.read).should == Digest::SHA1.hexdigest(@job_bits)
 

bosh-director/spec/unit/jobs/update_stemcell_spec.rb

@@ -29,7 +29,7 @@
   end
 
   it "should upload a local stemcell" do
-    @cloud.should_receive(:create_stemcell).with(anything(), {"ram" => "2gb"}).and_return do |image, _|
+    @cloud.should_receive(:create_stemcell).with(anything(), {"ram" => "2gb"}) do|image, _|
       contents = File.open(image) { |f| f.read }
       contents.should eql("image contents")
       "stemcell-cid"
@@ -45,7 +45,7 @@
   end
 
   it "should upload a remote stemcell" do
-    @cloud.should_receive(:create_stemcell).with(anything(), {"ram" => "2gb"}).and_return do |image, _|
+    @cloud.should_receive(:create_stemcell).with(anything(), {"ram" => "2gb"}) do|image, _|
       contents = File.open(image) { |f| f.read }
       contents.should eql("image contents")
       "stemcell-cid"
@@ -62,7 +62,7 @@
   end
 
   it "should cleanup the stemcell file" do
-    @cloud.should_receive(:create_stemcell).with(anything(), {"ram" => "2gb"}).and_return do |image, _|
+    @cloud.should_receive(:create_stemcell).with(anything(), {"ram" => "2gb"}) do|image, _|
       contents = File.open(image) { |f| f.read }
       contents.should eql("image contents")
       "stemcell-cid"

bosh-director/spec/unit/lock_spec.rb

@@ -11,7 +11,7 @@ module Bosh::Director
       started = Time.now.to_f
 
       stored_value = nil
-      redis.should_receive(:setnx).with('foo', anything).and_return do |_, value|
+      redis.should_receive(:setnx).with('foo', anything) do |_, value|
         stored_value = value
         timestamp = stored_value.split(':')[0].to_f
         timestamp.should be_within(2.0).of(started + 10)
@@ -20,15 +20,15 @@ module Bosh::Director
       redis.stub(:watch).with('foo')
       redis.stub(:multi).and_yield
 
-      redis.stub(:get).with('foo').and_return do
+      redis.stub(:get).with('foo') do
         stored_value
       end
 
       redis.stub(:set).with('foo', anything()) do |_, value|
         stored_value = value
       end
 
-      redis.should_receive(:del).with('foo').and_return do
+      redis.should_receive(:del).with('foo') do
         stored_value = nil
         nil
       end
@@ -48,8 +48,7 @@ module Bosh::Director
       Config.stub(:redis).and_return(redis)
 
       stored_value = nil
-      redis.stub(:setnx).with('foo', anything).
-        and_return do |_, value|
+      redis.stub(:setnx).with('foo', anything) do |_, value|
         timestamp = value.split(':')[0].to_f
         timestamp.should be_within(2.0).of(Time.now.to_f + 10)
         if stored_value.nil?
@@ -63,13 +62,13 @@ module Bosh::Director
       redis.stub(:watch).with('foo')
       redis.stub(:multi).and_yield
 
-      redis.stub(:get).with('foo').and_return { stored_value }
+      redis.stub(:get).with('foo') { stored_value }
 
       redis.should_receive(:set).with('foo', anything()) do |_, value|
         stored_value = value
       end
 
-      redis.should_receive(:del).with('foo').and_return do
+      redis.should_receive(:del).with('foo') do
         stored_value = nil
         nil
       end
@@ -91,8 +90,7 @@ module Bosh::Director
       Config.stub(:redis).and_return(redis)
 
       stored_value = nil
-      redis.stub(:setnx).with('foo', anything).
-        and_return do |_, value|
+      redis.stub(:setnx).with('foo', anything) do |_, value|
         timestamp = value.split(':')[0].to_f
         timestamp.should be_within(2.0).of(Time.now.to_f + 10)
         if stored_value.nil?
@@ -106,11 +104,11 @@ module Bosh::Director
       redis.stub(:watch).with('foo')
       redis.stub(:multi).and_yield
 
-      redis.stub(:get).with('foo').and_return do
+      redis.stub(:get).with('foo') do
         stored_value
       end
 
-      redis.should_receive(:del).with('foo').and_return do
+      redis.should_receive(:del).with('foo') do
         stored_value = nil
         nil
       end

bosh-director/spec/unit/nats_rpc_spec.rb

@@ -31,11 +31,10 @@
 
     it "should fire callback when message is received" do
       subscribe_callback = nil
-      @nats.should_receive(:subscribe).with("director.123.>").
-          and_return do |&block|
+      @nats.should_receive(:subscribe).with("director.123.>") do |&block|
         subscribe_callback = block
       end
-      @nats.should_receive(:publish).and_return do
+      @nats.should_receive(:publish) do
         subscribe_callback.call("", nil, "director.123.req1")
       end
 
@@ -53,11 +52,10 @@
 
     it "should fire once even if two messages were received" do
       subscribe_callback = nil
-      @nats.should_receive(:subscribe).with("director.123.>").
-          and_return do |&block|
+      @nats.should_receive(:subscribe).with("director.123.>") do |&block|
         subscribe_callback = block
       end
-      @nats.should_receive(:publish).and_return do
+      @nats.should_receive(:publish) do
         subscribe_callback.call("", nil, "director.123.req1")
         subscribe_callback.call("", nil, "director.123.req1")
       end
@@ -79,8 +77,7 @@
 
     it "should not fire after cancel was called" do
       subscribe_callback = nil
-      @nats.should_receive(:subscribe).with("director.123.>").
-          and_return do |&block|
+      @nats.should_receive(:subscribe).with("director.123.>") do |&block|
         subscribe_callback = block
       end
       @nats.should_receive(:publish)

bosh-director/spec/unit/problem_resolver_spec.rb

@@ -64,7 +64,7 @@ def inactive_disk(id, deployment_id = nil)
       job2 = make_job(@deployment)
 
       messages = []
-      job2.should_receive(:track_and_log).exactly(3).times.and_return { |message| messages << message }
+      job2.should_receive(:track_and_log).exactly(3).times { |message| messages << message }
       job2.apply_resolutions({
                                problems[0].id.to_s => 'ignore',
                                problems[1].id.to_s => 'ignore',

bosh-director/spec/unit/resource_pool_updater_spec.rb

@@ -47,7 +47,7 @@ module Bosh::Director
         unbound_vm.stub(:bound_instance).and_return(nil)
 
         called = false
-        resource_pool_updater.should_receive(:create_missing_vms).and_return do |&block|
+        resource_pool_updater.should_receive(:create_missing_vms) do |&block|
           called = true
           block.call(bound_vm).should == true
           block.call(unbound_vm).should == false

bosh-monitor/.rspec

@@ -1,5 +1,2 @@
 --color
 --format progress
---profile
---require rspec/instafail
---format RSpec::Instafail

bosh-monitor/spec/spec_helper.rb

@@ -62,7 +62,3 @@ def make_heartbeat(attrs = {})
   }
   Bhm::Events::Heartbeat.new(defaults.merge(attrs))
 end
-
-RSpec.configure do |c|
-  c.color_enabled = true
-end

bosh-registry/.rspec

@@ -1,5 +1,2 @@
 --color
 --format progress
---profile
---require rspec/instafail
---format RSpec::Instafail

bosh-release/.rspec

@@ -1,5 +1,2 @@
 --color
 --format progress
---profile
---require rspec/instafail
---format RSpec::Instafail

bosh-stemcell/.rspec

@@ -1,5 +1,2 @@
 --color
 --format progress
---profile
---require rspec/instafail
---format RSpec::Instafail

bosh-stemcell/spec/bosh/monkeypatch/serverspec/backend/exec_spec.rb

@@ -6,29 +6,29 @@ module SpecInfra::Backend
 
     describe '#run_command' do
       context 'when #chroot_dir is NOT set' do
-        before { exec.stub(chroot_dir: nil) }
+        before { allow(exec).to receive(:chroot_dir).and_return(nil) }
 
         it 'runs the provided command as expected' do
-          exec.should_receive(:`).with('echo "FOO" 2>&1')
+          expect(exec).to receive(:`).with('echo "FOO" 2>&1')
           exec.run_command('echo "FOO"')
         end
       end
 
       context 'when #chroot_dir is set' do
-        before { exec.stub(chroot_dir: '/path/to/chroot') }
+        before { allow(exec).to receive(:chroot_dir).and_return('/path/to/chroot') }
 
         it 'runs the provided command within the chroot' do
           chroot_command = %Q{
 sudo chroot /path/to/chroot /bin/bash <<CHROOT_CMD
   echo "FOO" 2>&1; echo EXIT_CODE=\\$?
 CHROOT_CMD
  2>&1}
-          exec.should_receive(:`).with(chroot_command).and_return("FOO\nEXIT_CODE=0\n")
+          expect(exec).to receive(:`).with(chroot_command).and_return("FOO\nEXIT_CODE=0\n")
           exec.run_command('echo "FOO"')
         end
 
         it 'extracts the exit code returned from within the chroot into an Integer' do
-          exec.stub(:` => "ATTENTION\nDO NOT CARE\nEXIT_CODE=8675309\n")
+          allow(exec).to receive(:`).and_return("ATTENTION\nDO NOT CARE\nEXIT_CODE=8675309\n")
           result = exec.run_command('do_not_care')
           expect(result[:exit_status]).to eq(867_5309)
         end

bosh-stemcell/spec/bosh/stemcell/archive_spec.rb

@@ -108,14 +108,14 @@ module Bosh::Stemcell
 
     describe '#extract' do
       it 'extracts stemcell' do
-        Rake::FileUtilsExt.should_receive(:sh).with(
-          /tar xzf .*#{stemcell_path} --directory/)
+        expect(Rake::FileUtilsExt).to receive(:sh).with(/tar xzf .*#{stemcell_path} --directory/)
+
         subject.extract {}
       end
 
       it 'extracts stemcell and excludes files' do
-        Rake::FileUtilsExt.should_receive(:sh).with(
-          /tar xzf .*#{stemcell_path} --directory .* --exclude=image/)
+        expect(Rake::FileUtilsExt).to receive(:sh).with(/tar xzf .*#{stemcell_path} --directory .* --exclude=image/)
+
         subject.extract(exclude: 'image') {}
       end
     end