sufia 5.0.0 → 6.0.0.beta1

data/spec/controllers/homepage_controller_spec.rb

@@ -4,8 +4,7 @@ describe HomepageController, :type => :controller do
   routes { Rails.application.class.routes }
 
   describe "#index" do
-    before :all do
-      GenericFile.delete_all
+    before do
       @gf1 = GenericFile.new(title:['Test Document PDF'], filename:['test.pdf'], tag:['rocks'], read_groups:['public'])
       @gf1.apply_depositor_metadata('mjg36')
       @gf1.save
@@ -14,11 +13,6 @@ describe HomepageController, :type => :controller do
       @gf2.save
     end
 
-    after :all do
-      @gf1.delete
-      @gf2.delete
-    end
-
     let(:user) { FactoryGirl.find_or_create(:jill) }
     before do
       sign_in user
@@ -45,9 +39,16 @@ describe HomepageController, :type => :controller do
     it "should not include other user's private documents in recent documents" do
       get :index
       expect(response).to be_success
-      titles = assigns(:recent_documents).map {|d| d['desc_metadata__title_tesim'][0]}
+      titles = assigns(:recent_documents).map {|d| d['title_tesim'][0]}
       expect(titles).to_not include('Test Private Document')
-    end    
+    end
+
+    it "should include only GenericFile objects in recent documents" do
+      get :index
+      assigns(:recent_documents).each do |doc|
+        expect(doc[Solrizer.solr_name("has_model", :symbol)]).to eql ["GenericFile"]
+      end
+    end 
 
     context "with a document not created this second" do
       before do
@@ -70,6 +71,8 @@ describe HomepageController, :type => :controller do
         create_times = assigns(:recent_documents).map{|d| d['system_create_dtsi']}
         expect(create_times).to eq create_times.sort.reverse
       end
+
+
     end
 
     context "with featured works" do

data/spec/controllers/mailbox_controller_spec.rb

@@ -11,10 +11,7 @@ describe MailboxController, :type => :controller do
     allow_any_instance_of(MailboxController).to receive(:authenticate_user!).and_return(true)
     sign_in @user
   end
-  after(:each) do
-    @rec1.delete
-    @rec2.delete
-  end
+
   describe "#index" do
     it "should show message" do
       get :index

data/spec/controllers/my/files_controller_spec.rb

@@ -2,16 +2,6 @@ require 'spec_helper'
 
 describe My::FilesController, :type => :controller do
 
-  before :all do
-    GenericFile.destroy_all
-    Collection.destroy_all
-  end
-
-  after :all do
-    GenericFile.destroy_all
-    Collection.destroy_all
-  end
-
   let(:my_collection) do
     Collection.new(title: 'test collection').tap do |c|
       c.apply_depositor_metadata(user.user_key)

data/spec/controllers/single_use_links_controller_spec.rb

@@ -2,53 +2,46 @@ require 'spec_helper'
 
 describe SingleUseLinksController, :type => :controller do
   let(:user) { FactoryGirl.find_or_create(:jill) }
+
   let(:file) do
-    GenericFile.new.tap do |f|
-      f.add_file(File.open(fixture_path + '/world.png'), 'content', 'world.png')
-      f.apply_depositor_metadata(user)
-      f.save
-    end
-  end
-  let(:file2) do
-    GenericFile.new.tap do |f|
-      f.add_file(File.open(fixture_path + '/world.png'), 'content', 'world.png')
-      f.apply_depositor_metadata('mjg36')
-      f.save
+    GenericFile.new.tap do |file|
+      file.add_file(File.open(fixture_path + '/world.png'), 'content', 'world.png')
+      file.apply_depositor_metadata(user)
+      file.save
     end
   end
-  before do
-    allow(controller).to receive(:has_access?).and_return(true)
-    allow(controller).to receive(:clear_session_user) ## Don't clear out the authenticated session
-  end
-  after(:all) do
-    ActiveFedora::Base.destroy_all
-    SingleUseLink.destroy_all
-  end
+
   describe "logged in user with edit permission" do
+    let(:hash) { "some-dummy-sha2-hash" }
+
     before do
       sign_in user
