Util::Diff: remove Object::Encoding existence check (ruby 1.8 specific, issue #2497)

2 files changed, 7 insertions, 10 deletions

diff --git a/lib/chef/util/diff.rb b/lib/chef/util/diff.rb
index 3117484a71..c2dc6e045c 100644
--- a/lib/chef/util/diff.rb
+++ b/lib/chef/util/diff.rb
@@ -176,10 +176,7 @@ class Chef
       end
 
       def encode_diff_for_json(diff_str)
-        if Object.const_defined? :Encoding
-          diff_str.encode!('UTF-8', :invalid => :replace, :undef => :replace, :replace => '?')
-        end
-        return diff_str
+        diff_str.encode!('UTF-8', :invalid => :replace, :undef => :replace, :replace => '?')
       end
 
     end
diff --git a/spec/unit/util/diff_spec.rb b/spec/unit/util/diff_spec.rb
index ea226f1c04..b0a57a32c0 100644
--- a/spec/unit/util/diff_spec.rb
+++ b/spec/unit/util/diff_spec.rb
@@ -105,7 +105,7 @@ shared_examples_for "a diff util" do
     end
   end
 
-  describe "when the default external encoding is UTF-8", :ruby_gte_19_only  do
+  describe "when the default external encoding is UTF-8" do
 
     before do
       @saved_default_external = Encoding.default_external
@@ -170,7 +170,7 @@ shared_examples_for "a diff util" do
 
   end
 
-  describe "when the default external encoding is Latin-1", :ruby_gte_19_only  do
+  describe "when the default external encoding is Latin-1" do
 
     before do
       @saved_default_external = Encoding.default_external
@@ -234,7 +234,7 @@ shared_examples_for "a diff util" do
     end
 
   end
-  describe "when the default external encoding is Shift_JIS", :ruby_gte_19_only  do
+  describe "when the default external encoding is Shift_JIS" do
 
     before do
       @saved_default_external = Encoding.default_external
@@ -411,7 +411,7 @@ shared_examples_for "a diff util" do
       end
     end
 
-    describe "when the default external encoding is UTF-8", :ruby_gte_19_only  do
+    describe "when the default external encoding is UTF-8" do
 
       before do
         @saved_default_external = Encoding.default_external
@@ -456,7 +456,7 @@ shared_examples_for "a diff util" do
 
     end
 
-    describe "when the default external encoding is Latin-1", :ruby_gte_19_only do
+    describe "when the default external encoding is Latin-1" do
 
       before do
         @saved_default_external = Encoding.default_external
@@ -500,7 +500,7 @@ shared_examples_for "a diff util" do
       end
     end
 
-    describe "when the default external encoding is Shift-JIS", :ruby_gte_19_only do
+    describe "when the default external encoding is Shift-JIS" do
 
       before do
         @saved_default_external = Encoding.default_external