sufia 7.0.0.beta3 → 7.0.0.beta4

data/spec/controllers/sufia/trophies_controller_spec.rb

@@ -0,0 +1,27 @@
+RSpec.describe Sufia::TrophiesController do
+  describe "#toggle_trophy" do
+    let(:user) { create(:user) }
+    let(:work) { create(:work, user: user) }
+    let(:work_id) { work.id }
+
+    context "for a work we have edit access on" do
+      before do
+        sign_in user
+      end
+      it "creates a trophy for a work" do
+        post :toggle_trophy, id: work_id
+        expect(response).to be_success
+        json = JSON.parse(response.body)
+        expect(json['user_id']).to eq user.id
+        expect(json['work_id']).to eq work_id
+      end
+    end
+
+    context "for a work that we don't have edit access on" do
+      it "does not create a trophy" do
+        post :toggle_trophy, id: work_id
+        expect(response).not_to be_success
+      end
+    end
+  end
+end

data/spec/controllers/transfers_controller_spec.rb

@@ -83,7 +83,7 @@ describe TransfersController, type: :controller do
         expect {
           post :create, id: work.id, 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(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.work_id).to eq(work.id)
@@ -91,7 +91,7 @@ describe TransfersController, type: :controller do
         # AND A NOTIFICATION SHOULD HAVE BEEN CREATED
         notification = another_user.reload.mailbox.inbox[0].messages[0]
         expect(notification.subject).to eq("Ownership Change Request")
-        expect(notification.body).to eq("<a href=\"/users/#{user.user_key}\">#{user.name}</a> wants to transfer a work to you. Review all <a href=\"#{@routes.url_helpers.transfers_path}\">transfer requests</a>")
+        expect(notification.body).to eq("<a href=\"/users/#{user.user_key}\">#{user.name}</a> wants to transfer a work to you. Review all <a href=\"#{routes.url_helpers.transfers_path}\">transfer requests</a>")
       end
       it "gives an error if the user is not found" do
         expect {
@@ -113,21 +113,21 @@ describe TransfersController, type: :controller do
         end
         it "is successful when retaining access rights" do
           put :accept, id: user.proxy_deposit_requests.first
-          expect(response).to redirect_to @routes.url_helpers.transfers_path
+          expect(response).to redirect_to routes.url_helpers.transfers_path
           expect(flash[:notice]).to eq("Transfer complete")
           expect(assigns[:proxy_deposit_request].status).to eq('accepted')
           expect(incoming_work.reload.edit_users).to eq([another_user.user_key, user.user_key])
         end
         it "is successful when resetting access rights" do
           put :accept, id: user.proxy_deposit_requests.first, reset: true
-          expect(response).to redirect_to @routes.url_helpers.transfers_path
+          expect(response).to redirect_to routes.url_helpers.transfers_path
           expect(flash[:notice]).to eq("Transfer complete")
           expect(assigns[:proxy_deposit_request].status).to eq('accepted')
           expect(incoming_work.reload.edit_users).to eq([user.user_key])
         end
         it "handles sticky requests" do
           put :accept, id: user.proxy_deposit_requests.first, sticky: true
-          expect(response).to redirect_to @routes.url_helpers.transfers_path
+          expect(response).to redirect_to routes.url_helpers.transfers_path
           expect(flash[:notice]).to eq("Transfer complete")
           expect(assigns[:proxy_deposit_request].status).to eq('accepted')
           expect(user.can_receive_deposits_from).to include(another_user)
@@ -161,7 +161,7 @@ describe TransfersController, type: :controller do
         end
         it "is successful" do
           put :reject, id: user.proxy_deposit_requests.first
-          expect(response).to redirect_to @routes.url_helpers.transfers_path
+          expect(response).to redirect_to routes.url_helpers.transfers_path
           expect(flash[:notice]).to eq("Transfer rejected")
           expect(assigns[:proxy_deposit_request].status).to eq('rejected')
         end
@@ -194,7 +194,7 @@ describe TransfersController, type: :controller do
         end
         it "is successful" do
           delete :destroy, id: another_user.proxy_deposit_requests.first
-          expect(response).to redirect_to @routes.url_helpers.transfers_path
+          expect(response).to redirect_to routes.url_helpers.transfers_path
           expect(flash[:notice]).to eq("Transfer canceled")
         end
       end

data/spec/controllers/users_controller_spec.rb

@@ -10,30 +10,14 @@ describe UsersController, type: :controller do
     it "show the user profile if user exists" do
       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
+      expect(assigns[:presenter]).to be_kind_of Sufia::UserProfilePresenter
     end
+
     it "redirects to root if user does not exist" do
       get :show, id: 'johndoe666'
       expect(response).to redirect_to(root_path)
       expect(flash[:alert]).to include("User 'johndoe666' does not exist")
     end
-
-    describe "when the user has trophies" do
-      let(:work1) { GenericWork.create(title: ["w1"]) { |w| w.apply_depositor_metadata(user) } }
-      let(:work2) { GenericWork.create(title: ["w2"]) { |w| w.apply_depositor_metadata(user) } }
-      let(:work3) { GenericWork.create(title: ["w3"]) { |w| w.apply_depositor_metadata(user) } }
-      let!(:trophy1) { user.trophies.create!(work_id: work1.id) }
-      let!(:trophy2) { user.trophies.create!(work_id: work2.id) }
-      let!(:trophy3) { user.trophies.create!(work_id: work3.id) }
-      let!(:badtrophy) { user.trophies.create!(work_id: 'not_a_generic_work') }
-
-      it "show the user profile if user exists" do
-        get :show, id: user.user_key
-        expect(response).to be_success
-        expect(assigns[:trophies]).to match_array([work1, work2, work3])
-      end
-    end
   end
   describe "#index" do
     let!(:u1) { FactoryGirl.create(:user) }
@@ -60,7 +44,7 @@ describe UsersController, type: :controller 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)
+        expect(assigns[:users]).not_to include(u2)
         expect(response).to be_successful
       end
 
@@ -72,7 +56,7 @@ describe UsersController, type: :controller do
         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)