-      @now = DateTime.now
-      allow(DateTime).to receive(:now).and_return(@now)
-      @hash = "some-dummy-sha2-hash"
-      allow(Digest::SHA2).to receive(:new).and_return(@hash)
+      allow(DateTime).to receive(:now).and_return(DateTime.now)
+      expect(Digest::SHA2).to receive(:new).and_return(hash)
     end
 
-    it "gets the download link" do
-      get 'new_download', id: file.pid
-      expect(response).to be_success
-      expect(assigns[:link]).to eq @routes.url_helpers.download_single_use_link_path(@hash)
+    describe "GET 'download'" do
+      it "and_return http success" do
+        get 'new_download', id: file
+        expect(response).to be_success
+        expect(assigns[:link]).to eq routes.url_helpers.download_single_use_link_path(hash)
+      end
     end
 
-    it "gets the show link" do
-      get 'new_show', id: file.pid
-      expect(response).to be_success
-      expect(assigns[:link]).to eq @routes.url_helpers.show_single_use_link_path(@hash)
+    describe "GET 'show'" do
+      it "and_return http success" do
+        get 'new_show', id: file
+        expect(response).to be_success
+        expect(assigns[:link]).to eq routes.url_helpers.show_single_use_link_path(hash)
+      end
     end
   end
 
   describe "logged in user without edit permission" do
     before do
       @other_user = FactoryGirl.find_or_create(:archivist)
+      file.read_users << @other_user
+      file.save
       sign_in @other_user
       file.read_users << @other_user
       file.save
@@ -56,7 +49,7 @@ describe SingleUseLinksController, :type => :controller do
 
     describe "GET 'download'" do
       it "and_return http success" do
-        get 'new_download', id: file.pid
+        get 'new_download', id: file
         expect(response).not_to be_success
       end
 
@@ -64,7 +57,7 @@ describe SingleUseLinksController, :type => :controller do
 
     describe "GET 'show'" do
       it "and_return http success" do
-        get 'new_show', id: file.pid
+        get 'new_show', id: file
         expect(response).not_to be_success
       end
 
@@ -74,14 +67,14 @@ describe SingleUseLinksController, :type => :controller do
   describe "unknown user" do
     describe "GET 'download'" do
       it "and_return http failure" do
-        get 'new_download', id: file.pid
+        get 'new_download', id: file
         expect(response).not_to be_success
       end
     end
 
     describe "GET 'show'" do
       it "and_return http failure" do
-        get 'new_show', id: file.pid
+        get 'new_show', id: file
         expect(response).not_to be_success
       end
     end

data/spec/controllers/single_use_links_viewer_controller_spec.rb

@@ -1,34 +1,21 @@
 require 'spec_helper'
 
-describe SingleUseLinksViewerController, :type => :controller do
-  before(:all) do
-    @user = FactoryGirl.find_or_create(:jill)
-    @file = GenericFile.new
-    @file.add_file(File.open(fixture_path + '/world.png'), 'content', 'world.png')
-    @file.apply_depositor_metadata(@user)
-    @file.save
-    @file2 = GenericFile.new
-    @file2.add_file(File.open(fixture_path + '/world.png'), 'content', 'world.png')
-    @file2.apply_depositor_metadata('mjg36')
-    @file2.save
-  end
-  after(:all) do
-    @file.delete
-    @file2.delete
-    SingleUseLink.delete_all
-  end
-  before do
-    allow(controller).to receive(:has_access?).and_return(true)
-    allow(controller).to receive(:clear_session_user) ## Don't clear out the authenticated session
+describe SingleUseLinksViewerController do
+  let(:file) do
+    GenericFile.new.tap do |file|
+      file.add_file(File.open(fixture_path + '/world.png'), 'content', 'world.png')
+      file.apply_depositor_metadata('mjg')
+      file.save!
+    end
   end
-  
+
   describe "retrieval links" do
     let :show_link do
-      SingleUseLink.create itemId: @file.pid, path: Sufia::Engine.routes.url_helpers.generic_file_path(id: @file)
+      SingleUseLink.create itemId: file.id, path: routes.url_helpers.generic_file_path(id: file)
     end
 
     let :download_link do
-      SingleUseLink.create itemId: @file.pid, path: Sufia::Engine.routes.url_helpers.download_path(id: @file)
+      SingleUseLink.create itemId: file.id, path: routes.url_helpers.download_path(id: file)
     end
 
     let :show_link_hash do
