Belongs-to fallback should gracefully fail when unable to find associ…

…ation data
samvera · Oct 17, 2016 · 0794319 · 0794319
1 parent 6ecd254
commit 0794319
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/lib/active_fedora/associations/belongs_to_association.rb b/lib/active_fedora/associations/belongs_to_association.rb
@@ -63,7 +63,11 @@ def find_target
           if @full_result # side-effect from #id_reader
             ActiveFedora::SolrService.reify_solr_results([@full_result]).first
           else
-            ActiveFedora::Base.find(id_reader, cast: true)
+            begin
+              ActiveFedora::Base.find(id_reader, cast: true)
+            rescue ActiveFedora::ObjectNotFoundError
+              nil
+            end
           end
         end
 

diff --git a/spec/integration/belongs_to_association_spec.rb b/spec/integration/belongs_to_association_spec.rb
@@ -45,6 +45,11 @@ class SpecialInheritedBook < Book
       book[:library_id] = library.id
       book.library_id.should == library.id
     end
+
+    it "safely handles invalid data" do
+      book[:library_id] = 'bad identifier'
+      book.library.should be_nil
+    end
   end
 
   describe "getting the id property" do