rhc 1.11.4 → 1.12.4

data/spec/rhc/helpers_spec.rb

@@ -70,7 +70,7 @@ describe AllRhcHelpers do
     it_should_behave_like "colorized output"
   end
 
-  it("should invoke debug from debug_error"){ expect{ subject.debug_error(mock(:class => "Mock", :message => 'msg', :backtrace => [])) }.to call(:debug).on($terminal).with("msg (Mock)\n  ") }
+  it("should invoke debug from debug_error"){ expect{ subject.debug_error(double(:class => "Mock", :message => 'msg', :backtrace => [])) }.to call(:debug).on($terminal).with("msg (Mock)\n  ") }
 
   it("should draw a table") do
     subject.table([[10,2], [3,40]]) do |i|
@@ -211,12 +211,12 @@ describe AllRhcHelpers do
     let(:arguments){ ['help', '--ssl-version=sslv3'] }
 
     context 'on an older version of HTTPClient' do
-      before{ HTTPClient::SSLConfig.should_receive(:method_defined?).any_number_of_times.with(:ssl_version).and_return(false) }
+      before{ HTTPClient::SSLConfig.stub(:method_defined?).with(:ssl_version).and_return(false) }
       it('should print an error') { run_output.should =~ /You are using an older version of the httpclient.*--ssl-version/ }
       it('should error out') { expect{ run }.to exit_with_code(1) }
     end
     context 'a newer version of HTTPClient' do
-      before{ HTTPClient::SSLConfig.should_receive(:method_defined?).any_number_of_times.with(:ssl_version).and_return(true) }
+      before{ HTTPClient::SSLConfig.stub(:method_defined?).with(:ssl_version).and_return(true) }
       it('should not print an error') { run_output.should_not =~ /You are using an older version of the httpclient.*--ssl-version/ }
       it('should error out') { expect{ run }.to exit_with_code(0) }
     end
@@ -248,9 +248,9 @@ describe AllRhcHelpers do
   end
 
   context "#get_properties" do
-    it{ subject.send(:get_properties, stub(:plan_id => 'free'), :plan_id).should == [[:plan_id, 'Free']] }
+    it{ subject.send(:get_properties, double(:plan_id => 'free'), :plan_id).should == [[:plan_id, 'Free']] }
     context "when an error is raised" do
-      let(:bar){ stub.tap{ |s| s.should_receive(:foo).and_raise(::Exception) } }
+      let(:bar){ double.tap{ |s| s.should_receive(:foo).and_raise(::Exception) } }
       it{ subject.send(:get_properties, bar, :foo).should == [[:foo, '<error>']] }
     end
   end
@@ -394,7 +394,7 @@ describe AllRhcHelpers do
     let(:existent_host) { 'real_host' }
     let(:nonexistent_host) { 'fake_host' }
     
-    before :all do
+    before do
       Resolv::Hosts.stub(:new) { resolver }
       resolver.stub(:getaddress).with(existent_host)   { existent_host }
       resolver.stub(:getaddress).with(nonexistent_host){ Resolv::ResolvError }

data/spec/rhc/rest_application_spec.rb

@@ -55,14 +55,14 @@ module RHC
 
       context "#add_cartridge" do
         context "with a name" do
-          before{ stub_api_request(:any, app_links['ADD_CARTRIDGE']['relative']).with(:body => {:name => 'mock_cart_0'}.to_json).to_return(mock_cartridge_response) }
+          before{ stub_api_request(:any, app_links['ADD_CARTRIDGE']['relative'], false).with(:body => {:name => 'mock_cart_0'}.to_json).to_return(mock_cartridge_response) }
           it "accepts a string" do
             cart = app_obj.add_cartridge('mock_cart_0')
             cart.should be_an_instance_of RHC::Rest::Cartridge
             cart.name.should == 'mock_cart_0'
           end
           it "accepts an object" do
-            cart = app_obj.add_cartridge(stub(:name => 'mock_cart_0', :url => nil))
+            cart = app_obj.add_cartridge(double(:name => 'mock_cart_0', :url => nil))
             cart.should be_an_instance_of RHC::Rest::Cartridge
             cart.name.should == 'mock_cart_0'
           end
@@ -74,7 +74,7 @@ module RHC
         end        
 
         context "with a URL cart" do
