rhc 0.97.17 → 0.98.16

data/spec/rhc/common_spec.rb

@@ -31,7 +31,7 @@ describe RHC do
                       :status => 200
                     })
         stub_request(:any, mock_href(domain_links['ADD_APPLICATION']['relative'], true)).
-          to_raise(Rhc::Rest::ServerErrorException.new("Mock server error"))
+          to_raise(RHC::Rest::ServerErrorException.new("Mock server error"))
         RHC.stub!(:print_response_err) { |output| @test_output = output; exit 1 }
       end
       it "posts an error message if the Rest API encounters a server error" do

data/spec/rhc/config_spec.rb

@@ -15,6 +15,12 @@ describe RHC::Config do
     FakeFS.deactivate!
   end
 
+  describe "class" do
+    subject{ RHC::Config }
+    it("should raise when foo is invoked") { expect{ RHC::Config.method_missing(:foo) }.to raise_error(NoMethodError) }
+    it("should invoke a method on default") { RHC::Config.username.should be RHC::Config.default.username }
+  end
+
   context "Config default values with no files" do
     before(:each) do
       RHC::Config.initialize
@@ -26,10 +32,6 @@ describe RHC::Config do
       RHC::Config.has_opts_config?.should be_false
     end
 
-    it "should suggest I run the wizard" do
-      RHC::Config.should_run_wizard?.should be_true
-    end
-
     it "should return openshift.redhat.com for the server" do
       RHC::Config['libra_server'].should == "openshift.redhat.com"
       RHC::Config.default_rhlogin.should be_nil

data/spec/rhc/helpers_spec.rb

@@ -154,27 +154,6 @@ describe RHC::Helpers do
     end
   end
 
-  context "Rest Client helper" do
-    before do
-      FakeFS.activate!
-      Rhc::Rest::Client.stub!(:new) { |openshift_rest_node, username, password, debug| @username = username; @password = password; nil}
-    end
-
-    it "should ask for username" do
-      $terminal.write_line("testuser@foo.bar")
-      $terminal.write_line("password")
-      @tests.rest_client
-      @username.should == "testuser@foo.bar"
-      @tests.config["default_rhlogin"].should == @username
-      @password.should == "password"
-    end
-
-    after do
-      FakeFS::FileSystem.clear
-      FakeFS.deactivate!
-    end
-  end
-
   class HelperTests
     include RHC::Helpers
     include RHC::SSHKeyHelpers

data/spec/rhc/rest_application_spec.rb

@@ -1,23 +1,23 @@
 require 'spec_helper'
 require 'rest_spec_helper'
-require 'rhc-rest/client'
 require 'base64'
 
 Spec::Runner.configure do |configuration|
   include(RestSpecHelper)
 end
 
-module Rhc
+module RHC
   module Rest
     describe Application do
       # make sure auth is set up for the Application object since we are not
       # calling it from RHC::Rest::Client
-      credentials = Base64.encode64("#{mock_user}:#{mock_pass}")
+      credentials = Base64.strict_encode64("#{mock_user}:#{mock_pass}")
       @@headers["Authorization"] = "Basic #{credentials}"
