Merge pull request #204 from trevorrjohn/view-state

Setting view causes state change on default view
procore-oss · Mar 16, 2020 · bb07d6f · bb07d6f
2 parents 224c37c + 4221123
commit bb07d6f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/lib/blueprinter/view_collection.rb b/lib/blueprinter/view_collection.rb
@@ -78,7 +78,7 @@ def add_to_ordered_fields(ordered_fields, definition, fields, view_name_filter =
     end
 
     def merge_fields(source_fields, included_fields)
-      source_fields.merge! included_fields
+      source_fields.merge included_fields
     end
   end
 end
diff --git a/spec/integrations/shared/base_render_examples.rb b/spec/integrations/shared/base_render_examples.rb
@@ -409,6 +409,7 @@ def self.unless_method(_field_name, _object, _options)
       expect(blueprint.render(obj, view: :normal)).to     eq(normal)
       expect(blueprint.render(obj, view: :extended)).to   eq(ext)
       expect(blueprint.render(obj, view: :special)).to    eq(special)
+      expect(blueprint.render(obj)).to                    eq(no_view)
     end
   end