-          before{ stub_api_request(:any, app_links['ADD_CARTRIDGE']['relative']).with(:body => {:url => 'http://foo.com'}.to_json).to_return(mock_cartridge_response(1, true)) }
+          before{ stub_api_request(:any, app_links['ADD_CARTRIDGE']['relative'], false).with(:body => {:url => 'http://foo.com'}.to_json).to_return(mock_cartridge_response(1, true)) }
           it "raises without a param" do
             app_obj.should_receive(:has_param?).with('ADD_CARTRIDGE','url').and_return(false)
             expect{ app_obj.add_cartridge({:url => 'http://foo.com'}) }.to raise_error(RHC::Rest::DownloadingCartridgesNotSupported)
@@ -92,7 +92,7 @@ module RHC
           end
           it "accepts an object" do
             app_obj.should_receive(:has_param?).with('ADD_CARTRIDGE','url').and_return(true)
-            cart = app_obj.add_cartridge(stub(:url => 'http://foo.com'))
+            cart = app_obj.add_cartridge(double(:url => 'http://foo.com'))
             cart.should be_an_instance_of RHC::Rest::Cartridge
             cart.name.should == 'mock_cart_0'
             cart.url.should == 'http://a.url/0'
@@ -119,7 +119,7 @@ module RHC
         context "when the server doesn't return aliases" do
           let(:app_aliases){ nil }
           context "when the client supports LIST_ALIASES" do
-            before{ stub_api_request(:any, app_links['LIST_ALIASES']['relative']).to_return(mock_alias_response(2)) }
+            before{ stub_api_request(:any, app_links['LIST_ALIASES']['relative'], false).to_return(mock_alias_response(2)) }
             it{ app_obj.aliases.first.should be_an_instance_of RHC::Rest::Alias }
             it{ app_obj.aliases.map(&:id).should == ['www.alias0.com', 'www.alias1.com'] }
           end
@@ -132,8 +132,8 @@ module RHC
 
       context "#cartridges" do
         let(:num_carts){ 0 }
-        before(:each) do
-          stub_api_request(:any, app_links['LIST_CARTRIDGES']['relative']).
+        before do
+          stub_api_request(:any, app_links['LIST_CARTRIDGES']['relative'], false).
             to_return(mock_cartridge_response(num_carts))
         end
         context "with carts" do
@@ -170,8 +170,8 @@ module RHC
       end
 
       context "#gear_groups" do
-        before(:each) do
-          stub_api_request(:any, app_links['GET_GEAR_GROUPS']['relative']).
+        before do
+          stub_api_request(:any, app_links['GET_GEAR_GROUPS']['relative'], false).
             to_return(mock_gear_groups_response())
         end
         it "returns a list of all gear groups the current application" do
@@ -197,11 +197,11 @@ module RHC
           @control_output = control_data.has_key?(:result)  ? control_data[:result]      : @control_event
           @with_payload   = control_data.has_key?(:payload) ? control_data[:payload]     : true
           if @with_payload
-            stub_api_request(:any, app_links[@control_link]['relative']).
+            stub_api_request(:any, app_links[@control_link]['relative'], false).
               with(:body => { 'event' => @control_event }). # This is the critical part
               to_return({ :body => { :data => @control_event }.to_json, :status => 200 })
           else
-            stub_api_request(:any, app_links[@control_link]['relative']).
+            stub_api_request(:any, app_links[@control_link]['relative'], false).
               to_return({ :body => { :data => @control_event }.to_json, :status => 200 })
           end
         end

data/spec/rhc/rest_client_spec.rb

@@ -43,6 +43,7 @@ module RHC
       let(:app_0_links)    { mock_response_links(mock_app_links('mock_domain_0', 'mock_app')) }
       let(:user_links)     { mock_response_links(mock_user_links) }
       let(:key_links)      { mock_response_links(mock_key_links) }
+      let(:api_links)      { client_links }
 
       context "#new" do
         before do
@@ -78,9 +79,17 @@ module RHC
         context "when server supports API versions [1.0, 1.1]" do
           before :each do
             stub_api_request(:get, '').
-              to_return({ :body   => { :data => client_links, :supported_api_versions => [1.0, 1.1] }.to_json,
-                          :status => 200
-                        })
+              with(:headers => {'Accept' => 'application/json'}).
+              to_return({ :status => 200, :body => { :data => client_links, :version => '1.0', :supported_api_versions => [1.0, 1.1] }.to_json })
+            stub_api_request(:get, '').
+              with(:headers => {'Accept' => 'application/json;version=1.0'}).
+              to_return({ :status => 200, :body => { :data => client_links, :version => '1.0', :supported_api_versions => [1.0, 1.1] }.to_json })
+            stub_api_request(:get, '').
+              with(:headers => {'Accept' => 'application/json;version=1.1'}).
+              to_return({ :status => 200, :body => { :data => client_links, :version => '1.1', :supported_api_versions => [1.0, 1.1] }.to_json })
+            stub_api_request(:get, '').
+              with(:headers => {'Accept' => /application\/json;version=(1.2|1.3)/}).
+              to_raise(StandardError.new('Bad Version'))
             stub_api_request(:get, 'api_error').
               to_raise(HTTPClient::BadResponseError.new('API Error'))
             stub_api_request(:get, 'other_error').