+      @@headers["User-Agent"] = RHC::Helpers.user_agent
 
       let (:app_links) { mock_response_links(mock_app_links('mock_domain','mock_app')) }
       let (:app_obj) {
-        Rhc::Rest::Application.new({ 'domain_id'       => 'mock_domain',
+        RHC::Rest::Application.new({ 'domain_id'       => 'mock_domain',
                                      'name'            => 'mock_app',
                                      'creation_time'   => Time.now.to_s,
                                      'uuid'            => 1234,
@@ -29,7 +29,7 @@ module Rhc
       context "#new" do
         it "returns an application object" do
           app = app_obj
-          app.should be_an_instance_of Rhc::Rest::Application
+          app.should be_an_instance_of RHC::Rest::Application
           app.instance_variable_get(:@links).length.should equal(app_links.length)
         end
       end
@@ -42,7 +42,7 @@ module Rhc
         it "returns a new cartridge object" do
           app  = app_obj
           cart = app.add_cartridge('mock_cart_0')
-          cart.should be_an_instance_of Rhc::Rest::Cartridge
+          cart.should be_an_instance_of RHC::Rest::Cartridge
           cart.instance_variable_get(:@name).should == 'mock_cart_0'
         end
       end
@@ -58,7 +58,7 @@ module Rhc
           carts = app.cartridges
           carts.length.should equal(2)
           (0..1).each do |idx|
-            carts[idx].should be_an_instance_of Rhc::Rest::Cartridge
+            carts[idx].should be_an_instance_of RHC::Rest::Cartridge
             carts[idx].instance_variable_get(:@name).should == "mock_cart_#{idx}"
           end
         end

data/spec/rhc/rest_client_spec.rb

@@ -2,7 +2,7 @@ require 'base64'
 require 'spec_helper'
 require 'stringio'
 require 'rest_spec_helper'
-require 'rhc-rest/client'
+require 'rhc/rest/client'
 
 Spec::Runner.configure do |configuration|
   include(RestSpecHelper)
@@ -10,7 +10,7 @@ end
 
 # This object is used in a few cases where we need to inspect
 # the logged output.
-class MockClient < Rhc::Rest::Client
+class MockClient < RHC::Rest::Client
   def logger
     Logger.new((@output = StringIO.new))
   end
@@ -22,13 +22,14 @@ class MockClient < Rhc::Rest::Client
   end
 end
 
-module Rhc
+module RHC
   module Rest
     describe Client do
       let(:client_links)   { mock_response_links(mock_client_links) }
       let(:domain_0_links) { mock_response_links(mock_domain_links('mock_domain_0')) }
       let(:domain_1_links) { mock_response_links(mock_domain_links('mock_domain_1')) }
       let(:user_links)     { mock_response_links(mock_user_links) }
+      let(:key_links)      { mock_response_links(mock_key_links) }
 
       context "#new" do
         before do
@@ -43,17 +44,22 @@ module Rhc
         end
 
         it "returns a client object from the required arguments" do
-          credentials = Base64.encode64(mock_user + ":" + mock_pass)
-          client      = Rhc::Rest::Client.new(mock_href, mock_user, mock_pass)
+          credentials = Base64.strict_encode64(mock_user + ":" + mock_pass)
+          client      = RHC::Rest::Client.new(mock_href, mock_user, mock_pass)
           @@headers['Authorization'].should == "Basic #{credentials}"
           client.instance_variable_get(:@links).should == client_links
         end
-        it "logs an error message if the API cannot be connected" do
-          client = MockClient.new(mock_href('api_error'), mock_user, mock_pass)
-          client.logged.should =~ /API Error$/
+        it "does not add newlines to username and password > 60 characters" do
+          username = "a" * 45
+          password = "p" * 45
+          client   = RHC::Rest::Client.new(mock_href, mock_user, mock_pass)
+          @@headers['Authorization'].should_not match("\n")
+        end
+        it "raises an error message if the API cannot be connected" do
+          expect { MockClient.new(mock_href('api_error'), mock_user, mock_pass) }.should raise_error
         end
         it "raises a generic error for any other error condition" do
-          lambda{ Rhc::Rest::Client.new(mock_href('other_error'), mock_user, mock_pass) }.
+          lambda{ RHC::Rest::Client.new(mock_href('other_error'), mock_user, mock_pass) }.
             should raise_error("Resource could not be accessed:Other Error")
         end
       end
@@ -64,7 +70,7 @@ module Rhc
             to_return({ :body   => { :data => client_links }.to_json,
                         :status => 200
                       })
-          @client = Rhc::Rest::Client.new(mock_href, mock_user, mock_pass)
+          @client = RHC::Rest::Client.new(mock_href, mock_user, mock_pass)
         end
 
         context "#add_domain" do
@@ -82,7 +88,7 @@ module Rhc
           end
           it "returns a domain object" do
             domain = @client.add_domain('mock_domain')
-            domain.class.should                          == Rhc::Rest::Domain
+            domain.class.should                          == RHC::Rest::Domain
             domain.instance_variable_get(:@id).should    == 'mock_domain'
             domain.instance_variable_get(:@links).should ==
               mock_response_links(mock_domain_links('mock_domain'))
@@ -115,7 +121,7 @@ module Rhc
             domains = @client.domains
             domains.length.should equal(2)
             (0..1).each do |idx|
-              domains[idx].class.should                          == Rhc::Rest::Domain
+              domains[idx].class.should                          == RHC::Rest::Domain
               domains[idx].instance_variable_get(:@id).should    == "mock_domain_#{idx}"
               domains[idx].instance_variable_get(:@links).should ==
                 mock_response_links(mock_domain_links("mock_domain_#{idx}"))
@@ -150,7 +156,7 @@ module Rhc
             expect { match = @client.find_domain('mock_domain_0') }.should_not raise_error
 
             match.id.should == 'mock_domain_0'
-            match.class.should == Rhc::Rest::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') }.should raise_error(RHC::DomainNotFoundException)
@@ -207,7 +213,7 @@ module Rhc
             domain = @client.domains[0]
             domain.applications.each do |app|
               match = domain.find_application(app.name)
-              match.class.should                              == Rhc::Rest::Application
+              match.class.should                              == RHC::Rest::Application
               match.instance_variable_get(:@name).should      == 'mock_app'
               match.instance_variable_get(:@domain_id).should == "#{domain.id}"
               match.instance_variable_get(:@links).should     ==
@@ -247,12 +253,12 @@ module Rhc
             carts = @client.cartridges
             carts.length.should equal(2)
             (0..1).each do |idx|
-              carts[idx].class.should                          == Rhc::Rest::Cartridge
+              carts[idx].class.should                          == RHC::Rest::Cartridge
               carts[idx].instance_variable_get(:@name).should  == "mock_cart_#{idx}"
               carts[idx].instance_variable_get(:@type).should  == "mock_cart_#{idx}_type"
               carts[idx].instance_variable_get(:@links).should ==
                 mock_response_links(mock_cart_links("mock_cart_#{idx}"))
-            end          
+            end
           end
           it "returns an empty list when no cartridges exist" do
             # Disregard the first response; this is for the previous expectiation.
@@ -261,8 +267,8 @@ module Rhc
             carts.length.should equal(0)
           end
         end
-        
-        context "#find_cartridge" do
+
+        context "#find_cartridges" do
           before(:each) do
             stub_api_request(:any, client_links['LIST_CARTRIDGES']['relative']).
               to_return({ :body   => {
@@ -275,24 +281,33 @@ module Rhc
                              { :name  => 'mock_cart_1',
                                :type  => 'mock_cart_1_type',
                                :links => mock_response_links(mock_cart_links('mock_cart_1')),
-                             }]
+                             },
+                             { :name  => 'mock_nomatch_cart_0',
+                               :type  => 'mock_nomatch_cart_0_type',
+                               :links => mock_response_links(mock_cart_links('mock_nomatch_cart_0')),
+                             }
+                            ]
                           }.to_json,
                           :status => 200
                         })
           end
           it "returns a list of cartridge objects for matching cartridges" do
-            matches = @client.find_cartridge('mock_cart_0')
+            matches = @client.find_cartridges('mock_cart_0')
             matches.length.should equal(1)
-            matches[0].class.should                          == Rhc::Rest::Cartridge
+            matches[0].class.should                          == RHC::Rest::Cartridge
             matches[0].instance_variable_get(:@name).should  == 'mock_cart_0'
             matches[0].instance_variable_get(:@type).should  == 'mock_cart_0_type'
             matches[0].instance_variable_get(:@links).should ==
               mock_response_links(mock_cart_links('mock_cart_0'))
           end
           it "returns an empty list when no matching cartridges can be found" do
-            matches = @client.find_cartridge('no_match')
+            matches = @client.find_cartridges('no_match')
             matches.length.should equal(0)
           end
+          it "returns multiple cartridge matches" do
+            matches = @client.find_cartridges :regex => "mock_cart_[0-9]"
+            matches.length.should equal(2)
+          end
         end
 
         context "#user" do
@@ -310,7 +325,7 @@ module Rhc
           end
           it "returns the user object associated with this client connection" do
             user = @client.user
-            user.class.should                           == Rhc::Rest::User
+            user.class.should                           == RHC::Rest::User
             user.instance_variable_get(:@login).should  == mock_user
             user.instance_variable_get(:@links).should  == mock_response_links(mock_user_links)
           end
@@ -350,7 +365,7 @@ module Rhc
             key = nil
             expect { key = @client.find_key('mock_key_0') }.should_not raise_error
 
-            key.class.should                            == Rhc::Rest::Key
+            key.class.should                            == RHC::Rest::Key
             key.instance_variable_get(:@name).should    == 'mock_key_0'
             key.instance_variable_get(:@type).should    == 'mock_key_0_type'
             key.instance_variable_get(:@content).should == '123456789:0'
@@ -388,6 +403,54 @@ module Rhc
           end
         end
 
+        context "#delete_key" do
+          before(:each) do
+            stub_api_request(:any, client_links['GET_USER']['relative']).
+              to_return({ :body   => {
+                            :type => 'user',
+                            :data =>
+                            { :login => mock_user,
+                              :links => mock_response_links(mock_user_links)
+                            }
+                          }.to_json,
+                          :status => 200
+                        })
+            stub_api_request(:any, user_links['LIST_KEYS']['relative']).
+              to_return({ :body   => {
+                            :type => 'keys',
+                            :data =>
+                            [{ :name    => 'mock_key_0',
+                               :type    => 'mock_key_0_type',
+                               :content => '123456789:0',
+                               :links   => mock_response_links(mock_key_links('mock_key_0'))
+                             },
+                             { :name    => 'mock_key_1',
+                               :type    => 'mock_key_1_type',
+                               :content => '123456789:1',
+                               :links   => mock_response_links(mock_key_links('mock_key_1'))
+                             }]
+                          }.to_json,
+                          :status => 200
+                        })
+
+            stub_api_request(:post, key_links['DELETE']['relative']).
+              to_return({ :body   => {}.to_json,
+                          :status => 200
+                        })
+
+            @client = MockClient.new(mock_href, mock_user, mock_pass)
+          end
+          
+          it "should delete keys" do
+            expect { @client.delete_key('mock_key_0') }.should be_true
+          end
+          
+          it 'raises an error if nonexistent key is requested' do
+            expect { @client.find_key('no_match') }.
+              should raise_error(RHC::KeyNotFoundException)
+          end
+        end
+        
         context "#logout" do
           let(:logout_method) { :logout }
           it_should_behave_like "a logout method"

data/spec/rhc/rest_spec.rb

@@ -1,14 +1,14 @@
 require 'spec_helper'
 require 'rest_spec_helper'
-require 'rhc-rest'
+require 'rhc/rest'
 
 Spec::Runner.configure do |configuration|
   include(RestSpecHelper)
 end
 
-# We have to make an object to test the Rhc::Rest module
-class RhcRest
-  include Rhc::Rest
+# We have to make an object to test the RHC::Rest module
+class RHCRest
+  include RHC::Rest
 end
 
 module MockRestResponse
@@ -20,11 +20,11 @@ module MockRestResponse
   end
 end
 
-module Rhc
+module RHC
   include RestSpecHelper
 
   describe Rest do
-    subject{ RhcRest.new }
+    subject{ RHCRest.new }
 
     # logger function
     describe "#logger" do
@@ -56,7 +56,7 @@ module Rhc
           }}
         it "deserializes to an application" do
           json_response = { :type => 'application', :data => object }.to_json
