Remove use of deprecated method load_instance_from_solr

app/controllers/concerns/curation_concerns/curation_concern_controller.rb

@@ -56,8 +56,6 @@ def show
       wants.html { presenter && parent_presenter }
       wants.json do
         # load and authorize @curation_concern manually because it's skipped for html
-        # This has to use #find instead of #load_instance_from_solr because
-        # we want to return values like file_set_ids in the json
         @curation_concern = _curation_concern_type.find(params[:id]) unless curation_concern
         authorize! :show, @curation_concern
         render :show, status: :ok

app/controllers/concerns/curation_concerns/file_sets_controller_behavior.rb

@@ -67,7 +67,8 @@ def show
         wants.html { presenter }
         wants.json do
           # load and authorize @curation_concern manually because it's skipped for html
-          self.curation_concern ||= curation_concern_type.load_instance_from_solr(params[:id])
+          # TODO: is there any reason we couldn't use `presenter' here?
+          self.curation_concern ||= curation_concern_type.find(params[:id])
           authorize! :show, curation_concern
           render :show, status: :ok
         end

app/controllers/concerns/curation_concerns/single_use_links_controller_behavior.rb

@@ -44,7 +44,7 @@ def authorize_user!
       end
 
       def asset
-        @asset ||= ActiveFedora::Base.load_instance_from_solr(params[:id])
+        @asset ||= ActiveFedora::Base.find(params[:id])
       end
   end
 end

app/models/concerns/curation_concerns/solr_document_behavior.rb

@@ -16,16 +16,35 @@ def to_s
       title_or_label
     end
 
+    class ModelWrapper
+      def initialize(model, id)
+        @model = model
+        @id = id
+      end
+
+      def persisted?
+        true
+      end
+
+      def to_param
+        @id
+      end
+
+      def model_name
+        @model.model_name
+      end
+
+      def to_partial_path
+        @model._to_partial_path
+      end
+    end
     ##
     # Offer the source (ActiveFedora-based) model to Rails for some of the
     # Rails methods (e.g. link_to).
     # @example
     #   link_to '...', SolrDocument(:id => 'bXXXXXX5').new => <a href="/dams_object/bXXXXXX5">...</a>
     def to_model
-      @model ||= begin
-        m = ActiveFedora::Base.load_instance_from_solr(id, self)
-        m.class == ActiveFedora::Base ? self : m
-      end
+      @model ||= ModelWrapper.new(hydra_model, id)
     end
 
     def collection?

spec/actors/curation_concerns/file_set_actor_spec.rb

@@ -159,11 +159,11 @@
       end
 
       it "removes representative, thumbnail, and the proxy association" do
-        gw = GenericWork.load_instance_from_solr(work.id)
+        gw = GenericWork.find(work.id)
         expect(gw.representative_id).to eq(file_set.id)
         expect(gw.thumbnail_id).to eq(file_set.id)
         expect { actor.destroy }.to change { ActiveFedora::Aggregation::Proxy.count }.by(-1)
-        gw = GenericWork.load_instance_from_solr(work.id)
+        gw = GenericWork.find(work.id)
         expect(gw.representative_id).to be_nil
         expect(gw.thumbnail_id).to be_nil
       end

spec/spec_helper.rb

@@ -74,8 +74,11 @@
   end
 
   config.include FactoryGirl::Syntax::Methods
-  config.include Devise::TestHelpers, type: :controller
-  config.include Devise::TestHelpers, type: :view
+  if defined? Devise::Test::ControllerHelpers
+    config.include Devise::Test::ControllerHelpers, type: :controller
+  else
+    config.include Devise::TestHelpers, type: :controller
+  end
   config.include Warden::Test::Helpers, type: :feature
   config.after(:each, type: :feature) { Warden.test_reset! }
   config.include Controllers::EngineHelpers, type: :controller

spec/views/catalog/index.html.erb_spec.rb

@@ -34,9 +34,6 @@
     allow(resp).to receive(:limit_value).and_return(10)
     allow(resp).to receive(:empty?).and_return(false)
 
-    # This stubs out the SolrDocument#to_model
-    allow(ActiveFedora::Base).to receive(:load_instance_from_solr).with('abc123', doc).and_return(collection)
-
     assign(:document_list, [doc])
   end