rhc 1.6.8 → 1.7.8

data/spec/rhc/commands/sshkey_spec.rb

@@ -13,7 +13,7 @@ describe RHC::Commands::Sshkey do
     context "when run with list command" do
       let(:arguments) { %w[sshkey list --noprompt --config test.conf -l test@test.foo -p  password --trace] }
 
-      it { expect { run }.should exit_with_code(0) }
+      it { expect { run }.to exit_with_code(0) }
       it { run_output.should match(/mockkey1 \(type: ssh-rsa\)/) }
     end
   end
@@ -22,7 +22,7 @@ describe RHC::Commands::Sshkey do
     context "when run with show command" do
       let(:arguments) { %w[sshkey show mockkey1 --noprompt --config test.conf -l test@test.foo -p  password --trace] }
 
-      it { expect { run }.should exit_with_code(0) }
+      it { expect { run }.to exit_with_code(0) }
       it { run_output.should match(/mockkey1 \(type: ssh-rsa\)/) }
     end
   end
@@ -38,7 +38,7 @@ describe RHC::Commands::Sshkey do
           File.open('id_rsa.pub', 'w') do |f|
             f << 'ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCnCOqK7/mmvZ9AtCAerxjAasJ1rSpfuWT4vNm1+O/Fh0Di3chTWjY9a0M2hEnqkqnVG589L9CqCUeT0kdc3Vgw3JEcacSUr1z7tLr9kO+p/D5lSdQYzDGGRFOZ0H6lc/y8iNxWV1VO/sJvKx6cr5zvKIn8Q6GvhVNOxlai0IOb9FJxLGK95GLpZ+elzh8Tc9giy7KfwheAwhV2JoF9uRltE5JP/CNs7w/E29i1Z+jlueuu8RVotLmhSVNJm91Ey7OCtoI1iBE0Wv/SucFe32Qi08RWTM/MaGGz93KQNOVRGjNkosJjPmP1qU6WGBfliDkJAZXB0b6sEcnx1fbVikwZ'
           end
-          expect { run }.should exit_with_code(0)
+          expect { run }.to exit_with_code(0)
           rest_client.sshkeys.length.should == num_keys + 1
         end
       end
@@ -54,7 +54,7 @@ describe RHC::Commands::Sshkey do
           File.open('id_rsa.pub', 'w') do |f|
             f << 'ssh-rsa AADAQABAAABAQCnCOqK7/mmvZ9AtCAerxjAasJ1rSpfuWT4vNm1+O/Fh0Di3chTWjY9a0M2hEnqkqnVG589L9CqCUeT0kdc3Vgw3JEcacSUr1z7tLr9kO+p/D5lSdQYzDGGRFOZ0H6lc/y8iNxWV1VO/sJvKx6cr5zvKIn8Q6GvhVNOxlai0IOb9FJxLGK95GLpZ+elzh8Tc9giy7KfwheAwhV2JoF9uRltE5JP/CNs7w/E29i1Z+jlueuu8RVotLmhSVNJm91Ey7OCtoI1iBE0Wv/SucFe32Qi08RWTM/MaGGz93KQNOVRGjNkosJjPmP1qU6WGBfliDkJAZXB0b6sEcnx1fbVikwZ'
           end
-          expect { run }.should exit_with_code(128)
+          expect { run }.to exit_with_code(128)
           expect { run_output.should match(/Name:.* mockkey/) }
           rest_client.sshkeys.length.should == num_keys
         end
@@ -67,7 +67,7 @@ describe RHC::Commands::Sshkey do
           File.open('id_rsa.pub', 'w') do |f|
             f << ''
           end
-          expect { run }.should exit_with_code(128)
+          expect { run }.to exit_with_code(128)
           expect { run_output.should match(/Name:.* mockkey/) }
           rest_client.sshkeys.length.should == num_keys
         end
@@ -75,7 +75,7 @@ describe RHC::Commands::Sshkey do
 
       it "exits with status code Errno::EACCES::Errno" do
         IO.should_receive(:read).and_return("ssh_foo bar")
-        expect { run }.should exit_with_code(128)
+        expect { run }.to exit_with_code(128)
       end
     end
 
