Simplification of include_json failure message and spec

Author: DanOlson

lib/json_spec/matchers/include_json.rb

@@ -5,16 +5,14 @@ class IncludeJson
       include JsonSpec::Exclusion
       include JsonSpec::Messages
 
-      attr_reader :actual_json
-
       def initialize(expected_json = nil)
         @expected_json = expected_json
       end
 
       def matches?(actual_json)
         raise "Expected included JSON not provided" if @expected_json.nil?
 
-        self.actual_json = actual_json
+        @actual_json = actual_json
 
         actual = parse_json(actual_json, @path)
         expected = exclude_keys(parse_json(@expected_json))
@@ -47,24 +45,18 @@ def including(*keys)
       end
 
       def failure_message
-        message_with_path("Expected #{actual_json} to include #{@expected_json}")
+        message_with_path("Expected #{@actual_json} to include #{@expected_json}")
       end
       alias :failure_message_for_should :failure_message
 
       def failure_message_when_negated
-        message_with_path("Expected #{actual_json} to exclude #{@expected_json}")
+        message_with_path("Expected #{@actual_json} to not include #{@expected_json}")
       end
       alias :failure_message_for_should_not :failure_message_when_negated
 
       def description
         message_with_path("include JSON")
       end
-
-      private
-
-      def actual_json=(json)
-        @actual_json = json
-      end
     end
   end
 end

spec/json_spec/matchers/include_json_spec.rb

@@ -72,19 +72,15 @@
   end
 
   it "provides a useful failure message for should" do
-    actual   = %({"ids": [1,2,3]})
-    expected = %({"ids": [4,5,6]})
-    matcher  = include_json(expected)
-    matcher.matches?(actual)
-    matcher.failure_message_for_should.should == "Expected #{actual} to include #{expected}"
+    matcher = include_json(%([4,5,6]))
+    matcher.matches?(%([1,2,3]))
+    matcher.failure_message_for_should.should == "Expected [1,2,3] to include [4,5,6]"
   end
 
   it "provides a useful failure message for should not" do
-    actual   = %({"ids": [1,2,3]})
-    expected = actual
-    matcher  = include_json(expected)
-    matcher.matches?(actual)
-    matcher.failure_message_for_should_not.should == "Expected #{actual} to exclude #{expected}"
+    matcher = include_json(%(3))
+    matcher.matches?(%([1,2,3]))
+    matcher.failure_message_for_should_not.should == "Expected [1,2,3] to not include 3"
   end
 
   it "raises an error when not given expected JSON" do