cfoundry 2.2.0.rc1 → 2.2.0.rc2

data/lib/cfoundry/version.rb

@@ -1,4 +1,4 @@
 module CFoundry # :nodoc:
   # CFoundry library version number.
-  VERSION = "2.2.0.rc1".freeze
+  VERSION = "2.2.0.rc2".freeze
 end

data/spec/cfoundry/baseclient_spec.rb

@@ -3,12 +3,12 @@ require 'spec_helper'
 describe CFoundry::BaseClient do
   describe "#request" do
     before do
-      stub(subject).handle_response(anything, anything, anything)
+      subject.stub(:handle_response).with(anything, anything, anything)
     end
 
     context "when given multiple segments" do
       it "encodes the segments and joins them with '/'" do
-        mock(subject).request_raw("GET", "foo/bar%2Fbaz", {})
+        subject.should_receive(:request_raw).with("GET", "foo/bar%2Fbaz", {})
         subject.request("GET", "foo", "bar/baz")
       end
     end
@@ -16,14 +16,14 @@ describe CFoundry::BaseClient do
     context "when the first segment starts with a '/'" do
       context "and there's only one segment" do
         it "requests with the segment unaltered" do
-          mock(subject).request_raw("GET", "/v2/apps", {})
+          subject.should_receive(:request_raw).with("GET", "/v2/apps", {})
           subject.request("GET", "/v2/apps")
         end
       end
 
       context "and there's more than one segment" do
         it "encodes the segments and joins them with '/'" do
-          mock(subject).request_raw("GET", "%2Ffoo/bar%2Fbaz", {})
+          subject.should_receive(:request_raw).with("GET", "%2Ffoo/bar%2Fbaz", {})
           subject.request("GET", "/foo", "bar/baz")
         end
       end
@@ -34,9 +34,9 @@ describe CFoundry::BaseClient do
       let(:token) { CFoundry::AuthToken.new("bearer something", refresh_token) }
 
       before do
-        stub(subject).request_raw
+        subject.stub(:request_raw)
         subject.token = token
-        stub(token).expires_soon? { expires_soon? }
+        token.stub(:expires_soon?) { expires_soon? }
       end
 
       context "and the token is about to expire" do
@@ -47,12 +47,12 @@ describe CFoundry::BaseClient do
           let(:refresh_token) { "some-refresh-token" }
 
           it "sets the token's auth header to nil to prevent recursion" do
-            stub(subject).refresh_token!
+            subject.stub(:refresh_token!)
             subject.request("GET", "foo")
           end
 
           it "refreshes the access token" do
-            mock(subject).refresh_token!
+            subject.should_receive(:refresh_token!)
             subject.request("GET", "foo")
           end
         end
@@ -61,8 +61,8 @@ describe CFoundry::BaseClient do
           let(:refresh_token) { nil }
 
           it "moves along" do
-            mock(subject).request_raw(anything, anything, anything)
-            dont_allow(subject).refresh_token!
+            subject.should_receive(:request_raw).with(anything, anything, anything)
+            subject.should_not_receive(:refresh_token!)
             subject.request("GET", "foo")
           end
         end
@@ -72,8 +72,8 @@ describe CFoundry::BaseClient do
         let(:expires_soon?) { nil }
 
         it "moves along" do
-          mock(subject).request_raw(anything, anything, anything)
-          dont_allow(subject).refresh_token!
+          subject.should_receive(:request_raw).with(anything, anything, anything)
+          subject.should_not_receive(:refresh_token!)
           subject.request("GET", "foo")
         end
       end
@@ -86,10 +86,10 @@ describe CFoundry::BaseClient do
       let(:new_access_token) { Base64.encode64(%Q|{"algo": "h1234"}{"a":"x"}random-bytes|) }
       let(:auth_token) { CFoundry::AuthToken.new("bearer #{access_token}", refresh_token) }
 
-      before { stub(subject).uaa { uaa } }
+      before { subject.stub(:uaa) { uaa } }
 
       it "refreshes the token with UAA client and assigns it" do