@@ -39,26 +26,25 @@ describe SingleUseLinksViewerController, :type => :controller do
       download_link.downloadKey
     end
 
-    before (:each) do
-      @user.delete
-    end
     describe "GET 'download'" do
+      let(:expected_content) { ActiveFedora::Base.find(file.id).content.content }
+
       it "and_return http success" do
-        allow(controller).to receive(:render)
-        expected_content = ActiveFedora::Base.find(@file.pid, cast: true).content.content
-        expect(controller).to receive(:send_file_headers!).with({filename: 'world.png', disposition: 'inline', type: 'image/png' })
-        get :download, id:download_link_hash 
-        expect(response.body).to eq(expected_content)
+        expect(controller).to receive(:send_file_headers!).with(filename: 'world.png', disposition: 'inline', type: 'image/png')
+        get :download, id: download_link_hash
+        expect(response.body).to eq expected_content
         expect(response).to be_success
       end
+
       it "and_return 404 on second attempt" do
-        get :download, id:download_link_hash
+        get :download, id: download_link_hash
         expect(response).to be_success
-        get :download, id:download_link_hash
-        expect(response).to render_template('error/single_use_error') 
+        get :download, id: download_link_hash
+        expect(response).to render_template('error/single_use_error')
       end
+
       it "and_return 404 on attempt to get download with show" do
-        get :download, id:download_link_hash
+        get :download, id: download_link_hash
         expect(response).to be_success
         get :show, id:download_link_hash
         expect(response).to render_template('error/single_use_error')
@@ -67,19 +53,19 @@ describe SingleUseLinksViewerController, :type => :controller do
 
     describe "GET 'show'" do
       it "and_return http success" do
-
-        get 'show', id:show_link_hash
+        get 'show', id: show_link_hash
         expect(response).to be_success
-        expect(assigns[:asset].pid).to eq(@file.pid)
+        expect(assigns[:asset].id).to eq file.id
       end
+
       it "and_return 404 on second attempt" do
-        get :show, id:show_link_hash
+        get :show, id: show_link_hash
         expect(response).to be_success
-        get :show, id:show_link_hash
+        get :show, id: show_link_hash
         expect(response).to render_template('error/single_use_error')
       end
       it "and_return 404 on attempt to get show path with download hash" do
-        get :show, id:download_link_hash
+        get :show, id: download_link_hash
         expect(response).to render_template('error/single_use_error')
       end
     end

data/spec/controllers/transfers_controller_spec.rb

@@ -29,9 +29,9 @@ describe TransfersController, :type => :controller do
         get :index
         expect(response).to be_success
         expect(assigns[:incoming].first).to be_kind_of ProxyDepositRequest
-        expect(assigns[:incoming].first.pid).to eq(incoming_file.pid)
+        expect(assigns[:incoming].first.pid).to eq(incoming_file.id)
         expect(assigns[:outgoing].first).to be_kind_of ProxyDepositRequest
-        expect(assigns[:outgoing].first.pid).to eq(outgoing_file.pid)
+        expect(assigns[:outgoing].first.pid).to eq(outgoing_file.id)
       end
 
       describe "When the incoming request is for a deleted file" do
@@ -60,7 +60,7 @@ describe TransfersController, :type => :controller do
           expect(response).to be_success
           expect(assigns[:generic_file]).to eq(file)
           expect(assigns[:proxy_deposit_request]).to be_kind_of ProxyDepositRequest
-          expect(assigns[:proxy_deposit_request].pid).to eq(file.pid)
+          expect(assigns[:proxy_deposit_request].pid).to eq(file.id)
         end
       end
     end
@@ -75,12 +75,12 @@ describe TransfersController, :type => :controller do
       it "should be successful" do
         allow_any_instance_of(User).to receive(:display_name).and_return("Jill Z. User")
         expect {
-          post :create, id: file.id, proxy_deposit_request: {transfer_to: another_user.user_key}
+          post :create, id: file, proxy_deposit_request: {transfer_to: another_user.user_key}
         }.to change(ProxyDepositRequest, :count).by(1)
         expect(response).to redirect_to @routes.url_helpers.transfers_path
         expect(flash[:notice]).to eq('Transfer request created')
         proxy_request = another_user.proxy_deposit_requests.first
