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

@@ -17,28 +17,28 @@
     end
     
     describe "#to_json" do
       it "#serialize returns the serialized model" do
         @r.id = 1
-        assert_equal '{"order":{"id":1}}', @r.to_json
+        assert_equal '{"id":1}', @r.to_json
       end
     end
     
     describe ".from_json" do
       it "returns the deserialized model" do
-        @m = Order.from_json('{"order": {"id":1}}')
+        @m = Order.from_json('{"id":1}')
         assert_equal 1, @m.id
       end
       
       it "accepts :except option" do
-        order = Order.from_json({order: {id: 1, pending: 1}}.to_json, :except => [:id])
+        order = Order.from_json({id: 1, pending: 1}.to_json, :except => [:id])
         assert_equal nil, order.id
         assert_equal 1, order.pending
       end
       
       it "accepts :include option" do
-        order = Order.from_json({order: {id: 1, pending: 1}}.to_json, :include => [:id])
+        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
@@ -49,18 +49,13 @@
 end
 
 class JsonHyperlinkRepresenterTest
   describe "API" do
     before do
-      @l = Roar::Representer::JSON::Hyperlink.from_json({:link => {:rel => :self, :href => "http://roar.apotomo.de"}}.to_json)
+      @l = Roar::Representer::JSON::Hyperlink.from_json({:rel => :self, :href => "http://roar.apotomo.de"}.to_json)
     end
     
-    it "responds to #representation_name" do
-      assert_equal :link, @l.class.representation_name
-    end
-    
-    
     it "responds to #rel" do
       assert_equal "self", @l.rel
     end
     
     it "responds to #href" do
@@ -74,12 +69,10 @@
     before do
       @c = Class.new do
         include Roar::Representer::JSON
         include Roar::Representer::Feature::Hypermedia
         
-        self.representation_name= :order
-        
         property :id
         
         link :self do "http://self" end
         link :next do "http://next/#{id}" end
       end
@@ -90,17 +83,17 @@
     it "responds to #links" do
       assert_equal [], @r.links
     end
     
     it "extracts links from JSON" do
-      @r = @c.from_json({:order => {:links => [{:rel => "self", :href => "http://self"}]}}.to_json)
+      @r = @c.from_json({:links => [{:rel => "self", :href => "http://self"}]}.to_json)
       
       assert_equal 1, @r.links.size
       assert_equal({"rel"=>"self", "href"=>"http://self"}, @r.links.first.to_attributes) 
     end
     
     it "renders link: correctly in JSON" do
-      assert_equal "{\"order\":{\"id\":1,\"links\":[{\"rel\":\"self\",\"href\":\"http://self\"},{\"rel\":\"next\",\"href\":\"http://next/1\"}]}}", @c.from_attributes(:id => 1).to_json
+      assert_equal "{\"id\":1,\"links\":[{\"rel\":\"self\",\"href\":\"http://self\"},{\"rel\":\"next\",\"href\":\"http://next/1\"}]}", @c.from_attributes(:id => 1).to_json
     end
   end
 end