+        expect(assigns[:users]).not_to include(u2)
         expect(response).to be_successful
         u1.display_name = nil
         u1.save
@@ -85,7 +69,7 @@ describe UsersController, type: :controller do
         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]).not_to include(u1, u2)
         u3.destroy
       end
     end
@@ -105,7 +89,7 @@ describe UsersController, type: :controller do
         it "redirects to show profile" do
           expect_any_instance_of(Ability).to receive(:can?).with(:edit, another_user).and_return(false)
           get :edit, id: another_user.to_param
-          expect(response).to redirect_to(@routes.url_helpers.profile_path(another_user.to_param))
+          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
@@ -116,7 +100,7 @@ describe UsersController, type: :controller do
         it "allows user to edit another user's profile" do
           get :edit, id: another_user.to_param
           expect(response).to be_success
-          expect(response).not_to redirect_to(@routes.url_helpers.profile_path(another_user.to_param))
+          expect(response).not_to redirect_to(routes.url_helpers.profile_path(another_user.to_param))
           expect(flash[:alert]).to be_nil
         end
       end
@@ -143,7 +127,7 @@ describe UsersController, type: :controller do
       let(:another_user) { FactoryGirl.create(:user) }
       it "does 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(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
@@ -153,7 +137,7 @@ describe UsersController, type: :controller do
       expect(UserEditProfileEventJob).to receive(:perform_later).with(user)
       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))
+      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
     end
@@ -161,14 +145,14 @@ describe UsersController, type: :controller do
       expect(UserEditProfileEventJob).to receive(:perform_later).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))
+      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 "validates the size of an avatar" do
       f = fixture_file_upload('/4-20.png', 'image/png')
       expect(UserEditProfileEventJob).to receive(:perform_later).never
       post :update, id: user.user_key, user: { avatar: f }
-      expect(response).to redirect_to(@routes.url_helpers.edit_profile_path(user.to_param))
+      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
 
@@ -181,7 +165,7 @@ describe UsersController, type: :controller do
       it "deletes an avatar" do
         expect(UserEditProfileEventJob).to receive(:perform_later).with(user)
         post :update, id: user.user_key, user: { remove_avatar: 'true' }
-        expect(response).to redirect_to(@routes.url_helpers.profile_path(user.to_param))
+        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
       end
@@ -191,7 +175,7 @@ describe UsersController, type: :controller do
       expect(UserEditProfileEventJob).to receive(:perform_later).with(user)
       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(response).to redirect_to(routes.url_helpers.profile_path(user.to_param))
       expect(flash[:notice]).to include("Your profile has been updated")
     end
 
@@ -202,7 +186,7 @@ describe UsersController, type: :controller do
       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(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)
       expect(u.twitter_handle).to eq 'twit'
