sufia 7.1.0 → 7.2.0

data/spec/controllers/users_controller_spec.rb

@@ -1,6 +1,6 @@
 describe UsersController, type: :controller do
   let(:user) { FactoryGirl.create(:user) }
-  before(:each) do
+  before do
     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
@@ -8,13 +8,13 @@ describe UsersController, type: :controller do
 
   describe "#show" do
     it "show the user profile if user exists" do
-      get :show, id: user.user_key
+      get :show, params: { id: user.user_key }
       expect(response).to be_success
       expect(assigns[:presenter]).to be_kind_of Sufia::UserProfilePresenter
     end
 
     it "redirects to root if user does not exist" do
-      get :show, id: 'johndoe666'
+      get :show, params: { id: 'johndoe666' }
       expect(response).to redirect_to(root_path)
       expect(flash[:alert]).to include("User 'johndoe666' does not exist")
     end
@@ -32,7 +32,7 @@ describe UsersController, type: :controller do
     end
     describe "requesting json" do
       it "displays users" do
-        get :index, format: :json
+        get :index, params: { format: :json }
         expect(response).to be_successful
         json = JSON.parse(response.body)
         expect(json.map { |u| u['id'] }).to include(u1.email, u2.email)
@@ -42,7 +42,7 @@ describe UsersController, type: :controller do
 
     describe "query users" do
       it "finds the expected user via email" do
-        get :index, uq: u1.email
+        get :index, params: { uq: u1.email }
         expect(assigns[:users]).to include(u1)
         expect(assigns[:users]).not_to include(u2)
         expect(response).to be_successful
@@ -54,7 +54,7 @@ describe UsersController, type: :controller do
         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
+        get :index, params: { uq: u1.display_name }
         expect(assigns[:users]).to include(u1)
         expect(assigns[:users]).not_to include(u2)
         expect(response).to be_successful
@@ -77,7 +77,7 @@ describe UsersController, type: :controller do
 
   describe "#edit" do
     it "show edit form when user edits own profile" do
-      get :edit, id: user.user_key
+      get :edit, params: { id: user.user_key }
       expect(response).to be_success
       expect(response).to render_template('users/edit')
       expect(flash[:alert]).to be_nil
@@ -88,7 +88,7 @@ describe UsersController, type: :controller do
       context 'with default abilities' 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
+          get :edit, params: { id: 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
@@ -98,7 +98,7 @@ describe UsersController, type: :controller do
           allow_any_instance_of(Ability).to receive(:can?).with(:edit, another_user).and_return(true)
         end
         it "allows user to edit another user's profile" do
-          get :edit, id: another_user.to_param
+          get :edit, params: { 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(flash[:alert]).to be_nil
@@ -115,7 +115,7 @@ describe UsersController, type: :controller do
       let!(:trophy3) { user.trophies.create!(work_id: work3.id) }
 
       it "show the user profile if user exists" do
-        get :edit, id: user.user_key
+        get :edit, params: { id: user.user_key }
         expect(response).to be_success
         expect(assigns[:trophies]).to all(be_kind_of Sufia::TrophyPresenter)
         expect(assigns[:trophies].map(&:id)).to match_array [work1.id, work2.id, work3.id]
@@ -127,7 +127,7 @@ describe UsersController, type: :controller do
     context "the profile of another user" 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 }
+        post :update, params: { 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
@@ -137,7 +137,7 @@ describe UsersController, type: :controller do
       expect(user.avatar?).to be false
       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 }
+      post :update, params: { 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
@@ -145,14 +145,14 @@ describe UsersController, type: :controller do
     it "validates the content type of an avatar" 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 }
+      post :update, params: { 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 "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 }
+      post :update, params: { 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
@@ -165,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' }
+        post :update, params: { 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
@@ -175,7 +175,7 @@ describe UsersController, type: :controller do
     it "refreshes directory attributes" 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' }
+      post :update, params: { 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
@@ -186,7 +186,7 @@ describe UsersController, type: :controller do
       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' }
+      post :update, params: { 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(flash[:notice]).to include("Your profile has been updated")
       u = User.find_by_user_key(user.user_key)
@@ -199,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' }
+      post :update, params: { 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
@@ -210,60 +210,12 @@ describe UsersController, type: :controller do
         user.trophies.create!(work_id: work.id)
       end
       it "removes a trophy" do
-        expect {
-          post :update, id: user.user_key, 'remove_trophy_' + work.id => 'yes'
-        }.to change { user.trophies.count }.by(-1)
+        expect do
+          post :update, params: { id: user.user_key, 'remove_trophy_' + work.id => 'yes' }
+        end.to change { user.trophies.count }.by(-1)
         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
   end
-
-  describe "#follow" do
-    let(:another_user) { FactoryGirl.create(:user) }
-    it "follows another user if not already following, and log an event" 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(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(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(flash[:alert]).to include("You cannot follow or unfollow yourself")
-    end
-  end
-
-  describe "#unfollow" do
-    let(:another_user) { FactoryGirl.create(:user) }
-    it "unfollows another user if already following, and log an event" 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(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(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(flash[:alert]).to include("You cannot follow or unfollow yourself")
-    end
-  end
 end

data/spec/factories/admin_sets.rb

@@ -0,0 +1,9 @@
+FactoryGirl.define do
+  factory :admin_set do
+    sequence(:title) { |n| ["Title #{n}"] }
+  end
+
+  trait :public do
+    read_groups ['public']
+  end
+end

data/spec/factories/collections_factory.rb

@@ -4,11 +4,13 @@ FactoryGirl.define do
       user { FactoryGirl.create(:user) }
     end
     sequence(:title) { |n| ["Title #{n}"] }
-    before(:create) { |work, evaluator|
+    before(:create) do |work, evaluator|
       work.apply_depositor_metadata(evaluator.user.user_key)
-    }
+    end
+
+    factory :public_collection, traits: [:public]
 
-    factory :public_collection do
+    trait :public do
       visibility Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PUBLIC
     end
 

data/spec/factories/generic_works.rb

@@ -11,7 +11,9 @@ FactoryGirl.define do
       work.apply_depositor_metadata(evaluator.user.user_key)
     end
 
-    factory :public_generic_work, aliases: [:public_work] do
+    factory :public_generic_work, aliases: [:public_work], traits: [:public]
+
+    trait :public do
       visibility Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PUBLIC
     end
 

data/spec/features/admin_admin_set_spec.rb

@@ -0,0 +1,30 @@
+require 'spec_helper'
+
+RSpec.describe "The admin sets, through the admin dashboard" do
+  let(:user) { create :user }
+
+  before do
+    create(:admin_set, title: ["A completely unique name"],
+                       description: ["A substantial description"])
+    allow(RoleMapper).to receive(:byname).and_return(user.user_key => ['admin'])
+  end
+
+  scenario do
+    login_as(user, scope: :user)
+    visit '/admin'
+    click_link "Administrative Sets"
+
+    expect(page).to have_link "Create new administrative set"
+
+    click_link "A completely unique name"
+
+    expect(page).to have_content "A substantial description"
+    expect(page).to have_content "Works in This Set"
+
+    click_link "Edit"
+
+    fill_in "Title", with: 'A better unique name'
+    click_button 'Save'
+    expect(page).to have_content "A better unique name"
+  end
+end

data/spec/features/browse_dashboard_files_spec.rb

@@ -48,7 +48,7 @@ describe "Browse Dashboard", type: :feature do
     end
 
     # View other tabs
-    ["My Collections", "My Highlights", "Files Shared with Me"].each do |tab|
+    ["My Collections", "My Highlights", "Works Shared with Me"].each do |tab|
       within("#my_nav") do
         click_link(tab)
       end
@@ -59,8 +59,8 @@ describe "Browse Dashboard", type: :feature do
   it "allows me to delete works in upload_sets", js: true do
     visit "/dashboard/works"
     first('input#check_all').click
-    expect {
+    expect do
       click_button('Delete Selected')
-    }.to change { GenericWork.count }.by(-3)
+    end.to change { GenericWork.count }.by(-3)
   end
 end

data/spec/features/contact_form_spec.rb

@@ -5,11 +5,11 @@ describe "Sending an email via the contact form", type: :feature 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@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"
+    fill_in "Your Name", with: "Test McPherson"
+    fill_in "Your Email", with: "archivist1@example.com"
+    fill_in "Message", with: "I am contacting you regarding ScholarSphere."
+    fill_in "Subject", with: "My Subject is Cool"
+    select "Depositing content", from: "Issue Type"
     click_button "Send"
     expect(page).to have_content "Thank you for your message!"
   end

data/spec/features/create_work_spec.rb

@@ -79,7 +79,7 @@ feature 'Creating a new Work', :js do
       click_link('Dashboard')
       click_link('Shares')
 
-      click_link('Files Shared with Me')
+      click_link('Works Shared with Me')
       expect(page).to have_content "My Test Work"
       # TODO: Show the work details (owner email)
       # first('i.glyphicon-chevron-right').click

data/spec/features/display_dashboard_spec.rb

@@ -22,7 +22,7 @@ describe "The Dashboard", type: :feature do
       expect(page).to have_content "My Works"
       expect(page).to have_content "My Collections"
       expect(page).to have_content "My Highlights"
-      expect(page).to have_content "Files Shared with Me"
+      expect(page).to have_content "Works Shared with Me"
     end
   end
 end

data/spec/features/ownership_transfer_spec.rb

@@ -1,32 +1,21 @@
-include Selectors::Header
-include Selectors::Dashboard
-include Selectors::NewTransfers
-include Selectors::Transfers
+RSpec.describe 'Transferring work ownership:', type: :feature do
+  include Selectors::Dashboard
+  include Selectors::NewTransfers
+  include Selectors::Transfers
 
-describe 'Transferring work ownership:', type: :feature do
   let(:original_owner) { create(:user) }
   let(:new_owner) { create(:user) }
   let!(:work) do
-    GenericWork.new.tap do |f|
-      f.title = ['little_generic_work']
-      f.creator = ['little_generic_work.creator']
-      f.resource_type = ["stuff"]
-      f.read_groups = ['public']
-      f.apply_depositor_metadata(original_owner.user_key)
-      f.save!
-    end
-  end
-
-  before do
-    sign_in original_owner
-    go_to_dashboard_works
+    create(:public_work,
+           title: ['little_generic_work'],
+           creator: ['little_generic_work.creator'],
+           resource_type: ["stuff"],
+           user: original_owner)
   end
 
   describe 'When I request a work transfer:', :js do
-    context 'For a work I do not own' do
-      pending 'The transfer option is not available' do
-        raise
-      end
+    before do
+      sign_in original_owner
     end
 
     context 'To myself' do
@@ -38,21 +27,24 @@ describe 'Transferring work ownership:', type: :feature do
 
     context 'To someone else' do
       before { transfer_ownership_of_work work, new_owner }
+
       it 'Creates a transfer request' do
         expect(page).to have_content 'Transfer request created'
       end
+
       context 'If the new owner accepts it' do
         before do
           new_owner.proxy_deposit_requests.last.transfer!
-          nav_toggle 'Dashboard', 'Transfer'
+          # refresh the page
+          visit '/dashboard'
         end
         it 'I should see it was accepted' do
           expect(page.find('#outgoing-transfers')).to have_content 'Accepted'
         end
       end
+
       context 'If I cancel it' do
         before do
-          nav_toggle 'Dashboard', 'Transfer'
           first_sent_cancel_button.click
         end
         it 'I should see it was cancelled' do
@@ -65,29 +57,36 @@ describe 'Transferring work ownership:', type: :feature do
   describe 'When someone requests a work transfer to me', :js do
     before do
       # As the original_owner, transfer a work to the new_owner
-      transfer_ownership_of_work work, new_owner
+      ProxyDepositRequest.create!(work_id: work.id,
+                                  sending_user: original_owner,
+                                  transfer_to: new_owner.user_key)
+
       # Become the new_owner so we can manage transfers sent to us
       sign_in new_owner
       visit '/dashboard'
-      nav_toggle 'Dashboard', 'Transfer'
       expect(page).to have_content 'Transfer of Ownership'
     end
-    it 'I should receive a notification' do
-      nav_toggle('Dashboard', 'Notifications')
-      expect(page).to have_content "#{original_owner.name} wants to transfer a work to you"
-    end
+
     it 'I should be able to accept it' do
+      within('#notifications') do
+        expect(page).to have_content "#{original_owner.name} wants to transfer a work to you"
+      end
       first_received_accept_dropdown.click
       click_link 'Allow depositor to retain edit access'
       expect(page).to have_content 'Transfer complete'
     end
+
     it 'I should be able to reject it' do
+      within('#notifications') do
+        expect(page).to have_content "#{original_owner.name} wants to transfer a work to you"
+      end
       first_received_reject_button.click
       expect(page).to have_content 'Transfer rejected'
     end
   end
 
   def transfer_ownership_of_work(work, new_owner)
+    go_to_dashboard_works
     db_item_actions_toggle(work).click
     click_link 'Transfer Ownership of Work'
     expect(page).to have_content "Select a user to transfer #{work.title.first} to, add optional comments and then press transfer."