@@ -89,7 +89,7 @@ describe RHC::Commands::Sshkey do
           File.open('id_rsa.pub', 'w') do |f|
             f << 'ssh-rsa AADAQABAAABAQCnCOqK7/mmvZ9AtCAerxjAasJ1rSpfuWT4vNm1+O/Fh0Di3chTWjY9a0M2hEnqkqnVG589L9CqCUeT0kdc3Vgw3JEcacSUr1z7tLr9kO+p/D5lSdQYzDGGRFOZ0H6lc/y8iNxWV1VO/sJvKx6cr5zvKIn8Q6GvhVNOxlai0IOb9FJxLGK95GLpZ+elzh8Tc9giy7KfwheAwhV2JoF9uRltE5JP/CNs7w/E29i1Z+jlueuu8RVotLmhSVNJm91Ey7OCtoI1iBE0Wv/SucFe32Qi08RWTM/MaGGz93KQNOVRGjNkosJjPmP1qU6WGBfliDkJAZXB0b6sEcnx1fbVikwZ'
           end
-          expect { run }.should exit_with_code(0)
+          expect { run }.to exit_with_code(0)
           expect { run_output.should match("key you are uploading is not recognized") }
           rest_client.sshkeys.length.should == num_keys + 1
         end
@@ -100,7 +100,7 @@ describe RHC::Commands::Sshkey do
       let(:arguments) { %w[sshkey add --noprompt --config test.conf -l test@test.foo -p password foobar id_rsa.pub] }
     
       it "exits with status code Errno::ENOENT::Errno" do
-        expect { run }.should exit_with_code(128)
+        expect { run }.to exit_with_code(128)
       end
     end
     
@@ -119,7 +119,7 @@ describe RHC::Commands::Sshkey do
     
       it "exits with status code Errno::EACCES::Errno" do
         IO.should_receive(:read).and_raise(Errno::EACCES)
-        expect { run }.should exit_with_code(128)
+        expect { run }.to exit_with_code(128)
       end
 
     end
@@ -132,7 +132,7 @@ describe RHC::Commands::Sshkey do
       it 'deletes the key' do
         keys = rest_client.sshkeys
         num_keys = keys.length
-        expect {run}.should exit_with_code(0)
+        expect{ run }.to exit_with_code(0)
         rest_client.sshkeys.length.should == num_keys - 1
       end
     end
@@ -143,7 +143,7 @@ describe RHC::Commands::Sshkey do
 
       it 'leaves keys untouched' do
         num_keys = @keys.length
-        expect {run}.should exit_with_code(0)
+        expect{ run }.to exit_with_code(0)
         rest_client.sshkeys.length.should == num_keys
       end
     end

data/spec/rhc/commands/tail_spec.rb

@@ -17,7 +17,7 @@ describe RHC::Commands::Tail do
 
     context 'help is run' do
       it "should display help" do
-        expect { run }.should exit_with_code(0)
+        expect { run }.to exit_with_code(0)
       end
       it('should output usage') { run_output.should match("Usage: rhc tail") }
     end
@@ -28,24 +28,24 @@ describe RHC::Commands::Tail do
 
     context 'when ssh connects' do
       before (:each) {Net::SSH.should_receive(:start).with('test.domain.com', 'user') }
-      it { expect { run }.should exit_with_code(0) }
+      it { expect { run }.to exit_with_code(0) }
     end
 
     context 'is run on an unreachable domain' do
       before (:each) {Net::SSH.should_receive(:start).and_raise(SocketError) }
-      it { expect { run }.should exit_with_code(1) }
+      it { expect { run }.to exit_with_code(1) }
       it { run_output.should =~ /The connection to test.domain.com failed: / }
     end
 
     context 'is refused' do
       before (:each) {Net::SSH.should_receive(:start).and_raise(Errno::ECONNREFUSED) }
-      it { expect { run }.should exit_with_code(1) }
+      it { expect { run }.to exit_with_code(1) }
       it { run_output.should =~ /The server test.domain.com refused a connection with user user/ }
     end
 
     context 'succeeds and exits on Interrupt' do
       before (:each) { rest_client.stub(:find_domain) { raise Interrupt } }
-      it { expect { run }.should raise_error(Interrupt) }
+      it { expect { run }.to raise_error(Interrupt) }
     end
   end
 end

data/spec/rhc/commands/threaddump_spec.rb

@@ -63,7 +63,7 @@ describe RHC::Commands::Threaddump do
 
     context 'help is run' do
       it "should display help" do