@@ -215,7 +199,7 @@ describe UsersController, type: :controller do
     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(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
 
@@ -228,7 +212,7 @@ describe UsersController, type: :controller do
         expect {
           post :update, id: user.user_key, 'remove_trophy_' + work.id => 'yes'
         }.to change { user.trophies.count }.by(-1)
-        expect(response).to redirect_to(@routes.url_helpers.profile_path(user.to_param))
+        expect(response).to redirect_to(routes.url_helpers.profile_path(user.to_param))
         expect(flash[:notice]).to include("Your profile has been updated")
       end
     end
@@ -240,20 +224,20 @@ describe UsersController, type: :controller do
       expect(user.following?(another_user)).to be false
       expect(UserFollowEventJob).to receive(:perform_later).with(user, another_user)
       post :follow, id: another_user.user_key
-      expect(response).to redirect_to(@routes.url_helpers.profile_path(another_user.to_param))
+      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 "redirects 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)
       expect(UserFollowEventJob).to receive(:perform_later).never
       post :follow, id: another_user.user_key
-      expect(response).to redirect_to(@routes.url_helpers.profile_path(another_user.to_param))
+      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 "redirects to profile if user attempts to self-follow and not log an event" do
       expect(UserFollowEventJob).to receive(:perform_later).never
       post :follow, id: user.user_key
-      expect(response).to redirect_to(@routes.url_helpers.profile_path(user.to_param))
+      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
@@ -264,43 +248,21 @@ describe UsersController, type: :controller do
       allow_any_instance_of(User).to receive(:following?).with(another_user).and_return(true)
       expect(UserUnfollowEventJob).to receive(:perform_later).with(user, another_user).once
       post :unfollow, id: another_user.user_key
-      expect(response).to redirect_to(@routes.url_helpers.profile_path(another_user.to_param))
+      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 "redirects to profile if not following and not log an event" do
       allow(user).to receive(:following?).with(another_user).and_return(false)
       expect(UserUnfollowEventJob).to receive(:perform_later).never
       post :unfollow, id: another_user.user_key
-      expect(response).to redirect_to(@routes.url_helpers.profile_path(another_user.to_param))
+      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 "redirects to profile if user attempts to self-follow and not log an event" do
       expect(UserUnfollowEventJob).to receive(:perform_later).never
       post :unfollow, id: user.user_key
-      expect(response).to redirect_to(@routes.url_helpers.profile_path(user.to_param))
+      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
-    let(:work) { GenericWork.create(title: ["w1"]) { |w| w.apply_depositor_metadata(user) } }
-    let(:work_id) { work.id }
-    let(:another_user) { FactoryGirl.create(:user) }
-
-    it "trophies a work" do
-      post :toggle_trophy, id: user.user_key, work_id: work_id
-      json = JSON.parse(response.body)
-      expect(json['user_id']).to eq user.id
-      expect(json['work_id']).to eq work_id
-    end
-    it "does not trophy a work for a different user" do
-      post :toggle_trophy, id: another_user.user_key, work_id: work_id
-      expect(response).to_not be_success
-    end
-    it "does not trophy a work with no edit privs" do
-      sign_in another_user
-      post :toggle_trophy, id: another_user.user_key, work_id: work_id
-      expect(response).to_not be_success
-    end
-  end
 end

data/spec/features/browse_catalog_spec.rb

@@ -49,7 +49,7 @@ describe "Browse catalog:", type: :feature do
       end
 
       expect(page).to have_content jills_work.title.first
-      expect(page).to_not have_content jacks_work.title.first
+      expect(page).not_to have_content jacks_work.title.first
 
       # TODO:  After the _generic_work.html.erb view is finished
       #

data/spec/features/collection_spec.rb

@@ -14,21 +14,20 @@ describe 'collection', type: :feature do
     let(:title) { "Test Collection" }
     let(:description) { "Description for collection we are testing." }
 
-    it "makes a new collection", :js do
+    it "makes a new collection" do
       visit '/dashboard'
       first('#hydra-collection-add').click
       expect(page).to have_content 'Create New Collection'
       click_link('Additional fields')
-      # Creator is a multi-value field, so it should have button to add more fields
-      expect(page).to have_selector "div.collection_creator .input-append button.add"
 
-      # Title is a multi-value field, so it should have the add another button
-      expect(page).to have_selector "div.collection_title .input-append button.add"
+      expect(page).to have_selector "input.collection_creator.multi_value"
+      expect(page).to have_selector "input.collection_title.multi_value"
 
       fill_in('Title', with: title)
       fill_in('Abstract or Summary', with: description)
       fill_in('Location', with: 'Over there')
       fill_in('Related URL', with: 'http://example.com/')
+
       click_button("Create Collection")
       expect(page).to have_content 'Items in this Collection'
       expect(page).to have_content title
@@ -100,7 +99,7 @@ describe 'collection', type: :feature do
       # Should have search results / contents listing
       expect(page).to have_content(work1.title.first)
       expect(page).to have_content(work2.title.first)
-      expect(page).to_not have_css(".pager")
+      expect(page).not_to have_css(".pager")
 
       click_link "Gallery"
       expect(page).to have_content(work1.title.first)
@@ -127,7 +126,7 @@ describe 'collection', type: :feature do
       # Should have search results / contents listing
       expect(page).to have_content("Search Results")
       expect(page).to have_content(work1.title.first)
-      expect(page).to_not have_content(work2.title.first)
+      expect(page).not_to have_content(work2.title.first)
     end
   end
 

data/spec/features/contact_form_spec.rb

@@ -1,26 +1,7 @@
 describe "Sending an email via the contact form", type: :feature do
-  before do
-    sign_in :user_with_fixtures
-  end
+  before { sign_in(:user) }
 
   it "sends mail" do
-    allow_any_instance_of(ContactForm).to receive(:deliver).and_return(true)
-    visit '/'
-    click_link "Contact"
-    expect(page).to have_content "Contact Form"
-    fill_in "contact_form_name", with: "Test McPherson"
-    fill_in "contact_form_email", with: "archivist1@example.com"
-    fill_in "contact_form_message", with: "I am contacting you regarding ScholarSphere."
-    fill_in "contact_form_subject", with: "My Subject is Cool"
-    select "Depositing content", from: "contact_form_category"
-    click_button "Send"
-    expect(page).to have_content "Thank you"
-    expect(page).not_to have_content "I am contacting you regarding ScholarSphere."
-    # this step allows the delivery to go back to normal
-    allow_any_instance_of(ContactForm).to receive(:deliver).and_call_original
-  end
-
-  it "gives an error when I don't provide a contact type" do
     visit '/'
     click_link "Contact"
     expect(page).to have_content "Contact Form"
@@ -28,76 +9,8 @@ describe "Sending an email via the contact form", type: :feature do
     fill_in "contact_form_email", with: "archivist1@example.com"
     fill_in "contact_form_message", with: "I am contacting you regarding ScholarSphere."
     fill_in "contact_form_subject", with: "My Subject is Cool"
-    click_button "Send"
-    expect(page).to have_content "Sorry, this message was not sent successfully"
-  end
-
-  it "gives an error when I don't provide a valid email" do
-    visit '/'
-    click_link "Contact"
-    expect(page).to have_content "Contact Form"
-    fill_in "contact_form_name", with: "Test McPherson"
-    fill_in "contact_form_email", with: "archivist1"
-    fill_in "contact_form_message", with: "I am contacting you regarding ScholarSphere."
-    fill_in "contact_form_subject", with: "My Subject is Cool"
-    select "Depositing content", from: "contact_form_category"
-    click_button "Send"
-    expect(page).to have_content "Sorry, this message was not sent successfully"
-  end
-
-  it "gives an error when I don't provide a name" do
-    visit '/'
-    click_link "Contact"
-    expect(page).to have_content "Contact Form"
-    fill_in "contact_form_email", with: "archivist1@example.com"
-    fill_in "contact_form_message", with: "I am contacting you regarding ScholarSphere."
-    fill_in "contact_form_subject", with: "My Subject is Cool"
-    select "Depositing content", from: "contact_form_category"
-    click_button "Send"
-    expect(page).to have_content "Sorry, this message was not delivered"
-  end
-
-  context "when I don't provide a subject", :js do
-    it "gives an error" do
-      # TODO: this should be a controller test, because that any_instance will be in a different thread
-      visit '/'
-      click_link "Contact"
-      expect(page).to have_content "Contact Form"
-      fill_in "contact_form_name", with: "Test McPherson"
-      fill_in "contact_form_email", with: "archivist1@example.com"
-      fill_in "contact_form_message", with: "I am contacting you regarding ScholarSphere."
-      select "Depositing content", from: "contact_form_category"
-      expect_any_instance_of(ContactForm).not_to receive(:deliver)
-      click_button "Send"
-    end
-  end
-
-  context "when I don't provide a message", :js do
-    it "gives an error" do
-      # TODO: this should be a controller test, because that any_instance will be in a different thread
-      visit '/'
-      click_link "Contact"
-      expect(page).to have_content "Contact Form"
-      fill_in "contact_form_name", with: "Test McPherson"
-      fill_in "contact_form_email", with: "archivist1@example.com"
-      fill_in "contact_form_subject", with: "My Subject is Cool"
-      select "Depositing content", from: "contact_form_category"
-      expect_any_instance_of(ContactForm).not_to receive(:deliver)
-      click_button "Send"
-    end
-  end
-
-  it "gives an error when I provide an invalid captcha" do
-    visit '/'
-    click_link "Contact"
-    expect(page).to have_content "Contact Form"
-    fill_in 'contact_form_contact_method', with: 'My name is', visible: false
-    fill_in "contact_form_name", with: "Test McPherson"
-    fill_in "contact_form_email", with: "archivist1@example.com"
-    fill_in "contact_form_subject", with: "My Subject is Cool"
-    fill_in "contact_form_message", with: "I am contacting you regarding ScholarSphere."
     select "Depositing content", from: "contact_form_category"
     click_button "Send"
-    expect(page).to have_content "Sorry, this message was not sent successfully"
+    expect(page).to have_content "Thank you for your message!"
   end
 end