-        mock(uaa).try_to_refresh_token! {
+        uaa.should_receive(:try_to_refresh_token!) {
           CFoundry::AuthToken.new("bearer #{new_access_token}", auth_token.refresh_token)
         }
 
@@ -106,7 +106,7 @@ describe CFoundry::BaseClient do
       let(:info) { { :authorization_endpoint => "http://uaa.example.com" } }
 
       before do
-        stub(subject).info { info }
+        subject.stub(:info) { info }
       end
 
       describe "#uaa" do
@@ -121,7 +121,7 @@ describe CFoundry::BaseClient do
 
         it "has the same AuthToken as BaseClient" do
           token = CFoundry::AuthToken.new(nil)
-          stub(subject).token { token }
+          subject.stub(:token) { token }
           expect(subject.uaa.token).to eq token
         end
 
@@ -157,7 +157,7 @@ describe CFoundry::BaseClient do
 
     context "with no uaa endpoint" do
       before do
-        stub(subject).info { { :something => "else" } }
+        subject.stub(:info) { { :something => "else" } }
       end
 
       describe "#uaa" do
@@ -172,18 +172,18 @@ describe CFoundry::BaseClient do
   describe "#password_score" do
     context "with a uaa" do
       before do
-        stub(subject).info { { :authorization_endpoint => "http://uaa.example.com" } }
+        subject.stub(:info) { { :authorization_endpoint => "http://uaa.example.com" } }
       end
 
       it "delegates to the uaa's password strength method" do
-        mock(subject.uaa).password_score('password')
+        subject.uaa.should_receive(:password_score).with('password')
         subject.password_score('password')
       end
     end
 
     context "without a uaa" do
       before do
-        stub(subject).info { { :something => "else" } }
+        subject.stub(:info) { { :something => "else" } }
       end
 
       it "returns :unknown" do

data/spec/cfoundry/client_spec.rb

@@ -2,7 +2,7 @@ require "spec_helper"
 
 describe CFoundry::Client do
   before do
-    any_instance_of(CFoundry::V2::Client) { |cli| stub(cli).info }
+    CFoundry::V2::Client.any_instance.stub(:info)
   end
 
   subject { CFoundry::Client.new('http://example.com') }

data/spec/cfoundry/rest_client_spec.rb

@@ -258,8 +258,8 @@ describe CFoundry::RestClient do
       end
 
       it "prints the request and the response" do
-        mock(rest_client).print_request({:headers => {"Content-Length" => 0}, :url => "https://api.cloudfoundry.com/some-path", :method => "GET", :body => nil})
-        mock(rest_client).print_response({:status => "200", :headers => {"content-type" => "application/json"}, :body => '{"some": "json"}'})
+        rest_client.should_receive(:print_request).with({:headers => {"Content-Length" => 0}, :url => "https://api.cloudfoundry.com/some-path", :method => "GET", :body => nil})
+        rest_client.should_receive(:print_response).with({:status => "200", :headers => {"content-type" => "application/json"}, :body => '{"some": "json"}'})
         subject
       end
     end

data/spec/cfoundry/uaaclient_spec.rb

@@ -20,7 +20,7 @@ EOF
 
   shared_examples "UAA wrapper" do
     it "converts UAA errors to CFoundry equivalents" do
-      mock(uaa).wrap_uaa_errors { nil }
+      uaa.should_receive(:wrap_uaa_errors) { nil }
       subject
     end
   end
@@ -75,21 +75,21 @@ EOF
     subject { uaa.authorize(username, password) }
 
     before do
-      stub(issuer).owner_password_grant { auth }
-      stub(uaa).token_issuer { issuer }
+      issuer.stub(:owner_password_grant) { auth }
+      uaa.stub(:token_issuer) { issuer }
     end
 
     include_examples "UAA wrapper"
 
     it 'returns the token on successful authentication' do
-      mock(issuer).owner_password_grant(username, password) { auth }
+      issuer.should_receive(:owner_password_grant).with(username, password) { auth }
       expect(subject).to eq auth
     end
 
     context 'when authorization fails' do
       context 'in the expected way' do
         it 'raises a CFoundry::Denied error' do
-          mock(issuer).owner_password_grant(anything, anything) { raise CF::UAA::BadResponse.new("401: FooBar") }
+          issuer.should_receive(:owner_password_grant) { raise CF::UAA::BadResponse.new("401: FooBar") }
           expect { subject }.to raise_error(CFoundry::Denied, "401: Authorization failed")
         end
       end
@@ -97,28 +97,28 @@ EOF
 
       context 'in an unexpected way' do
         it 'raises a CFoundry::Denied error' do
-          mock(issuer).owner_password_grant(anything, anything) { raise CF::UAA::BadResponse.new("no_status_code") }
+          issuer.should_receive(:owner_password_grant) { raise CF::UAA::BadResponse.new("no_status_code") }
           expect { subject }.to raise_error(CFoundry::Denied, "400: Authorization failed")
         end
       end
 
       context "with a CF::UAA::TargetError" do
         before do
-          stub(issuer).owner_password_grant { raise CF::UAA::TargetError.new("useless info") }
+          issuer.stub(:owner_password_grant) { raise CF::UAA::TargetError.new("useless info") }
         end
 
         it "retries with implicit grant" do
-          mock(issuer).implicit_grant_with_creds(:username => username, :password => password)
+          issuer.should_receive(:implicit_grant_with_creds).with(:username => username, :password => password)
           expect { subject }.to_not raise_error
         end
 
         it "fails with Denied when given a 401" do
-          stub(issuer).implicit_grant_with_creds(anything) { raise CF::UAA::BadResponse.new("status 401") }
+          issuer.stub(:implicit_grant_with_creds) { raise CF::UAA::BadResponse.new("status 401") }
           expect { subject }.to raise_error(CFoundry::Denied, "401: Authorization failed")
         end
 
         it "fails with Denied when given any other status code" do
-          stub(issuer).implicit_grant_with_creds(anything) { raise CF::UAA::BadResponse.new("no status code") }
+          issuer.stub(:implicit_grant_with_creds) { raise CF::UAA::BadResponse.new("no status code") }
           expect { subject }.to raise_error(CFoundry::Denied, "400: Authorization failed")
         end
       end
@@ -277,7 +277,7 @@ EOF
     subject { uaa }
 
     it "wraps uaa errors" do
-      mock(uaa).wrap_uaa_errors
+      uaa.should_receive(:wrap_uaa_errors)
       subject.delete_user(guid)
     end
 
@@ -351,7 +351,7 @@ EOF
 
   describe "#try_to_refresh_token!" do
     it "uses the refresh token to get a new access token" do
-      mock(uaa.send(:token_issuer)).refresh_token_grant(uaa.token.refresh_token) do
+      uaa.send(:token_issuer).should_receive(:refresh_token_grant).with(uaa.token.refresh_token) do
         CF::UAA::TokenInfo.new(
           :token_type => "bearer",
           :access_token => "refreshed-token",
@@ -365,7 +365,7 @@ EOF
 
     context "when the refresh token has expired" do
       it "returns the current token" do
-        stub(uaa.send(:token_issuer)).refresh_token_grant do
+        uaa.send(:token_issuer).should_receive(:refresh_token_grant) do
           raise CF::UAA::TargetError.new
         end
 

data/spec/cfoundry/upload_helpers_spec.rb

@@ -16,9 +16,9 @@ module CFoundry
 
       def mock_zip(*args, &block)
         if args.empty?
-          mock(CFoundry::Zip).pack.with_any_args(&block)
+          CFoundry::Zip.should_receive(:pack, &block)
         else
-          mock(CFoundry::Zip).pack(*args, &block)
+          CFoundry::Zip.should_receive(:pack).with(*args, &block)
         end
       end
 
@@ -33,11 +33,11 @@ module CFoundry
       let(:model) { TestModelWithUploadHelpers.new(guid, client) }
 
       before do
-        stub(client).base { base }
-        stub(base).upload_app.with_any_args
+        client.stub(:base) { base }
+        base.stub(:upload_app)
 
         FileUtils.rm_rf tmpdir
-        stub(Dir).tmpdir do
+        Dir.stub(:tmpdir) do
           FileUtils.mkdir_p tmpdir
           tmpdir
         end
@@ -46,13 +46,13 @@ module CFoundry
       it "zips the app and uploads the zip file" do
         zip_path = "#{tmpdir}/#{guid}.zip"
         mock_zip(anything, zip_path) { true }
-        mock(base).upload_app(guid, zip_path, [])
+        base.stub(:upload_app).with(guid, zip_path, [])
         model.upload(path, check_resources)
       end
 
       it "uploads an app with the right guid" do
         mock_zip
-        mock(base).upload_app(guid, anything, anything)
+        base.should_receive(:upload_app).with(guid, anything, anything)
         model.upload(path, check_resources)
       end
 
@@ -112,7 +112,7 @@ module CFoundry
         before { mock_zip { false } }
 
         it "passes `false` to #upload_app" do
-          mock(base).upload_app(guid, false, [])
+          base.should_receive(:upload_app).with(guid, false, [])
           model.upload(path, check_resources)
         end
       end
@@ -122,17 +122,17 @@ module CFoundry
           let(:path) { "#{SPEC_ROOT}/fixtures/apps/with_nested_directories" }
 
           it "prunes them before zipping" do
-            stub(model).make_fingerprints(anything) do
+            model.stub(:make_fingerprints).with(anything) do
               [[], CFoundry::UploadHelpers::RESOURCE_CHECK_LIMIT + 1]
             end
 
-            stub(base).resource_match(anything) do
+            base.stub(:resource_match).with(anything) do
               %w{ xyz foo/bar/baz/fizz }.map do |path|
                 {:fn => "#{tmpdir}/.cf_#{guid}_files/#{path}"}
               end
             end
 
-            mock(base).upload_app(anything, false, anything)
+            base.should_receive(:upload_app).with(anything, false, anything)
             model.upload(path)
           end
         end
@@ -142,17 +142,17 @@ module CFoundry
         let(:path) { "#{SPEC_ROOT}/fixtures/apps/with_dotfiles" }
 
         it "does not prune them" do
-          stub(model).make_fingerprints(anything) do
+          model.stub(:make_fingerprints).with(anything) do
             [[], CFoundry::UploadHelpers::RESOURCE_CHECK_LIMIT + 1]
           end
 
-          stub(base).resource_match(anything) do
+          base.stub(:resource_match).with(anything) do
             %w{ xyz }.map do |path|
               {:fn => "#{tmpdir}/.cf_#{guid}_files/#{path}"}
             end
           end
 
-          mock(base).upload_app(anything, anything, anything) do |_, zip, _|
+          base.should_receive(:upload_app).with(anything, anything, anything) do |_, zip, _|
             expect(zip).to be_a(String)
           end
 
@@ -179,4 +179,4 @@ module CFoundry
       end
     end
   end
-end
+end

data/spec/cfoundry/v2/app_spec.rb

@@ -60,7 +60,7 @@ module CFoundry
         let(:app) { build(:app) }
 
         it "assigns :instances as #total_instances" do
-          stub(app).summary { {:instances => 4} }
+          app.stub(:summary) { {:instances => 4} }
 
           app.summarize!
 
@@ -73,14 +73,14 @@ module CFoundry
         let(:response) { {:body => '{ "foo": "bar" }'} }
 
         before do
-          stub(client.base).put("v2", "apps", subject.guid, anything) do
+          client.base.stub(:put).with("v2", "apps", subject.guid, anything) do
             response
           end
         end
 
         context "when asynchronous is true" do
           it "sends the PUT request with &stage_async=true" do
-            mock(client.base).put(
+            client.base.should_receive(:put).with(
               "v2", "apps", subject.guid,
               hash_including(
                 :params => {:stage_async => true},
@@ -111,7 +111,7 @@ module CFoundry
 
         context "when asynchronous is false" do
           it "sends the PUT request with &stage_async=false" do
-            mock(client.base).put(
+            client.base.should_receive(:put).with(
               "v2", "apps", subject.guid,
               hash_including(:params => {:stage_async => false})) do
               response
@@ -144,7 +144,7 @@ module CFoundry
           let(:response) { {:body => {"foo" => "bar"}.to_json} }
 
           before do
-            stub(client.base).put("v2", "apps", subject.guid, anything) do
+            client.base.stub(:put).with("v2", "apps", subject.guid, anything) do
               response
             end
           end
@@ -167,13 +167,13 @@ module CFoundry
         let(:base_url) { "http://example.com/log" }
 
         def mock_log(url = anything)
-          mock(client).stream_url(url) do |_, blk|
+          client.should_receive(:stream_url).with(url) do |_, &blk|
             blk.call(yield)
           end.ordered
         end
 
         def stub_log(url = anything)
-          stub(client).stream_url(url) do |_, blk|
+          client.stub(:stream_url).with(url) do |_, blk|
             blk.call(yield)
           end.ordered
         end
@@ -240,14 +240,14 @@ module CFoundry
 
       describe "delete!" do
         it "defaults to recursive" do
-          mock(client.base).delete("v2", :apps, subject.guid, {:params => {:recursive => true}})
+          client.base.should_receive(:delete).with("v2", :apps, subject.guid, {:params => {:recursive => true}})
 
           subject.delete!
         end
       end
 
       it "accepts and ignores an options hash" do
-        mock(client.base).delete("v2", :apps, subject.guid, {:params => {:recursive => true}})
+        client.base.should_receive(:delete).with("v2", :apps, subject.guid, {:params => {:recursive => true}})
 
         subject.delete!(:recursive => false)
       end
@@ -255,8 +255,8 @@ module CFoundry
       describe "#health" do
         describe "when staging failed for an app" do
           it "returns 'STAGING FAILED' as state" do
-            stub(client.base).instances(subject.guid) { raise CFoundry::StagingError }
-            stub(subject).state { "STARTED" }
+            client.base.stub(:instances).with(subject.guid) { raise CFoundry::StagingError }
+            subject.stub(:state) { "STARTED" }
 
             expect(subject.health).to eq("STAGING FAILED")
           end

data/spec/cfoundry/v2/base_spec.rb

@@ -135,7 +135,7 @@ describe CFoundry::V2::Base do
           let(:args) { segments }
 
           it "makes a request with the correct url and options" do
-            mock(rest_client).request(verb, "first-segment/next-segment", {}) { [request, response] }
+            rest_client.should_receive(:request).with(verb, "first-segment/next-segment", {}) { [request, response] }
             subject
           end
         end
@@ -144,7 +144,7 @@ describe CFoundry::V2::Base do
           let(:args) { segments + [options] }
 
           it "makes a request with the correct url and options" do
-            mock(rest_client).request(verb, "first-segment/next-segment", options) { [request, response] }
+            rest_client.should_receive(:request).with(verb, "first-segment/next-segment", options) { [request, response] }
             subject
           end
         end
@@ -155,7 +155,7 @@ describe CFoundry::V2::Base do
           let(:args) { ["first-segment"] }
 
           it "makes a request with the correct url and options" do
-            mock(rest_client).request(verb, "first-segment", {}) { [request, response] }
+            rest_client.should_receive(:request).with(verb, "first-segment", {}) { [request, response] }
             subject
           end
         end
@@ -164,7 +164,7 @@ describe CFoundry::V2::Base do
           let(:args) { ["first-segment", options] }
 
           it "makes a request with the correct url and options" do
-            mock(rest_client).request(verb, "first-segment", options) { [request, response] }
+            rest_client.should_receive(:request).with(verb, "first-segment", options) { [request, response] }
             subject
           end
         end
@@ -185,7 +185,7 @@ describe CFoundry::V2::Base do
       subject { base.get(*args) }
 
       it "makes a GET request" do
-        mock(rest_client).request("GET", "some-path", options) { [request, response] }
+        rest_client.should_receive(:request).with("GET", "some-path", options) { [request, response] }
         subject
       end
 
@@ -197,7 +197,7 @@ describe CFoundry::V2::Base do
       subject { base.post(*args) }
 
       it "makes a POST request" do
-        mock(rest_client).request("POST", "some-path", options) { [request, response] }
+        rest_client.should_receive(:request).with("POST", "some-path", options) { [request, response] }
         subject
       end
 
@@ -209,7 +209,7 @@ describe CFoundry::V2::Base do
       subject { base.put(*args) }
 
       it "makes a PUT request" do
-        mock(rest_client).request("PUT", "some-path", options) { [request, response] }
+        rest_client.should_receive(:request).with("PUT", "some-path", options) { [request, response] }
         subject
       end
 
@@ -221,7 +221,7 @@ describe CFoundry::V2::Base do
       subject { base.delete(*args) }
 
       it "makes a DELETE request" do
-        mock(rest_client).request("DELETE", "some-path", options) { [request, response] }
+        rest_client.should_receive(:request).with("DELETE", "some-path", options) { [request, response] }
         subject
       end
 
@@ -278,7 +278,7 @@ describe CFoundry::V2::Base do
     let(:file_url) { "http://api.cloudfoundry.com/static/path/to/some/file" }
 
     before do
-      stub(base).token { CFoundry::AuthToken.new("bearer foo") }
+      base.stub(:token) { CFoundry::AuthToken.new("bearer foo") }
     end
 
     it "follows the redirect returned by the files endpoint" do

data/spec/cfoundry/v2/client_spec.rb

@@ -13,12 +13,12 @@ module CFoundry
         subject { client.register(email, password) }
 
         it "creates the user in uaa and ccng" do
-          stub(client.base).uaa { uaa }
-          stub(uaa).add_user(email, password) { {"id" => "1234"} }
+          client.base.stub(:uaa) { uaa }
+          uaa.stub(:add_user).with(email, password) { {"id" => "1234"} }
 
           user = build(:user)
-          stub(client).user { user }
-          stub(user).create!
+          client.stub(:user) { user }
+          user.stub(:create!)
           subject
           expect(user.guid).to eq "1234"
         end
@@ -74,4 +74,4 @@ module CFoundry
       end
     end
   end
-end
+end

data/spec/cfoundry/v2/model_magic/model_magic/attribute_spec.rb

@@ -54,13 +54,13 @@ module CFoundry
             end
 
             it "retrieves the manifest the first time" do
-              mock(client.base).test_model("test-model-guid-1") {
+              client.base.should_receive(:test_model).with("test-model-guid-1") {
                 {:entity => {:foo => "fizz"}}
               }.ordered
 
               expect(model.foo).to eq "fizz"
 
-              dont_allow(client.base).model.ordered
+              client.base.should_not_receive(:model)
 
               expect(model.foo).to eq "fizz"
             end
@@ -82,7 +82,7 @@ module CFoundry
             end
 
             before do
-              stub(client.base).test_model("test-model-guid-1") {
+              client.base.stub(:test_model).with("test-model-guid-1") {
                 {:entity => {:not_foo => "fizz"}}
               }
             end
@@ -100,14 +100,14 @@ module CFoundry
             end
 
             it "uses the 'at' value in the update payload" do
-              mock(client.base).put("v2", :test_models, model.guid, hash_including(:payload => {:not_foo => 123}))
+              client.base.should_receive(:put).with("v2", :test_models, model.guid, hash_including(:payload => {:not_foo => 123}))
               model.foo = 123
               model.update!
             end
 
             it "uses the 'at' value in the create payload" do
               model.foo = 123
-              mock(client.base).post("v2", :test_models, hash_including(:payload => {:not_foo => 123})) { {:metadata => {}} }
+              client.base.should_receive(:post).with("v2", :test_models, hash_including(:payload => {:not_foo => 123})) { {:metadata => {}} }
               model.create!
             end
 

data/spec/cfoundry/v2/model_spec.rb

@@ -15,21 +15,21 @@ module CFoundry
 
       describe "create" do
         it "uses #create!" do
-          mock(model).create!
+          model.should_receive(:create!)
           model.create
         end
 
         context "without errors" do
           it "returns true" do
-            mock(model).create!
+            model.should_receive(:create!)
             model.create.should == true
           end
         end
 
         context "with errors" do
           before do
-            stub(model.class).model_name { ActiveModel::Name.new(model, nil, "abstract_model") }
-            stub(model).create! { raise CFoundry::APIError.new("HELP") }
+            model.class.stub(:model_name) { ActiveModel::Name.new(model, nil, "abstract_model") }
+            model.stub(:create!) { raise CFoundry::APIError.new("HELP") }
           end
 
           it "does not raise an exception" do
@@ -58,7 +58,7 @@ module CFoundry
 
       describe "#create!" do
         before do
-          stub(client.base).post {
+          client.base.stub(:post) {
             {:metadata => {
                 :guid => "123",
                 :created_at => "2013-06-10 10:41:15 -0700",
@@ -69,7 +69,7 @@ module CFoundry
         end
 
         it "posts to the model's create url with appropriate arguments" do
-          mock(client.base).post("v2", :test_models,
+          client.base.should_receive(:post).with("v2", :test_models,
             :content => :json,
             :accept => :json,
             :payload => {:foo => "bar"}
@@ -109,7 +109,7 @@ module CFoundry
 
       describe "#update!" do
         before do
-          stub(client.base).put {
+          client.base.stub(:put) {
             {
               :metadata => {
                 :guid => guid,
@@ -125,7 +125,7 @@ module CFoundry
 
         it "updates using the client with the v2 api, its plural model name, object guid, and diff object" do
           model.foo = "bar"
-          mock(client.base).put("v2", :test_models, guid,
+          client.base.should_receive(:put).with("v2", :test_models, guid,
             :content => :json,
             :accept => :json,
             :payload => {:foo => "bar"}
@@ -154,26 +154,26 @@ module CFoundry
 
       describe "delete" do
         it "uses #delete!" do
-          mock(model).delete!({}) { true }
+          model.should_receive(:delete!).with({}) { true }
           model.delete
         end
 
         it "passes options along to delete!" do
-          mock(model).delete!(:recursive => true) { true }
+          model.should_receive(:delete!).with(:recursive => true) { true }
           model.delete(:recursive => true)
         end
 
         context "without errors" do
           it "returns true" do
-            mock(model).delete!({}) { true }
+            model.should_receive(:delete!).with({}) { true }
             model.delete.should == true
           end
         end
 
         context "with errors" do
           before do
-            stub(model.class).model_name { ActiveModel::Name.new(model, nil, "abstract_model") }
-            stub(model).delete! { raise CFoundry::APIError.new("HELP") }
+            model.class.stub(:model_name) { ActiveModel::Name.new(model, nil, "abstract_model") }
+            model.stub(:delete!) { raise CFoundry::APIError.new("HELP") }
           end
 
           it "does not raise an exception" do
@@ -201,11 +201,11 @@ module CFoundry
       end
 
       describe "#delete!" do
-        before { stub(client.base).delete }
+        before { client.base.stub(:delete) }
 
         context "without options" do
           it "deletes using the client with the v2 api, its plural model name, object guid, and empty params hash" do
-            mock(client.base).delete("v2", :test_models, guid, :params => {})
+            client.base.should_receive(:delete).with("v2", :test_models, guid, :params => {})
             model.delete!
           end
         end
@@ -213,7 +213,7 @@ module CFoundry
         context "with options" do
           it "sends delete with the object guid and options" do
             options = {:excellent => "billandted"}
-            mock(client.base).delete("v2", :test_models, guid, :params => options)
+            client.base.should_receive(:delete).with("v2", :test_models, guid, :params => options)
 
             model.delete!(options)
           end
@@ -291,7 +291,7 @@ module CFoundry
 
         context "on an object that has been deleted" do
           before do
-            stub(client.base).delete
+            client.base.stub(:delete)
             model.delete
           end
 
@@ -313,7 +313,7 @@ module CFoundry
 
         context "when metadata are not defined" do
           before do
-            stub(new_object).manifest(nil)
+            new_object.stub(:manifest).with(nil)
           end
 
           it "returns nil for timestamps" do

data/spec/cfoundry/v2/quota_definition_spec.rb

@@ -40,7 +40,7 @@ module CFoundry
         let(:client) { build(:client) }
 
         it "is queryable by name" do
-          mock(client).quota_definitions({:query=>[:name, "quota-name"]}) {[]}
+          client.should_receive(:quota_definitions).with({:query=>[:name, "quota-name"]}) {[]}
 
           client.quota_definition_by_name("quota-name")
         end

data/spec/cfoundry/v2/route_spec.rb

@@ -29,7 +29,7 @@ module CFoundry
 
       describe "errors" do
         before do
-          stub(route).create! { raise CFoundry::RouteHostTaken.new("the host is taken", 210003) }
+          route.stub(:create!) { raise CFoundry::RouteHostTaken.new("the host is taken", 210003) }
         end
 
         it "populates errors on host" do

data/spec/spec_helper.rb

@@ -17,5 +17,4 @@ require "support/factory_girl"
 require "support/test_model_builder"
 
 RSpec.configure do |c|
-  c.mock_with :rr
 end

data/spec/support/shared_examples/client_login_examples.rb

@@ -8,8 +8,8 @@ shared_examples_for 'client login prompts' do
   end
 
   before do
-    stub(client.base).uaa { uaa }
-    stub(uaa).prompts { prompts }
+    client.base.stub(:uaa) { uaa }
+    uaa.stub(:prompts) { prompts }
   end
 
   subject { client.login_prompts }
@@ -27,8 +27,8 @@ shared_examples_for 'client login' do
   let(:token_info) { CF::UAA::TokenInfo.new({ :access_token => access_token, :token_type => "bearer" }) }
 
   before do
-    stub(client.base).uaa { uaa }
-    stub(uaa).authorize(email, password) { token_info }
+    client.base.stub(:uaa) { uaa }
+    uaa.stub(:authorize).with(email, password) { token_info }
   end
 
   subject { client.login(email, password) }
@@ -43,4 +43,4 @@ shared_examples_for 'client login' do
     expect(client.token).to be_a(CFoundry::AuthToken)
     expect(client.token.auth_header).to eq("bearer #{access_token}")
   end
-end
+end

data/spec/support/shared_examples/model_summary_examples.rb

@@ -22,7 +22,7 @@ shared_examples_for "a summarizeable model" do
 
   describe "#summarize!" do
     it "defines basic attributes via #summary" do
-      stub(subject).summary { summary_attributes }
+      subject.stub(:summary) { summary_attributes }
 
       subject.summarize!
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cfoundry
 version: !ruby/object:Gem::Version
-  version: 2.2.0.rc1
+  version: 2.2.0.rc2
   prerelease: 6
 platform: ruby
 authors:
@@ -179,7 +179,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.11'
+        version: '2.13'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -187,23 +187,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.11'
-- !ruby/object:Gem::Dependency
-  name: rr
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.13'
 - !ruby/object:Gem::Dependency
   name: shoulda-matchers
   requirement: !ruby/object:Gem::Requirement
@@ -427,9 +411,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 3546131754445164394
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: