Merge pull request #63 from Nerian/cannot_reopen_exposure

Test that you can reopen nested exposures
ruby-grape · Mar 12, 2014 · d904381 · d904381
2 parents 4a6be72 + 3112419
commit d904381
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 6 deletions.
diff --git a/lib/grape_entity/entity.rb b/lib/grape_entity/entity.rb
@@ -195,7 +195,7 @@ def nested_exposures
         value = nested_exposures_hash
 
         if superclass.respond_to? :nested_exposures
-          value = superclass.nested_exposures.merge(value)
+          value = superclass.nested_exposures.deep_merge(value)
         end
 
         value

diff --git a/spec/grape_entity/entity_spec.rb b/spec/grape_entity/entity_spec.rb
@@ -137,7 +137,7 @@ class ClassRoom < Grape::Entity
 
             class Person < Grape::Entity
               expose :user do
-                expose(:id) { |_| 'value' }
+                expose(:in_first) { |_| 'value' }
               end
             end
 
@@ -155,12 +155,18 @@ class Parent < Person
             ClassRoom.represent({}).serializable_hash.should == {
               parents: [
                 {
-                  user: { id: "value" },
-                  children: [{ user: { user_id: "value", display_id: "value" } }, { user: { user_id: "value", display_id: "value" } }]
+                  user: { in_first: 'value' },
+                  children: [
+                    { user: { in_first: 'value', user_id: "value", display_id: "value" } },
+                    { user: { in_first: 'value', user_id: "value", display_id: "value" } }
+                  ]
                 },
                 {
-                  user: { id: "value" },
-                  children: [{ user: { user_id: "value", display_id: "value" } }, { user: { user_id: "value", display_id: "value" } }]
+                  user: { in_first: 'value' },
+                  children: [
+                    { user: { in_first: 'value', user_id: "value", display_id: "value" } },
+                    { user: { in_first: 'value', user_id: "value", display_id: "value" } }
+                  ]
                 }
               ]
             }