-        expect { run }.should exit_with_code(0)
+        expect { run }.to exit_with_code(0)
       end
       it('should output usage') { run_output.should match("Usage: rhc threaddump") }
     end
@@ -71,14 +71,14 @@ describe RHC::Commands::Threaddump do
 
   describe 'threaddump' do
     let(:arguments) { ['threaddump', 'mock_app_0'] }
-    it { expect { run }.should exit_with_code(0) }
+    it { expect { run }.to exit_with_code(0) }
     it { run_output.should =~ /Application test thread dump complete/ }
   end
 
   describe 'threaddump no args' do
     let(:arguments) { ['threaddump'] }
     context 'args not supplied' do
-      it { expect { run }.should exit_with_code(1) }
+      it { expect { run }.to exit_with_code(1) }
     end
   end
 end

data/spec/rhc/config_spec.rb

@@ -4,7 +4,7 @@ require 'net/http'
 
 describe RHC::Config do
   subject{ RHC::Config }
-  before(:all) do
+  before do
     ENV['LIBRA_SERVER'] = nil
     ENV['HTTP_PROXY'] = nil
     ENV['http_proxy'] = nil
@@ -14,10 +14,12 @@ describe RHC::Config do
     FakeFS::FileSystem.clear
   end
 
-  after(:all) do
+  after do
     FakeFS.deactivate!
     ENV['HTTP_PROXY'] = nil
     ENV['http_proxy'] = nil
+    ENV['LIBRA_SERVER'] = nil
+    RHC::Config.send(:instance_variable_set, :@default, nil)
   end
 
   describe "class" do
@@ -86,6 +88,7 @@ describe RHC::Config do
   end
 
   context "Config values with /etc/openshift/express.conf" do
+
     it "should have only a global config" do
       ConfigHelper.write_out_config(ConfigHelper.global_config_path, "global.openshift.redhat.com", "global@redhat.com")
       subject.initialize
@@ -260,11 +263,8 @@ describe RHC::Config do
   end
 
   context "Debug options" do
-    after(:all) do
-      FakeFS::FileSystem.clear
-    end
-
     it "should show debug as false because nothing is set" do
+      subject.initialize
       ConfigHelper.check_legacy_debug({}).should be_false
     end
 

data/spec/rhc/helpers_spec.rb

@@ -1,35 +1,34 @@
 require 'spec_helper'
-require 'rhc/helpers'
+require 'rhc'
 require 'rhc/ssh_helpers'
 require 'rhc/cartridge_helpers'
 require 'rhc/git_helpers'
 require 'rhc/core_ext'
-require 'highline/import'
 require 'rhc/config'
-require 'rhc/helpers'
 require 'date'
 require 'resolv'
+require 'ostruct'
+
+class MockHelpers
+  include RHC::Helpers
+  include RHC::SSHHelpers
+  include RHC::CartridgeHelpers
+
+  def config
+    @config ||= RHC::Config.new
+  end
+  def options
+    @options ||= OpenStruct.new(:server => nil)
+  end
+end
 
 describe RHC::Helpers do
-  before(:each) do
+  before do
     mock_terminal
     user_config
   end
 
-  subject do
-    Class.new(Object) do
-      include RHC::Helpers
-      include RHC::SSHHelpers
-
-      def config
-        @config ||= RHC::Config.new
-      end
-      def options
-        @options ||= OpenStruct.new(:server => nil)
-      end
-    end.new
-  end
-  let(:tests) { OutputTests.new }
+  subject{ MockHelpers.new }
 
   its(:openshift_server) { should == 'openshift.redhat.com' }
   its(:openshift_url) { should == 'https://openshift.redhat.com' }
@@ -47,7 +46,7 @@ describe RHC::Helpers do
 
   shared_examples_for "colorized output" do
     it("should be colorized") do
-      message = "this is #{_color}"
+      message = "this is #{_color} -"
       output = capture{ subject.send(method,message) }
       output.should be_colorized(message,_color)
     end
@@ -77,7 +76,7 @@ describe RHC::Helpers do
   it("should draw a table") do
     subject.table([[10,2], [3,40]]) do |i|
       i.map(&:to_s)
-    end.should == ['10 2','3  40']
+    end.to_a.should == ['10 2','3  40']
   end
 
   context "error output" do
@@ -87,7 +86,7 @@ describe RHC::Helpers do
   end
 
   it("should output a table") do