@@ -118,10 +127,10 @@ module RHC
       end
 
       context "with an instantiated client " do
-        before(:each) do
+        before do
           stub_api_request(:get, '').
             to_return({ :body   => {
-                          :data => client_links,
+                          :data => api_links,
                           :supported_api_versions => [1.0, 1.1]
                         }.to_json,
                         :status => 200
@@ -130,7 +139,7 @@ module RHC
 
         context "#add_domain" do
           before do
-            stub_api_request(:any, client_links['ADD_DOMAIN']['relative']).
+            stub_api_request(:any, api_links['ADD_DOMAIN']['relative']).
               to_return({ :body   => {
                             :type => 'domain',
                             :supported_api_versions => [1.0, 1.1],
@@ -153,7 +162,7 @@ module RHC
 
         context "#domains" do
           before(:each) do
-            stub_api_request(:any, client_links['LIST_DOMAINS']['relative']).
+            stub_api_request(:any, api_links['LIST_DOMAINS']['relative']).
               to_return({ :body   => {
                             :type => 'domains',
                             :data =>
@@ -193,35 +202,105 @@ module RHC
         end
 
         context "#find_domain" do
-          before(:each) do
-            stub_api_request(:any, client_links['LIST_DOMAINS']['relative']).
+          context "when server does not support SHOW_DOMAIN" do 
+            before do
+              stub_api_request(:any, api_links['LIST_DOMAINS']['relative']).
+                to_return({ :body   => {
+                              :type => 'domains',
+                              :data =>
+                              [{ :id    => 'mock_domain_0',
+                                 :links => mock_response_links(mock_domain_links('mock_domain_0')),
+                               },
+                               { :id    => 'mock_domain_1',
+                                 :links => mock_response_links(mock_domain_links('mock_domain_1')),
+                               }]
+                            }.to_json,
+                            :status => 200
+                          })
+            end
+            it "returns a domain object for matching domain IDs" do
+              match = nil
+              expect { match = client.find_domain('mock_domain_0') }.to_not raise_error
+              match.id.should == 'mock_domain_0'
+              match.class.should == RHC::Rest::Domain
+            end
+            it "returns a domain object for matching case-insensitive domain IDs" do
+              match = nil
+              expect { match = client.find_domain('MOCK_DOMAIN_0') }.to_not raise_error
+              match.id.should == 'mock_domain_0'
+              match.class.should == RHC::Rest::Domain
+            end
+            it "raise an error when no matching domain IDs can be found" do
+              expect { client.find_domain('mock_domain_2') }.to raise_error(RHC::Rest::DomainNotFoundException)
+            end
+          end
+
+          context "when server supports SHOW_DOMAIN" do
+            let(:api_links){ client_links.merge!(mock_response_links([['SHOW_DOMAIN', 'domains/:name', 'get']])) }
+            before do 
+              stub_api_request(:any, api_links['SHOW_DOMAIN']['relative'].gsub(/:name/, 'mock_domain_0')).
+                to_return({ :body   => {
+                              :type => 'domain',
+                              :data =>
+                              { :id    => 'mock_domain_0',
+                                 :links => mock_response_links(mock_domain_links('mock_domain_0')),
+                               }
+                            }.to_json,
+                            :status => 200
+                          })
+              stub_api_request(:any, api_links['SHOW_DOMAIN']['relative'].gsub(/:name/, 'mock_domain_%^&')).
+                to_return({ :body   => {
+                              :type => 'domain',
+                              :data =>
+                              { :id    => 'mock_domain_%^&',
+                                 :links => mock_response_links(mock_domain_links('mock_domain_0')),
+                               }
+                            }.to_json,
+                            :status => 200
+                          })                
+              stub_api_request(:any, api_links['SHOW_DOMAIN']['relative'].gsub(/:name/, 'mock_domain_2')).
+                to_return({ :body => {:messages => [{:exit_code => 127}]}.to_json,
+                            :status => 404
+                          })                
+            end
+            it "returns a domain object for matching domain IDs" do
+              match = nil
+              expect { match = client.find_domain('mock_domain_0') }.to_not raise_error
+              match.id.should == 'mock_domain_0'
+              match.class.should == RHC::Rest::Domain
+            end
+            it "encodes special characters" do
+              match = nil
+              expect { match = client.find_domain('mock_domain_%^&') }.to_not raise_error
+              match.id.should == 'mock_domain_%^&'
+              match.class.should == RHC::Rest::Domain
+            end            
+            it "raise an error when no matching domain IDs can be found" do
+              expect { client.find_domain('mock_domain_2') }.to raise_error(RHC::Rest::DomainNotFoundException)
+            end
+          end
+        end
+
+        context "when server supports LIST_DOMAINS_BY_OWNER" do
+          let(:api_links){ client_links.merge!(mock_response_links([['LIST_DOMAINS_BY_OWNER', 'domains', 'get']])) }
+          before do 
+            stub_api_request(:any, "#{api_links['LIST_DOMAINS_BY_OWNER']['relative']}?owner=@self").
               to_return({ :body   => {
                             :type => 'domains',
-                            :data =>
-                            [{ :id    => 'mock_domain_0',
-                               :links => mock_response_links(mock_domain_links('mock_domain_0')),
-                             },
-                             { :id    => 'mock_domain_1',
-                               :links => mock_response_links(mock_domain_links('mock_domain_1')),
-                             }]
+                            :data => [{ 
+                              :id    => 'mock_domain_0',
+                              :links => mock_response_links(mock_domain_links('mock_domain_0')),
+                            }]
                           }.to_json,
                           :status => 200
                         })
           end
-          it "returns a domain object for matching domain IDs" do
+          it "returns owned domains when called" do
             match = nil
-            expect { match = client.find_domain('mock_domain_0') }.to_not raise_error
-            match.id.should == 'mock_domain_0'
-            match.class.should == RHC::Rest::Domain
-          end
-          it "returns a domain object for matching case-insensitive domain IDs" do
-            match = nil
-            expect { match = client.find_domain('MOCK_DOMAIN_0') }.to_not raise_error
-            match.id.should == 'mock_domain_0'
-            match.class.should == RHC::Rest::Domain
-          end
-          it "raise an error when no matching domain IDs can be found" do
-            expect { client.find_domain('mock_domain_2') }.to raise_error(RHC::Rest::DomainNotFoundException)
+            expect { match = client.owned_domains }.to_not raise_error
+            match.length.should == 1
+            match.first.id.should == 'mock_domain_0'
+            match.first.class.should == RHC::Rest::Domain
           end
         end
 
@@ -295,7 +374,7 @@ module RHC
 
         context "#cartridges" do
           before(:each) do
-            stub_api_request(:any, client_links['LIST_CARTRIDGES']['relative']).
+            stub_api_request(:any, api_links['LIST_CARTRIDGES']['relative']).
               to_return({ :body   => {
                             :type => 'cartridges',
                             :data =>
@@ -339,7 +418,7 @@ module RHC
 
         context "#find_cartridges" do
           before(:each) do
-            stub_api_request(:any, client_links['LIST_CARTRIDGES']['relative']).
+            stub_api_request(:any, api_links['LIST_CARTRIDGES']['relative']).
               to_return({ :body   => {
                             :type => 'cartridges',
                             :data =>
@@ -381,7 +460,7 @@ module RHC
 
         context "#user" do
           before(:each) do
-            stub_api_request(:any, client_links['GET_USER']['relative']).
+            stub_api_request(:any, api_links['GET_USER']['relative']).
               to_return({ :body   => {
                             :type => 'user',
                             :data =>
@@ -402,7 +481,7 @@ module RHC
 
         context "#find_key" do
           before(:each) do
-            stub_api_request(:any, client_links['GET_USER']['relative']).
+            stub_api_request(:any, api_links['GET_USER']['relative']).
               to_return({ :body   => {
                             :type => 'user',
                             :data =>
@@ -448,7 +527,7 @@ module RHC
 
         context "#delete_key" do
           before(:each) do
-            stub_api_request(:any, client_links['GET_USER']['relative']).
+            stub_api_request(:any, api_links['GET_USER']['relative']).
               to_return({ :body   => {
                             :type => 'user',
                             :data =>
@@ -496,7 +575,7 @@ module RHC
         before :each do
           stub_api_request(:get, '').
             to_return({ :body   => {
-                          :data => client_links,
+                          :data => api_links,
                           :supported_api_versions => [1.0, 1.1]
                         }.to_json,
                         :status => 200
@@ -538,7 +617,7 @@ module RHC
       end
 
       describe "#supports_sessions?" do
-        before{ subject.should_receive(:api).at_least(2).times.and_return(stub) }
+        before{ subject.should_receive(:api).at_least(2).times.and_return(double) }
         context "with ADD_AUTHORIZATION link" do
           before{ subject.api.should_receive(:supports?).with('ADD_AUTHORIZATION').and_return(true) }
           its(:supports_sessions?){ should be_true }
@@ -566,3 +645,36 @@ module RHC
     end
   end
 end
+
+module RHC
+  module Rest
+    describe HTTPClient do
+    end
+
+    describe WWWAuth::DeferredCredential do
+      subject{ described_class.new(nil, nil) }
+      its(:user){ should be_nil }
+      its(:passwd){ should be_nil }
+
+      context "with a username and password" do
+        subject{ described_class.new(username, password) }
+        let(:username){ 'a_user' }
+        let(:password){ 'a_password' }
+
+        its(:user){ should == username }
+        its(:passwd){ should == password }
+        its(:to_str){ should == ["#{username}:#{password}"].pack('m').tr("\n", '') }
+      end
+
+      context "with a deferred username and password" do
+        subject{ described_class.new(username, password) }
+        let(:username){ lambda{ 'a_user' } }
+        let(:password){ lambda{ 'a_password' } }
+
+        its(:user){ should == username.call }
+        its(:passwd){ should == password.call }
+        its(:to_str){ should == ["#{username.call}:#{password.call}"].pack('m').tr("\n", '') }
+      end      
+    end
+  end
+end

data/spec/rhc/rest_spec.rb

@@ -95,12 +95,12 @@ module RHC
       it{ expect{ invoked_with(false, nil) }.to raise_error(NoMethodError) }
 
       context "with a self signed cert" do
-        it{ invoked_with(false, stub(:current_cert => stub(:issuer => '1', :subject => stub(:cmp => 0)))).should be_false }
+        it{ invoked_with(false, double(:current_cert => double(:issuer => '1', :subject => double(:cmp => 0)))).should be_false }
         after{ subject.send(:self_signed?).should be_true }
       end
 
       context "with an intermediate signed cert" do
-        it{ invoked_with(false, stub(:current_cert => stub(:issuer => '2', :subject => stub(:cmp => 1)), :error => 1, :error_string => 'a')).should be_false }
+        it{ invoked_with(false, double(:current_cert => double(:issuer => '2', :subject => double(:cmp => 1)), :error => 1, :error_string => 'a')).should be_false }
         after{ subject.send(:self_signed?).should be_false }
       end
 
@@ -519,7 +519,7 @@ module RHC
       let(:url){ "http://fake.url" }
       let(:proxy){ nil }
       def response
-        mock(:status => code, :content => json ? RHC::Json.encode(json) : body)
+        double(:status => code, :content => json ? RHC::Json.encode(json) : body)
       end
       let(:method) { lambda{ subject.send(:handle_error!, response, url, client) } }
 

data/spec/rhc/wizard_spec.rb

@@ -103,9 +103,9 @@ describe RHC::Wizard do
   describe "#login_stage" do
     let(:user){ 'test_user' }
     let(:password){ 'test pass' }
-    let(:rest_client){ stub }
+    let(:rest_client){ double }
     let(:auth){ subject.send(:auth) }
-    let(:user_obj){ stub(:login => user) }
+    let(:user_obj){ double(:login => user) }
 
     subject{ described_class.new(config, options) }
 
@@ -185,8 +185,8 @@ describe RHC::Wizard do
 
       context "when the config has enabled tokens" do
         let(:default_options){ {:rhlogin => user, :password => password, :server => server, :use_authorization_tokens => true} }
-        let(:store){ mock }
-        before{ RHC::Auth::TokenStore.should_receive(:new).any_number_of_times.and_return(store) }
+        let(:store){ double }
+        before{ RHC::Auth::TokenStore.stub(:new).and_return(store) }
         before{ expect_client_test(true) }
 
         it "should check for an existing token" do
@@ -203,9 +203,9 @@ describe RHC::Wizard do
       context "with a server that supports tokens" do
         before{ expect_client_test(true) }
         let(:token){ 'a_test_value' }
-        let(:auth_token){ mock(:token => token, :expires_in_seconds => 100) }
-        let(:store){ mock }
-        before{ RHC::Auth::TokenStore.should_receive(:new).any_number_of_times.and_return(store) }
+        let(:auth_token){ double(:token => token, :expires_in_seconds => 100) }
+        let(:store){ double }
+        before{ RHC::Auth::TokenStore.stub(:new).and_return(store) }
 
         it "should not generate a token if the user does not request it" do
           store.should_not_receive(:get)
@@ -273,11 +273,11 @@ describe RHC::Wizard do
 
     context "with no settings" do
       before do
-        stub_api
-        stub_user
+        stub_api(false)
+        challenge{ stub_user }
         stub_no_keys
-        stub_no_domains
-        stub_simple_carts
+        challenge{ stub_no_domains }
+        stub_simple_carts(false)
       end
 
       it "should execute the minimal path" do
@@ -415,8 +415,8 @@ describe RHC::Wizard do
       subject{ RHC::RerunWizard.new(config, options) }
 
       before do
-        stub_api(:user => username)
-        stub_user
+        stub_api false
+        challenge{ stub_user }
         stub_no_keys
         stub_add_key
         stub_api_request(:post, 'broker/rest/domains', user_auth).
@@ -427,7 +427,7 @@ describe RHC::Wizard do
               :messages => [{:field => 'id', :severity => 'ERROR', :text => 'Too long', :exit_code => 123}]
             }.to_json
           })
-        stub_one_domain('testnamespace')
+        challenge{ stub_one_domain('testnamespace') }
         stub_one_application('testnamespace', 'test1')
         stub_simple_carts
       end
@@ -464,8 +464,8 @@ describe RHC::Wizard do
       subject{ RHC::SSHWizard.new(rest_client, config, options) }
 
       before do
-        stub_api(user_auth)
-        stub_user
+        stub_api false
+        challenge{ stub_user }
       end
 
       context "with no server keys" do
@@ -517,7 +517,7 @@ describe RHC::Wizard do
       it "should cause upload_ssh_key to catch NoMethodError and call the fallback to get the fingerprint" do
         Net::SSH::KeyFactory.should_receive(:load_public_key).exactly(5).times.and_raise(NoMethodError)
         wizard.stub(:ssh_keys).at_least(1).times.and_return(wizard.get_mock_key_data)
-        wizard.should_receive(:ssh_keygen_fallback).exactly(5).times.and_return(stub(:name => 'default', :fingerprint => 'AA:BB:CC:DD:EE:FF', :type => 'ssh-rsa' ))
+        wizard.should_receive(:ssh_keygen_fallback).exactly(5).times.and_return(double(:name => 'default', :fingerprint => 'AA:BB:CC:DD:EE:FF', :type => 'ssh-rsa' ))
 
         input_line 'y'
 
@@ -580,7 +580,7 @@ describe RHC::Wizard do
           wizard.ssh_keys = key_data
           wizard.stub(:ssh_key_triple_for_default_key) { pub_key.chomp.split }
           wizard.stub(:fingerprint_for_default_key) { "" } # this value is irrelevant
-          wizard.rest_client = stub('RestClient').tap{ |o| o.stub(:find_key) { key_data.detect { |k| k.name == key_name } } }
+          wizard.rest_client = double('RestClient').tap{ |o| o.stub(:find_key) { key_data.detect { |k| k.name == key_name } } }
 
           wizard.send(:upload_ssh_key, key_name)
           output = last_output
@@ -596,7 +596,7 @@ describe RHC::Wizard do
           wizard.ssh_keys = key_data
           wizard.stub(:ssh_key_triple_for_default_key) { pub_key.chomp.split }
           wizard.stub(:fingerprint_for_default_key) { "" } # this value is irrelevant
-          wizard.rest_client = stub('RestClient').tap{ |o| o.stub(:add_key) { true } }
+          wizard.rest_client = double('RestClient').tap{ |o| o.stub(:add_key) { true } }
 
           wizard.send(:upload_ssh_key, "other")
           output = last_output
@@ -748,7 +748,7 @@ end
 
 describe RHC::DomainWizard do
   context "with a rest client" do
-    let(:rest_client){ stub }
+    let(:rest_client){ double }
     it{ described_class.new(nil, nil, rest_client).rest_client.should == rest_client }
     it{ subject.stages == [:config_namespace_stage] }
     it{ expect{ described_class.new(nil, nil, rest_client).send(:config_namespace, '') }.to call(:add_domain).on(rest_client).and_stop }