-          app_obj       = Rhc::Rest::Application.new(object)
+          app_obj       = RHC::Rest::Application.new(object)
           subject.parse_response(json_response).should have_same_attributes_as(app_obj)
         end
       end
@@ -81,8 +81,8 @@ module Rhc
         }
         it "deserializes to a list of applications" do
           json_response = { :type => 'applications', :data => object }.to_json
-          app_obj_1     = Rhc::Rest::Application.new(object[0])
-          app_obj_2     = Rhc::Rest::Application.new(object[1])
+          app_obj_1     = RHC::Rest::Application.new(object[0])
+          app_obj_2     = RHC::Rest::Application.new(object[1])
           subject.parse_response(json_response).length.should equal(2)
           subject.parse_response(json_response)[0].should have_same_attributes_as(app_obj_1)
           subject.parse_response(json_response)[1].should have_same_attributes_as(app_obj_2)
@@ -98,7 +98,7 @@ module Rhc
 
         it "deserializes to a cartridge" do
           json_response = { :type => 'cartridge', :data => object }.to_json
-          cart_obj      = Rhc::Rest::Cartridge.new(object)
+          cart_obj      = RHC::Rest::Cartridge.new(object)
           subject.parse_response(json_response).should have_same_attributes_as(cart_obj)
         end
       end
