test/json_representer_test.rb in roar-0.8.3 vs test/json_representer_test.rb in roar-0.9.0

@@ -11,39 +11,47 @@
   end
   
   
   describe "JsonRepresenter" do
     before do
-      @r = Order.new
+      @order = Order.new
     end
     
+    
     describe "#to_json" do
-      it "#serialize returns the serialized model" do
-        @r.id = 1
-        assert_equal '{"id":1}', @r.to_json
+      before do
+        @order.id = 1
       end
+      
+      it "returns the serialized model" do
+        assert_equal '{"id":1}', @order.to_json
+      end
+      
+      it "is aliased by #serialize" do
+        assert_equal '{"id":1}', @order.serialize
+      end
     end
     
-    describe ".from_json" do
+    describe "#from_json" do
       it "returns the deserialized model" do
-        @m = Order.from_json('{"id":1}')
-        assert_equal 1, @m.id
+        @order.from_json('{"id":1}')
+        assert_equal 1, @order.id
       end
       
-      it "accepts :except option" do
-        order = Order.from_json({id: 1, pending: 1}.to_json, :except => [:id])
-        assert_equal nil, order.id
-        assert_equal 1, order.pending
+      it "is aliased by #deserialize" do
+        @order.deserialize('{"id":1}')
+        assert_equal 1, @order.id
       end
       
-      it "accepts :include option" do
-        order = Order.from_json({id: 1, pending: 1}.to_json, :include => [:id])
-        assert_equal 1, order.id
-        assert_equal nil, order.pending
-      end
-      
       it "works with a nil document" do
-        assert Order.from_json(nil)
+        assert @order.from_json(nil)
+      end
+    end
+    
+    describe "JSON.from_json" do
+      it "is aliased by #deserialize" do
+        @order = Order.deserialize('{"id":1}')
+        assert_equal 1, @order.id
       end
     end
   end
 end