-    subject.send(:display_no_info, 'test').should == ['This test has no information to show']
+    subject.send(:format_no_info, 'test').to_a.should == ['This test has no information to show']
   end
 
   it "should parse an RFC3339 date" do
@@ -163,7 +162,7 @@ describe RHC::Helpers do
       Class.new(Object){ include RHC::Helpers }.new
     end
 
-    it("should raise on config"){ expect{ subject.config }.should raise_error }
+    it("should raise on config"){ expect{ subject.config }.to raise_error }
   end
 
   context "with a bad timeout value" do
@@ -238,71 +237,11 @@ describe RHC::Helpers do
     it{ run_output.should match("The certificate 'not_a_file' cannot be loaded: No such file or directory ") }
   end
 
-  describe "#get_properties" do
-    it{ tests.send(:get_properties, stub(:plan_id => 'free'), :plan_id).should == [[:plan_id, 'Free']] }
+  context "#get_properties" do
+    it{ subject.send(:get_properties, stub(:plan_id => 'free'), :plan_id).should == [[:plan_id, 'Free']] }
     context "when an error is raised" do
-      subject{ stub.tap{ |s| s.should_receive(:foo).and_raise(::Exception) } }
-      it{ tests.send(:get_properties, subject, :foo).should == [[:foo, '<error>']] }
-    end
-  end
-
-  context "Formatter" do
-    before{ tests.reset }
-
-    it "should print out a paragraph with open endline on the same line" do
-      tests.section_same_line
-      $terminal.read.should == "section 1 word\n"
-    end
-
-    it "should print out a section without any line breaks" do
-      tests.section_no_breaks
-      $terminal.read.should == "section 1 \n"
-    end
-
-    it "should print out a section with trailing line break" do
-      tests.section_one_break
-      $terminal.read.should == "section 1\n"
-    end
-
-    it "should print out 2 sections with matching bottom and top margins generating one space between" do
-      tests.sections_equal_bottom_top
-      $terminal.read.should == "section 1\n\nsection 2\n"
-    end
-
-    it "should print out 2 sections with larger bottom margin generating two spaces between" do
-      tests.sections_larger_bottom
-      $terminal.read.should == "section 1\n\n\nsection 2\n"
-    end
-
-    it "should print out 2 sections with larger top margin generating two spaces between" do
-      tests.sections_larger_top
-      $terminal.read.should == "section 1\n\n\nsection 2\n"
-    end
-
-    it "should print out 4 sections and not collapse open sections" do
-      tests.sections_four_on_three_lines
-      $terminal.read.should == "section 1\n\nsection 2 \nsection 3\n\nsection 4\n"
-    end
-
-    it "should show the equivilance of paragaph to section(:top => 1, :bottom => 1)" do
-      tests.section_1_1
-      section_1_1 = $terminal.read
-      tests.reset
-      tests.section_paragraph
-      paragraph = $terminal.read
-
-      section_1_1.should == paragraph
-
-      tests.reset
-      tests.section_1_1
-      tests.section_paragraph
-
-      $terminal.read.should == "section\n\nsection\n"
-    end
-
-    it "should not collapse explicit newline sections" do
-      tests.outside_newline
-      $terminal.read.should == "section 1\n\n\nsection 2\n"
+      let(:bar){ stub.tap{ |s| s.should_receive(:foo).and_raise(::Exception) } }
+      it{ subject.send(:get_properties, bar, :foo).should == [[:foo, '<error>']] }
     end
   end
 
@@ -331,7 +270,7 @@ describe RHC::Helpers do
         let(:stderr){ 'fatal: error' }
         let(:exit_status){ 1 }
 
-        it { capture{ expect{ subject.git_clone_repo("url", "repo") }.should raise_error(RHC::GitException) } }
+        it { capture{ expect{ subject.git_clone_repo("url", "repo") }.to raise_error(RHC::GitException) } }
         it { capture_all{ subject.git_clone_repo("url", "repo") rescue nil }.should match("fake git clone") }
         it { capture_all{ subject.git_clone_repo("url", "repo") rescue nil }.should match("fatal: error") }
       end
@@ -340,14 +279,14 @@ describe RHC::Helpers do
         let(:stderr){ "fatal: destination path 'foo' already exists and is not an empty directory." }
         let(:exit_status){ 1 }
 
