Update rubygems and bundler (existing version is not working for us)jk/update-gem-version

2 files changed, 4 insertions, 3 deletions

diff --git a/.travis.yml b/.travis.yml
index d2c1f4bcff..ffa36e01e0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,7 +8,8 @@ before_install:
   # new 1.10.6 bundler is busted with our rake tasks.  the
   # 2.4.5 rubygems with 1.7.6 bundler in travis currently works.
   # see https://github.com/bundler/bundler/issues/3982
-#  gem update --system
+  - gem update --system
+  - gem install bundler --pre
 
 branches:
   only:
diff --git a/spec/unit/api_client/registration_spec.rb b/spec/unit/api_client/registration_spec.rb
index d6230afb6a..9e2d5399fe 100644
--- a/spec/unit/api_client/registration_spec.rb
+++ b/spec/unit/api_client/registration_spec.rb
@@ -35,7 +35,7 @@ describe Chef::ApiClient::Registration do
     File.open(Chef::Config[:validation_key], "r") {|f| f.read.chomp }
   end
 
-  let(:http_mock) { double("Chef::REST mock") }
+  let(:http_mock) { double("Chef::ServerAPI mock") }
 
   let(:expected_post_data) do
     { :name => client_name, :admin => false, :public_key => generated_public_key.to_pem }
@@ -93,7 +93,7 @@ describe Chef::ApiClient::Registration do
   end
 
   it "has an HTTP client configured with validator credentials" do
-    expect(registration.http_api).to be_a_kind_of(Chef::REST)
+    expect(registration.http_api).to be_a_kind_of(Chef::ServerAPI)
     expect(registration.http_api.client_name).to eq("test-validator")
     expect(registration.http_api.signing_key).to eq(private_key_data)
   end