@@ -116,8 +116,8 @@ module Rhc
 
         it "deserializes to a list of cartridges" do
           json_response = { :type => 'cartridges', :data => object }.to_json
-          cart_obj_1    = Rhc::Rest::Cartridge.new(object[0])
-          cart_obj_2    = Rhc::Rest::Cartridge.new(object[1])
+          cart_obj_1    = RHC::Rest::Cartridge.new(object[0])
+          cart_obj_2    = RHC::Rest::Cartridge.new(object[1])
           subject.parse_response(json_response).length.should equal(2)
           subject.parse_response(json_response)[0].should have_same_attributes_as(cart_obj_1)
           subject.parse_response(json_response)[1].should have_same_attributes_as(cart_obj_2)
@@ -132,7 +132,7 @@ module Rhc
 
         it "deserializes to a domain" do
           json_response = { :type => 'domain', :data => object }.to_json
-          dom_obj       = Rhc::Rest::Domain.new(object)
+          dom_obj       = RHC::Rest::Domain.new(object)
           subject.parse_response(json_response).should have_same_attributes_as(dom_obj)
         end
       end
@@ -148,8 +148,8 @@ module Rhc
 
         it "deserializes to a list of domains" do
           json_response = { :type => 'domains', :data => object }.to_json
-          dom_obj_1     = Rhc::Rest::Domain.new(object[0])
-          dom_obj_2     = Rhc::Rest::Domain.new(object[1])
+          dom_obj_1     = RHC::Rest::Domain.new(object[0])
+          dom_obj_2     = RHC::Rest::Domain.new(object[1])
           subject.parse_response(json_response).length.should equal(2)
           subject.parse_response(json_response)[0].should have_same_attributes_as(dom_obj_1)
           subject.parse_response(json_response)[1].should have_same_attributes_as(dom_obj_2)