-        it { capture{ expect{ subject.git_clone_repo("url", "repo") }.should raise_error(RHC::GitDirectoryExists) } }
+        it { capture{ expect{ subject.git_clone_repo("url", "repo") }.to raise_error(RHC::GitDirectoryExists) } }
       end
 
       context "permission denied" do
         let(:stderr){ "Permission denied (publickey,gssapi-mic)." }
         let(:exit_status){ 1 }
 
-        it { capture{ expect{ subject.git_clone_repo("url", "repo") }.should raise_error(RHC::GitPermissionDenied) } }
+        it { capture{ expect{ subject.git_clone_repo("url", "repo") }.to raise_error(RHC::GitPermissionDenied) } }
       end
     end
   end
@@ -373,6 +312,48 @@ describe RHC::Helpers do
     end
   end
 
+  describe "#wrap" do
+    it{ "abc".wrap(1).should == "a\nb\nc" }
+  end
+
+  describe "#textwrap_ansi" do
+    it{ "".textwrap_ansi(80).should == [] }
+    it{ "\n".textwrap_ansi(80).should == ["",""] }
+    it{ "a".textwrap_ansi(1).should == ['a'] }
+    it{ "ab".textwrap_ansi(1).should == ['a','b'] }
+    it{ "ab".textwrap_ansi(2).should == ['ab'] }
+    it{ "ab cd".textwrap_ansi(4).should == ['ab', 'cd'] }
+    it{ " ab".textwrap_ansi(2).should == [' a','b'] }
+    it{ "a b".textwrap_ansi(1).should == ['a','b'] }
+    it{ "a w b".textwrap_ansi(2).should == ['a','w','b'] }
+    it{ "a w b".textwrap_ansi(3).should == ['a w','b'] }
+    it{ "a\nb".textwrap_ansi(1).should == ['a','b'] }
+    it{ "\e[1m".textwrap_ansi(1).should == ["\e[1m\e[0m"] }
+    it{ "\e[31;1m".textwrap_ansi(1).should == ["\e[31;1m\e[0m"] }
+    it{ "\e[1ma".textwrap_ansi(1).should == ["\e[1ma\e[0m"] }
+    it{ "a\e[12m".textwrap_ansi(1).should == ["a\e[12m\e[0m"] }
+    it{ "a\e[12m\e[34mb".textwrap_ansi(1).should == ["a\e[12m\e[34m\e[0m","\e[12m\e[34mb\e[0m"] }
+    it{ "\e[12;34ma".textwrap_ansi(1).should == ["\e[12;34ma\e[0m"] }
+    it{ "\e[1m\e[1m".textwrap_ansi(1).should == ["\e[1m\e[1m\e[0m"] }
+    it{ "\e[1m \e[1m".textwrap_ansi(1).should == ["\e[1m\e[0m", "\e[1m\e[1m\e[0m"] }
+    it{ "\e[1ma\nb".textwrap_ansi(80).should == ["\e[1ma","b"] }
+
+    it{ "ab".textwrap_ansi(1,false).should == ['ab'] }
+    it{ " abc".textwrap_ansi(3,false).should == [' abc'] }
+    it{ "abcd".textwrap_ansi(3,false).should == ['abcd'] }
+    it{ "abcd\e[1m".textwrap_ansi(3,false).should == ["abcd\e[1m\e[0m"] }
+    it{ "abcd efg a".textwrap_ansi(3,false).should == ['abcd', 'efg', 'a'] }
+    it('next line'){ "abcd e a".textwrap_ansi(5,false).should == ['abcd', 'e a'] }
+    it{ "abcd efgh a".textwrap_ansi(3,false).should == ['abcd', 'efgh', 'a'] }
+    it{ " abcd efg a".textwrap_ansi(3,false).should == [' abcd', 'efg', 'a'] }
+  end
+
+  describe "#strip_ansi" do
+    it{ "\e[1m \e[1m".strip_ansi.should == " " }
+    it{ "\eiei0".strip_ansi.should == "\eiei0" } 
+    it{ "\e[iei0]".strip_ansi.should == "\e[iei0]" } 
+  end
+
   context "Resolv helper" do
     let(:resolver) { Object.new }
     let(:existent_host) { 'real_host' }
@@ -400,86 +381,6 @@ describe RHC::Helpers do
       end
     end
   end