-        expect(proxy_request.pid).to eq(file.pid)
+        expect(proxy_request.pid).to eq(file.id)
         expect(proxy_request.sending_user).to eq(user)
         # AND A NOTIFICATION SHOULD HAVE BEEN CREATED
         notification = another_user.reload.mailbox.inbox[0].messages[0]
@@ -89,7 +89,7 @@ describe TransfersController, :type => :controller do
       end
       it "should give an error if the user is not found" do
         expect {
-          post :create, id: file.id, proxy_deposit_request: {transfer_to: 'foo' }
+          post :create, id: file, proxy_deposit_request: {transfer_to: 'foo' }
         }.not_to change(ProxyDepositRequest, :count)
         expect(assigns[:proxy_deposit_request].errors[:transfer_to]).to eq(['must be an existing user'])
         expect(response).to redirect_to(root_path)

data/spec/controllers/users_controller_spec.rb

@@ -1,17 +1,16 @@
 require 'spec_helper'
 
 describe UsersController, :type => :controller do
+  let(:user) { FactoryGirl.create(:user) }
   before(:each) do
-    @user = FactoryGirl.find_or_create(:jill)
-    @another_user = FactoryGirl.find_or_create(:archivist)
-    sign_in @user
+    sign_in user
     allow_any_instance_of(User).to receive(:groups).and_return([])
     allow(controller).to receive(:clear_session_user) ## Don't clear out the authenticated session
   end
 
   describe "#show" do
     it "show the user profile if user exists" do
-      get :show, id: @user.user_key
+      get :show, id: user.user_key
       expect(response).to be_success
       expect(response).to_not redirect_to(root_path)
       expect(flash[:alert]).to be_nil
@@ -23,10 +22,9 @@ describe UsersController, :type => :controller do
     end
 
     describe "when the user has trophies" do
-      let(:user) { @user }
-      let(:file1) { GenericFile.new.tap { |f| f.apply_depositor_metadata(user); f.save! } }
-      let(:file2) { GenericFile.new.tap { |f| f.apply_depositor_metadata(user); f.save! } }
-      let(:file3) { GenericFile.new.tap { |f| f.apply_depositor_metadata(user); f.save! } }
+      let(:file1) { GenericFile.create { |f| f.apply_depositor_metadata(user) } }
+      let(:file2) { GenericFile.create { |f| f.apply_depositor_metadata(user) } }
+      let(:file3) { GenericFile.create { |f| f.apply_depositor_metadata(user) } }
       let!(:trophy1) { user.trophies.create!(generic_file_id: file1.noid) }
       let!(:trophy2) { user.trophies.create!(generic_file_id: file2.noid) }
       let!(:trophy3) { user.trophies.create!(generic_file_id: file3.noid) }
@@ -40,14 +38,13 @@ describe UsersController, :type => :controller do
     end
   end
   describe "#index" do
-    before do
-      @u1 = FactoryGirl.find_or_create(:archivist)
-      @u2 = FactoryGirl.find_or_create(:curator)
-    end
+    let!(:u1) { FactoryGirl.create(:user) }
+    let!(:u2) { FactoryGirl.create(:user) }
+
     describe "requesting html" do
       it "should test users" do
         get :index
-        expect(assigns[:users]).to include(@u1, @u2)
+        expect(assigns[:users]).to include(u1, u2)
         expect(response).to be_successful
       end
     end
@@ -56,154 +53,159 @@ describe UsersController, :type => :controller do
         get :index, format: :json
         expect(response).to be_successful
         json = JSON.parse(response.body)
-        expect(json.map{|u| u['id']}).to include(@u1.email, @u2.email)
-        expect(json.map{|u| u['text']}).to include(@u1.email, @u2.email)
+        expect(json.map{|u| u['id']}).to include(u1.email, u2.email)
+        expect(json.map{|u| u['text']}).to include(u1.email, u2.email)
       end
     end
+
     describe "query users"  do
       it "finds the expected user via email" do
-        get :index,  uq: @u1.email
-        expect(assigns[:users]).to include(@u1)
-        expect(assigns[:users]).to_not include(@u2)
+        get :index,  uq: u1.email
+        expect(assigns[:users]).to include(u1)
+        expect(assigns[:users]).to_not include(u2)
         expect(response).to be_successful
       end
+
       it "finds the expected user via display name" do
-        @u1.display_name = "Dr. Curator"
-        @u1.save
-        @u2.display_name = "Jr. Architect"
-        @u2.save
+        u1.display_name = "Dr. Curator"
+        u1.save
+        u2.display_name = "Jr. Architect"
+        u2.save
         allow_any_instance_of(User).to receive(:display_name).and_return("Dr. Curator", "Jr.Archivist")
-        get :index,  uq: @u1.display_name
-        expect(assigns[:users]).to include(@u1)
-        expect(assigns[:users]).to_not include(@u2)
+        get :index,  uq: u1.display_name
+        expect(assigns[:users]).to include(u1)
+        expect(assigns[:users]).to_not include(u2)
         expect(response).to be_successful
-        @u1.display_name = nil
-        @u1.save
-        @u2.display_name = nil
-        @u2.save
+        u1.display_name = nil
+        u1.save
+        u2.display_name = nil
+        u2.save
       end
+
       it "uses the base query" do
-        u3 = FactoryGirl.find_or_create(:jill)
-        allow(controller).to receive(:base_query).and_return(['email == "jilluser@example.com"'])
+        u3 = FactoryGirl.create(:user)
+        allow(controller).to receive(:base_query).and_return(["email == \"#{u3.email}\""])
         get :index
         expect(assigns[:users]).to include(u3)
-        expect(assigns[:users]).to_not include(@u1, @u2)
+        expect(assigns[:users]).to_not include(u1, u2)
         u3.destroy
       end
     end
   end
   describe "#edit" do
+
     it "show edit form when user edits own profile" do
-      get :edit, id: @user.user_key
+      get :edit, id: user.user_key
       expect(response).to be_success
       expect(response).to render_template('users/edit')
       expect(flash[:alert]).to be_nil
     end
-    it "redirects to show profile when user attempts to edit another profile" do
-      get :edit, id: @another_user.user_key
-      expect(response).to redirect_to(@routes.url_helpers.profile_path(@another_user.to_param))
-      expect(flash[:alert]).to include("Permission denied: cannot access this page.")
+
+    context "when user attempts to edit another profile" do
+      let(:another_user) { FactoryGirl.create(:user) }
+      it "redirects to show profile" do
+        get :edit, id: another_user.user_key
+        expect(response).to redirect_to(@routes.url_helpers.profile_path(another_user.to_param))
+        expect(flash[:alert]).to include("Permission denied: cannot access this page.")
+      end
     end
+
     describe "when the user has trophies" do
-      let(:user) { @user }
-      let(:file1) { GenericFile.new.tap { |f| f.apply_depositor_metadata(user); f.save! } }
-      let(:file2) { GenericFile.new.tap { |f| f.apply_depositor_metadata(user); f.save! } }
-      let(:file3) { GenericFile.new.tap { |f| f.apply_depositor_metadata(user); f.save! } }
+      let(:file1) { GenericFile.create { |f| f.apply_depositor_metadata(user) } }
+      let(:file2) { GenericFile.create { |f| f.apply_depositor_metadata(user) } }
+      let(:file3) { GenericFile.create { |f| f.apply_depositor_metadata(user) } }
       let!(:trophy1) { user.trophies.create!(generic_file_id: file1.noid) }
       let!(:trophy2) { user.trophies.create!(generic_file_id: file2.noid) }
       let!(:trophy3) { user.trophies.create!(generic_file_id: file3.noid) }
 
       it "show the user profile if user exists" do
-        get :edit, id: @user.user_key
+        get :edit, id: user.user_key
         expect(response).to be_success
         expect(assigns[:trophies]).to match_array([file1, file2, file3])
       end
 
     end
   end
+
   describe "#update" do
-    it "should not allow other users to update" do
-      post :update, id: @another_user.user_key, user: { avatar: nil }
-      expect(response).to redirect_to(@routes.url_helpers.profile_path(@another_user.to_param))
-      expect(flash[:alert]).to include("Permission denied: cannot access this page.")
+    context "the profile of another user" do
+      let(:another_user) { FactoryGirl.create(:user) }
+      it "should not allow other users to update" do
+        post :update, id: another_user.user_key, user: { avatar: nil }
+        expect(response).to redirect_to(@routes.url_helpers.profile_path(another_user.to_param))
+        expect(flash[:alert]).to include("Permission denied: cannot access this page.")
+      end
     end
+
     it "should set an avatar and redirect to profile" do
-      expect(@user.avatar?).to be false
+      expect(user.avatar?).to be false
       s1 = double('one')
-      expect(UserEditProfileEventJob).to receive(:new).with(@user.user_key).and_return(s1)
+      expect(UserEditProfileEventJob).to receive(:new).with(user.user_key).and_return(s1)
       expect(Sufia.queue).to receive(:push).with(s1).once
       f = fixture_file_upload('/1.5mb-avatar.jpg', 'image/jpg')
-      post :update, id: @user.user_key, user: { avatar: f }
-      expect(response).to redirect_to(@routes.url_helpers.profile_path(@user.to_param))
+      post :update, id: user.user_key, user: { avatar: f }
+      expect(response).to redirect_to(@routes.url_helpers.profile_path(user.to_param))
       expect(flash[:notice]).to include("Your profile has been updated")
-      expect(User.find_by_user_key(@user.user_key).avatar?).to be true
+      expect(User.find_by_user_key(user.user_key).avatar?).to be true
     end
     it "should validate the content type of an avatar" do
       expect(Sufia.queue).to receive(:push).never
       f = fixture_file_upload('/image.jp2', 'image/jp2')
-      post :update, id: @user.user_key, user: { avatar: f }
-      expect(response).to redirect_to(@routes.url_helpers.edit_profile_path(@user.to_param))
+      post :update, id: user.user_key, user: { avatar: f }
+      expect(response).to redirect_to(@routes.url_helpers.edit_profile_path(user.to_param))
       expect(flash[:alert]).to include("Avatar You are not allowed to upload \"jp2\" files, allowed types: jpg, jpeg, png, gif, bmp, tif, tiff")
     end
     it "should validate the size of an avatar" do
       f = fixture_file_upload('/4-20.png', 'image/png')
       expect(Sufia.queue).to receive(:push).never
-      post :update, id: @user.user_key, user: { avatar: f }
-      expect(response).to redirect_to(@routes.url_helpers.edit_profile_path(@user.to_param))
+      post :update, id: user.user_key, user: { avatar: f }
+      expect(response).to redirect_to(@routes.url_helpers.edit_profile_path(user.to_param))
       expect(flash[:alert]).to include("Avatar file size must be less than 2MB")
     end
+
     context "user with existing avatar" do
       before do
         f = fixture_file_upload('/world.png', 'image/png')
-        @user.avatar = f
-        @user.save
+        user.update(avatar: f)
       end
+
       it "should delete an avatar" do
         s1 = double('one')
-        expect(UserEditProfileEventJob).to receive(:new).with(@user.user_key).and_return(s1)
+        expect(UserEditProfileEventJob).to receive(:new).with(user.user_key).and_return(s1)
         expect(Sufia.queue).to receive(:push).with(s1).once
-        post :update, id: @user.user_key, user: { remove_avatar: 'true' }
-        expect(response).to redirect_to(@routes.url_helpers.profile_path(@user.to_param))
+        post :update, id: user.user_key, user: { remove_avatar: true }
+        expect(response).to redirect_to(@routes.url_helpers.profile_path(user.to_param))
         expect(flash[:notice]).to include("Your profile has been updated")
-        expect(User.find_by_user_key(@user.user_key).avatar?).to be false
+        expect(User.find_by_user_key(user.user_key).avatar?).to be false
       end
     end
+
     it "should refresh directory attributes" do
       s1 = double('one')
-      expect(UserEditProfileEventJob).to receive(:new).with(@user.user_key).and_return(s1)
+      expect(UserEditProfileEventJob).to receive(:new).with(user.user_key).and_return(s1)
       expect(Sufia.queue).to receive(:push).with(s1).once
-      expect_any_instance_of(User).to receive(:populate_attributes).once.and_call_original
-      post :update, id: @user.user_key, user: { update_directory: 'true' }
-      expect(response).to redirect_to(@routes.url_helpers.profile_path(@user.to_param))
+      expect_any_instance_of(User).to receive(:populate_attributes).once
+      post :update, id: user.user_key, user: { update_directory: true }
+      expect(response).to redirect_to(@routes.url_helpers.profile_path(user.to_param))
       expect(flash[:notice]).to include("Your profile has been updated")
     end