@@ -166,7 +166,7 @@ module Rhc
 
         it "deserializes to a key" do
           json_response = { :type => 'key', :data => object }.to_json
-          key_obj       = Rhc::Rest::Key.new(object)
+          key_obj       = RHC::Rest::Key.new(object)
           subject.parse_response(json_response).should have_same_attributes_as(key_obj)
         end
       end
@@ -186,8 +186,8 @@ module Rhc
 
         it "deserializes to a list of keys" do
           json_response = { :type => 'keys', :data => object }.to_json
-          key_obj_1     = Rhc::Rest::Key.new(object[0])
-          key_obj_2     = Rhc::Rest::Key.new(object[1])
+          key_obj_1     = RHC::Rest::Key.new(object[0])
+          key_obj_2     = RHC::Rest::Key.new(object[1])
           subject.parse_response(json_response).length.should equal(2)
           subject.parse_response(json_response)[0].should have_same_attributes_as(key_obj_1)
           subject.parse_response(json_response)[1].should have_same_attributes_as(key_obj_2)
@@ -202,7 +202,7 @@ module Rhc
 
         it "deserializes to a user" do
           json_response = { :type => 'user', :data => object }.to_json
-          user_obj      = Rhc::Rest::User.new(object)
+          user_obj      = RHC::Rest::User.new(object)
           subject.parse_response(json_response).should have_same_attributes_as(user_obj)
         end
       end