-
-  class OutputTests
-    include RHC::Helpers
-    include RHC::SSHHelpers
-    include RHC::OutputHelpers
-
-    def initialize
-      @print_num = 0
-      @options = Commander::Command::Options.new
-    end
-
-    def config
-      @config ||= RHC::Config
-    end
-
-    def next_print_num
-      @print_num += 1
-    end
-
-    def output
-      say "section #{next_print_num}"
-    end
-
-    def output_no_breaks
-      say "section #{next_print_num} "
-    end
-    
-    def section_same_line
-      section { output_no_breaks; say 'word' }
-    end
-
-    def section_no_breaks
-      section { output_no_breaks }
-    end
-
-    def section_one_break
-      section { output }
-    end
-
-    def sections_equal_bottom_top
-      section(:bottom => 1) { output }
-      section(:top => 1) { output }
-    end
-
-    def sections_larger_bottom
-      section(:bottom => 2) { output }
-      section(:top => 1) { output }
-    end
-
-    def sections_larger_top
-      section(:bottom => 1) { output }
-      section(:top => 2) { output }
-    end
-
-    def sections_four_on_three_lines
-      section { output }
-      section(:top => 1) { output_no_breaks }
-      section(:bottom => 1) { output }
-      section(:top => 1) { output }
-    end
-
-    def outside_newline
-      section(:bottom => -1) { output }
-      say "\n"
-      section(:top => 1) { output }
-    end
-
-    def section_1_1
-      section(:top => 1, :bottom => 1) { say "section" }
-    end
-
-    def section_paragraph
-      paragraph { say "section" }
-    end
-
-    # call section without output to reset spacing to 0
-    def reset
-      RHC::Helpers.send(:class_variable_set, :@@margin, nil)
-    end
-  end
 end
 
 describe RHC::Helpers::StringTee do
@@ -525,66 +426,18 @@ describe OpenURI do
   end
 end
 
-describe HighLine do
-  it "should wrap the terminal" do
-    $terminal.wrap_at = 10
-    say "Lorem ipsum dolor sit amet"
-    output = $terminal.read
-    output.should match "Lorem\nipsum\ndolor sit\namet"
-  end
-  it "should wrap the terminal" do
-    $terminal.wrap_at = 16
-    say "Lorem ipsum dolor sit amet"
-    output = $terminal.read
-    output.should match "Lorem ipsum\ndolor sit amet"
-  end
-  it "should not wrap the terminal" do
-    $terminal.wrap_at = 50
-    say "Lorem ipsum dolor sit amet"
-    output = $terminal.read
-    output.should match "Lorem ipsum dolor sit amet"
-  end
-  it "should wrap the terminal when using color codes" do
-    $terminal.wrap_at = 10
-    say $terminal.color("Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet", :red)
-    output = $terminal.read
-    output.should match "Lorem\nipsum\ndolor sit\namet Lorem\nipsum\ndolor sit\namet"
-  end
-  it "should wrap the terminal with other escape characters" do
-    $terminal.wrap_at = 10
-    say "Lorem ipsum dolor sit am\eet"
-    output = $terminal.read
-    output.should match "Lorem\nipsum\ndolor sit\nam\eet"
-  end
-  it "should wrap the terminal when words are smaller than wrap length" do
-    $terminal.wrap_at = 3
-    say "Antidisestablishmentarianism"
-    output = $terminal.read
-    output.should match "Ant\nidi\nses\ntab\nlis\nhme\nnta\nria\nnis\nm"
-  end
-end
-
 describe RHC::CartridgeHelpers do
   before(:each) do
     mock_terminal
   end
 
-  subject do
-    Class.new(Object) do
-      include RHC::Helpers
-      include RHC::CartridgeHelpers
-
-      def config
-        @config ||= RHC::Config.new
-      end
-    end.new
-  end
+  subject{ MockHelpers.new }
 
   describe '#check_cartridges' do
     let(:cartridges){ [] }
     let(:find_cartridges){ [] }
     context "with a generic object" do
-      it { expect{ subject.send(:check_cartridges, 'foo', :from => cartridges) }.should raise_error(RHC::CartridgeNotFoundException, 'There are no cartridges that match \'foo\'.') }
+      it { expect{ subject.send(:check_cartridges, 'foo', :from => cartridges) }.to raise_error(RHC::CartridgeNotFoundException, 'There are no cartridges that match \'foo\'.') }
     end
   end
   describe '#web_carts_only' do