-
     it "should set an social handles" do
-      expect(@user.twitter_handle).to be_blank
-      expect(@user.facebook_handle).to be_blank
-      expect(@user.googleplus_handle).to be_blank
-      expect(@user.linkedin_handle).to be_blank
-      expect(@user.orcid).to be_blank
-      post :update, id: @user.user_key, user: { twitter_handle: 'twit', facebook_handle: 'face', googleplus_handle: 'goo', linkedin_handle: "link", orcid: '0000-0000-1111-2222' }
-      expect(response).to redirect_to(@routes.url_helpers.profile_path(@user.to_param))
+      expect(user.twitter_handle).to be_blank
+      expect(user.facebook_handle).to be_blank
+      expect(user.googleplus_handle).to be_blank
+      expect(user.linkedin_handle).to be_blank
+      post :update, id: user.user_key, user: { twitter_handle: 'twit', facebook_handle: 'face', googleplus_handle: 'goo', linkedin_handle:"link" }
+      expect(response).to redirect_to(@routes.url_helpers.profile_path(user.to_param))
       expect(flash[:notice]).to include("Your profile has been updated")
-      u = User.find_by_user_key(@user.user_key)
+      u = User.find_by_user_key(user.user_key)
       expect(u.twitter_handle).to eq 'twit'
       expect(u.facebook_handle).to eq 'face'
       expect(u.googleplus_handle).to eq 'goo'
       expect(u.linkedin_handle).to eq 'link'
-      expect(u.orcid).to eq 'http://orcid.org/0000-0000-1111-2222'
-    end
-    it 'displays a flash when invalid ORCID is entered' do
-      expect(@user.orcid).to be_blank
-      post :update, id: @user.user_key, user: { orcid: 'foobar' }
-      expect(response).to redirect_to(@routes.url_helpers.edit_profile_path(@user.to_param))
-      expect(flash[:alert]).to include('Orcid must be a string of 19 characters, e.g., "0000-0000-0000-0000"')
     end
 
     context "when removing a trophy" do
-      let(:user) { @user }
-      let(:file) { GenericFile.new.tap { |f| f.apply_depositor_metadata(user); f.save! } }
+      let(:file) { GenericFile.create { |f| f.apply_depositor_metadata(user) } }
       before do
         user.trophies.create!(generic_file_id: file.noid)
       end
@@ -218,80 +220,75 @@ describe UsersController, :type => :controller do
   end
 
   describe "#follow" do
-    after(:all) do
-      @user.unfollow(@another_user) rescue nil
-    end
+    let(:another_user) { FactoryGirl.create(:user) }
     it "should follow another user if not already following, and log an event" do
-      expect(@user.following?(@another_user)).to be false
+      expect(user.following?(another_user)).to be false
       s1 = double('one')
-      expect(UserFollowEventJob).to receive(:new).with(@user.user_key, @another_user.user_key).and_return(s1)
+      expect(UserFollowEventJob).to receive(:new).with(user.user_key, another_user.user_key).and_return(s1)
       expect(Sufia.queue).to receive(:push).with(s1).once
-      post :follow, id: @another_user.user_key
-      expect(response).to redirect_to(@routes.url_helpers.profile_path(@another_user.to_param))
-      expect(flash[:notice]).to include("You are following #{@another_user.user_key}")
+      post :follow, id: another_user.user_key
+      expect(response).to redirect_to(@routes.url_helpers.profile_path(another_user.to_param))
+      expect(flash[:notice]).to include("You are following #{another_user.user_key}")
     end
     it "should redirect to profile if already following and not log an event" do
-      allow_any_instance_of(User).to receive(:following?).with(@another_user).and_return(true)
+      allow_any_instance_of(User).to receive(:following?).with(another_user).and_return(true)
       expect(Sufia.queue).to receive(:push).never
-      post :follow, id: @another_user.user_key
-      expect(response).to redirect_to(@routes.url_helpers.profile_path(@another_user.to_param))
-      expect(flash[:notice]).to include("You are following #{@another_user.user_key}")
+      post :follow, id: another_user.user_key
+      expect(response).to redirect_to(@routes.url_helpers.profile_path(another_user.to_param))
+      expect(flash[:notice]).to include("You are following #{another_user.user_key}")
     end
     it "should redirect to profile if user attempts to self-follow and not log an event" do
       expect(Sufia.queue).to receive(:push).never