@@ -227,7 +227,7 @@ module Rhc
         end
 
         it "sends the response to be deserialized" do
-          dom_obj = Rhc::Rest::Domain.new(object)
+          dom_obj = RHC::Rest::Domain.new(object)
           request = RestClient::Request.new(:url     => mock_href,
                                             :method  => 'get',
                                             :headers => { :accept => :json },
@@ -252,7 +252,7 @@ module Rhc
                                             :method  => 'get',
                                             :headers => {:accept => :json}
                                             )
-          lambda { subject.request(request) }.should raise_error(Rhc::Rest::ResourceAccessException, 'Failed to access resource: unexpected nil')
+          lambda { subject.request(request) }.should raise_error(RHC::Rest::ResourceAccessException, 'Failed to access resource: unexpected nil')
         end
       end
 
@@ -283,7 +283,7 @@ module Rhc
                                             :method  => 'get',
                                             :headers => {:accept => :json}
                                             )
-          lambda { subject.request(request) }.should raise_error(Rhc::Rest::TimeoutException, "Connection to server timed out. It is possible the operation finished without being able to report success. Use 'rhc domain show' or 'rhc app status' to check the status of your applications.")
+          lambda { subject.request(request) }.should raise_error(RHC::Rest::TimeoutException, "Connection to server timed out. It is possible the operation finished without being able to report success. Use 'rhc domain show' or 'rhc app status' to check the status of your applications.")
         end
       end
 
@@ -296,7 +296,7 @@ module Rhc
                                             :method  => 'get',
                                             :headers => {:accept => :json}
                                             )
-          lambda { subject.request(request) }.should raise_error(Rhc::Rest::ConnectionException, 'Connection to server got interrupted: Lost Server Connection')
+          lambda { subject.request(request) }.should raise_error(RHC::Rest::ConnectionException, 'Connection to server got interrupted: Lost Server Connection')
         end
       end
 
@@ -309,7 +309,7 @@ module Rhc
                                             :method  => 'get',
                                             :headers => {:accept => :json}
                                             )
-          lambda { subject.request(request) }.should raise_error(Rhc::Rest::ResourceAccessException, 'Failed to access resource: Unverified SSL Certificate')
+          lambda { subject.request(request) }.should raise_error(RHC::Rest::ResourceAccessException, 'Failed to access resource: Unverified SSL Certificate')
         end
       end
 
@@ -323,7 +323,7 @@ module Rhc
                                             :method  => 'get',
                                             :headers => {:accept => :json}
                                             )
-          lambda { subject.request(request) }.should raise_error(Rhc::Rest::ResourceAccessException, 'Failed to access resource: Generic Error')
+          lambda { subject.request(request) }.should raise_error(RHC::Rest::ResourceAccessException, 'Failed to access resource: Generic Error')
         end
       end
 
@@ -342,7 +342,7 @@ module Rhc
                                             :method  => 'get',
                                             :headers => {:accept => :json}
                                             )
-          lambda { subject.request(request) }.should raise_error(Rhc::Rest::UnAuthorizedException, 'Not authenticated')
+          lambda { subject.request(request) }.should raise_error(RHC::Rest::UnAuthorizedException, 'Not authenticated')
         end
       end
     end
@@ -355,7 +355,7 @@ module Rhc
           json_data = RHC::Json.encode(mock_resp)
           json_data.extend(MockRestResponse)
           json_data.set_code(400)
-          lambda { subject.process_error_response(json_data) }.should raise_error(Rhc::Rest::ClientErrorException, 'mock error message')
+          lambda { subject.process_error_response(json_data) }.should raise_error(RHC::Rest::ClientErrorException, 'mock error message')
         end
       end
 
@@ -365,7 +365,7 @@ module Rhc
           json_data.extend(MockRestResponse)
           json_data.set_code(401)
 
