Merge pull request #289 from jgawor/ruby2.2.0

Return nil instead of throwing exception if the type is incorrect
cloudfoundry · Jun 20, 2016 · e5d02f7 · e5d02f7
2 parents a3b65ce + 019b492
commit e5d02f7
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/lib/liberty_buildpack/jre/memory/memory_size.rb b/lib/liberty_buildpack/jre/memory/memory_size.rb
@@ -80,8 +80,7 @@ def to_s
       def <=>(other)
         if other == 0
           @bytes <=> 0
-        else
-          fail "Cannot compare a MemorySize to an instance of #{other.class}" unless other.is_a? MemorySize
+        elsif other.is_a? MemorySize
           @bytes <=> other.bytes
         end
       end

diff --git a/spec/liberty_buildpack/jre/memory/memory_size_spec.rb b/spec/liberty_buildpack/jre/memory/memory_size_spec.rb
@@ -75,7 +75,7 @@
   end
 
   it 'should fail when a memory size is compared to a non-zero numeric' do
-    expect { described_class.new('1B') < 2 }.to raise_error(/Cannot compare/)
+    expect { described_class.new('1B') < 2 }.to raise_error(ArgumentError)
   end
 
   it 'should multiply values correctly' do