-      post :follow, id: @user.user_key
-      expect(response).to redirect_to(@routes.url_helpers.profile_path(@user.to_param))
+      post :follow, id: user.user_key
+      expect(response).to redirect_to(@routes.url_helpers.profile_path(user.to_param))
       expect(flash[:alert]).to include("You cannot follow or unfollow yourself")
     end
   end
+
   describe "#unfollow" do
+    let(:another_user) { FactoryGirl.create(:user) }
     it "should unfollow another user if already following, and log an event" do
-      allow_any_instance_of(User).to receive(:following?).with(@another_user).and_return(true)
+      allow_any_instance_of(User).to receive(:following?).with(another_user).and_return(true)
       s1 = double('one')
-      expect(UserUnfollowEventJob).to receive(:new).with(@user.user_key, @another_user.user_key).and_return(s1)
+      expect(UserUnfollowEventJob).to receive(:new).with(user.user_key, another_user.user_key).and_return(s1)
       expect(Sufia.queue).to receive(:push).with(s1).once
-      post :unfollow, id: @another_user.user_key
-      expect(response).to redirect_to(@routes.url_helpers.profile_path(@another_user.to_param))
-      expect(flash[:notice]).to include("You are no longer following #{@another_user.user_key}")
+      post :unfollow, id: another_user.user_key
+      expect(response).to redirect_to(@routes.url_helpers.profile_path(another_user.to_param))
+      expect(flash[:notice]).to include("You are no longer following #{another_user.user_key}")
     end
     it "should redirect to profile if not following and not log an event" do
-      allow(@user).to receive(:following?).with(@another_user).and_return(false)
+      allow(user).to receive(:following?).with(another_user).and_return(false)
       expect(Sufia.queue).to receive(:push).never
-      post :unfollow, id: @another_user.user_key
-      expect(response).to redirect_to(@routes.url_helpers.profile_path(@another_user.to_param))
-      expect(flash[:notice]).to include("You are no longer following #{@another_user.user_key}")
+      post :unfollow, id: another_user.user_key
+      expect(response).to redirect_to(@routes.url_helpers.profile_path(another_user.to_param))
+      expect(flash[:notice]).to include("You are no longer following #{another_user.user_key}")
     end
     it "should redirect to profile if user attempts to self-follow and not log an event" do
       expect(Sufia.queue).to receive(:push).never
-      post :unfollow, id: @user.user_key
-      expect(response).to redirect_to(@routes.url_helpers.profile_path(@user.to_param))
+      post :unfollow, id: user.user_key
+      expect(response).to redirect_to(@routes.url_helpers.profile_path(user.to_param))
       expect(flash[:alert]).to include("You cannot follow or unfollow yourself")
     end
   end
+
   describe "#toggle_trophy" do
-     before do
-       @file = GenericFile.new()
-       @file.apply_depositor_metadata(@user)
-       @file.save
-       @file_id = @file.pid.split(":").last
-     end
-     after do
-       @file.delete
-     end
+     let(:file) { GenericFile.create { |f| f.apply_depositor_metadata(user) } }
+     let(:file_id) { file.id }
+     let(:another_user) { FactoryGirl.create(:user) }
+
      it "should trophy a file" do
-      post :toggle_trophy, {id: @user.user_key, file_id: @file_id}
+      post :toggle_trophy, {id: user.user_key, file_id: file_id}
       json = JSON.parse(response.body)
-      expect(json['user_id']).to eq @user.id
-      expect(json['generic_file_id']).to eq @file_id
+      expect(json['user_id']).to eq user.id
+      expect(json['generic_file_id']).to eq file_id
     end
      it "should not trophy a file for a different user" do
-      post :toggle_trophy, {id: @another_user.user_key, file_id: @file_id}
+      post :toggle_trophy, {id: another_user.user_key, file_id: file_id}
       expect(response).to_not be_success
     end
      it "should not trophy a file with no edit privs" do
-      sign_out @user
-      sign_in @another_user
-      post :toggle_trophy, {id: @another_user.user_key, file_id: @file_id}
+      sign_in another_user
+      post :toggle_trophy, {id: another_user.user_key, file_id: file_id}
       expect(response).to_not be_success
     end
   end