-          lambda { subject.process_error_response(json_data) }.should raise_error(Rhc::Rest::UnAuthorizedException, 'Not authenticated')
+          lambda { subject.process_error_response(json_data) }.should raise_error(RHC::Rest::UnAuthorizedException, 'Not authenticated')
         end
       end
 
@@ -375,7 +375,7 @@ module Rhc
           json_data  = RHC::Json.encode(mock_resp)
           json_data.extend(MockRestResponse)
           json_data.set_code(403)
-          lambda { subject.process_error_response(json_data) }.should raise_error(Rhc::Rest::RequestDeniedException, 'mock error message')
+          lambda { subject.process_error_response(json_data) }.should raise_error(RHC::Rest::RequestDeniedException, 'mock error message')
         end
       end
 
@@ -385,7 +385,7 @@ module Rhc
           json_data  = RHC::Json.encode(mock_resp)
           json_data.extend(MockRestResponse)
           json_data.set_code(404)
-          lambda { subject.process_error_response(json_data) }.should raise_error(Rhc::Rest::ResourceNotFoundException, 'mock error message')
+          lambda { subject.process_error_response(json_data) }.should raise_error(RHC::Rest::ResourceNotFoundException, 'mock error message')
         end
       end
 
@@ -395,7 +395,7 @@ module Rhc
           json_data  = RHC::Json.encode(mock_resp)
           json_data.extend(MockRestResponse)
           json_data.set_code(409)
-          lambda { subject.process_error_response(json_data) }.should raise_error(Rhc::Rest::ValidationException, 'mock error message')
+          lambda { subject.process_error_response(json_data) }.should raise_error(RHC::Rest::ValidationException, 'mock error message')
         end
       end
 
@@ -405,7 +405,7 @@ module Rhc
           json_data  = RHC::Json.encode(mock_resp)
           json_data.extend(MockRestResponse)
           json_data.set_code(422)
-          lambda { subject.process_error_response(json_data) }.should raise_error(Rhc::Rest::ValidationException, 'mock error message')
+          lambda { subject.process_error_response(json_data) }.should raise_error(RHC::Rest::ValidationException, 'mock error message')
         end
       end
 
@@ -416,7 +416,7 @@ module Rhc
           json_data  = RHC::Json.encode(mock_resp)
           json_data.extend(MockRestResponse)
           json_data.set_code(422)
-          lambda { subject.process_error_response(json_data) }.should raise_error(Rhc::Rest::ValidationException, 'mock error message 1 mock error message 2')
+          lambda { subject.process_error_response(json_data) }.should raise_error(RHC::Rest::ValidationException, 'mock error message 1 mock error message 2')
         end
       end
 
@@ -426,7 +426,7 @@ module Rhc
           json_data  = RHC::Json.encode(mock_resp)
           json_data.extend(MockRestResponse)
           json_data.set_code(500)
-          lambda { subject.process_error_response(json_data) }.should raise_error(Rhc::Rest::ServerErrorException, 'mock error message')
+          lambda { subject.process_error_response(json_data) }.should raise_error(RHC::Rest::ServerErrorException, 'mock error message')
         end
       end
 
@@ -436,7 +436,7 @@ module Rhc
           json_data  = RHC::Json.encode(mock_resp)
           json_data.extend(MockRestResponse)
           json_data.set_code(503)
-          lambda { subject.process_error_response(json_data) }.should raise_error(Rhc::Rest::ServiceUnavailableException, 'mock error message')
+          lambda { subject.process_error_response(json_data) }.should raise_error(RHC::Rest::ServiceUnavailableException, 'mock error message')
         end
       end
 
@@ -446,7 +446,7 @@ module Rhc
           json_data  = RHC::Json.encode(mock_resp)
           json_data.extend(MockRestResponse)
           json_data.set_code(999)
-          lambda { subject.process_error_response(json_data) }.should raise_error(Rhc::Rest::ResourceAccessException, 'Server returned error code with no output: 999')
+          lambda { subject.process_error_response(json_data) }.should raise_error(RHC::Rest::ResourceAccessException, 'Server returned error code with no output: 999')
         end
       end
     end