sufia 6.2.0 → 6.3.0

data/spec/controllers/transfers_controller_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe TransfersController, :type => :controller do
+describe TransfersController, type: :controller do
   describe "with a signed in user" do
     let(:another_user) { FactoryGirl.find_or_create(:jill) }
     let(:user) { FactoryGirl.find_or_create(:archivist) }
@@ -38,7 +38,7 @@ describe TransfersController, :type => :controller do
         before do
           incoming_file.destroy
         end
-        it "should not show that file" do
+        it "does not show that file" do
           get :index
           expect(response).to be_success
           expect(assigns[:incoming]).to be_empty
@@ -54,7 +54,7 @@ describe TransfersController, :type => :controller do
         end
       end
       context 'when user is the depositor' do
-        it "should be successful" do
+        it "is successful" do
           sign_in user
           get :new, id: file
           expect(response).to be_success
@@ -72,11 +72,11 @@ describe TransfersController, :type => :controller do
           f.save!
         end
       end
-      it "should be successful" do
+      it "is successful" do
         allow_any_instance_of(User).to receive(:display_name).and_return("Jill Z. User")
-        expect {
-          post :create, id: file, proxy_deposit_request: {transfer_to: another_user.user_key}
-        }.to change(ProxyDepositRequest, :count).by(1)
+        expect do
+          post :create, id: file, proxy_deposit_request: { transfer_to: another_user.user_key }
+        end.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
@@ -87,10 +87,10 @@ describe TransfersController, :type => :controller do
         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 file to you. Review all <a href=\"#{@routes.url_helpers.transfers_path}\">transfer requests</a>")
       end
-      it "should give an error if the user is not found" do
-        expect {
-          post :create, id: file, proxy_deposit_request: {transfer_to: 'foo' }
-        }.not_to change(ProxyDepositRequest, :count)
+      it "gives an error if the user is not found" do
+        expect do
+          post :create, id: file, proxy_deposit_request: { transfer_to: 'foo' }
+        end.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)
       end
@@ -105,21 +105,21 @@ describe TransfersController, :type => :controller do
             f.request_transfer_to(user)
           end
         end
-        it "should be successful when retaining access rights" do
+        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(flash[:notice]).to eq("Transfer complete")
           expect(assigns[:proxy_deposit_request].status).to eq('accepted')
           expect(incoming_file.reload.edit_users).to eq([another_user.user_key, user.user_key])
         end
-        it "should be successful when resetting access rights" do
+        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(flash[:notice]).to eq("Transfer complete")
           expect(assigns[:proxy_deposit_request].status).to eq('accepted')
           expect(incoming_file.reload.edit_users).to eq([user.user_key])
         end
-        it "should handle sticky requests " do
+        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(flash[:notice]).to eq("Transfer complete")
@@ -136,7 +136,7 @@ describe TransfersController, :type => :controller do
             f.request_transfer_to(another_user)
           end
         end
-        it "should not allow me" do
+        it "does not allow me" do
           put :accept, id: another_user.proxy_deposit_requests.first
           expect(response).to redirect_to root_path
           expect(flash[:alert]).to eq("You are not authorized to access this page.")
@@ -153,7 +153,7 @@ describe TransfersController, :type => :controller do
             f.request_transfer_to(user)
           end
         end
-        it "should be successful" do
+        it "is successful" do
           put :reject, id: user.proxy_deposit_requests.first
           expect(response).to redirect_to @routes.url_helpers.transfers_path
           expect(flash[:notice]).to eq("Transfer rejected")
@@ -169,7 +169,7 @@ describe TransfersController, :type => :controller do
             f.request_transfer_to(another_user)
           end
         end
-        it "should not allow me" do
+        it "does not allow me" do
           put :reject, id: another_user.proxy_deposit_requests.first
           expect(response).to redirect_to root_path
           expect(flash[:alert]).to eq("You are not authorized to access this page.")
@@ -186,7 +186,7 @@ describe TransfersController, :type => :controller do
             f.request_transfer_to(another_user)
           end
         end
-        it "should be successful" do
+        it "is successful" do
           delete :destroy, id: another_user.proxy_deposit_requests.first
           expect(response).to redirect_to @routes.url_helpers.transfers_path
           expect(flash[:notice]).to eq("Transfer canceled")
@@ -201,7 +201,7 @@ describe TransfersController, :type => :controller do
             f.request_transfer_to(user)
           end
         end
-        it "should not allow me" do
+        it "does not allow me" do
           delete :destroy, id: user.proxy_deposit_requests.first
           expect(response).to redirect_to root_path
           expect(flash[:alert]).to eq("You are not authorized to access this page.")

data/spec/controllers/users_controller_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe UsersController, :type => :controller do
+describe UsersController, type: :controller do
   let(:user) { FactoryGirl.create(:user) }
   before(:each) do
     sign_in user
@@ -18,7 +18,7 @@ describe UsersController, :type => :controller do
     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")
+      expect(flash[:alert]).to include("User 'johndoe666' does not exist")
     end
 
     describe "when the user has trophies" do
@@ -35,7 +35,6 @@ describe UsersController, :type => :controller do
         expect(response).to be_success
         expect(assigns[:trophies]).to match_array([file1, file2, file3])
       end
-
     end
   end
   describe "#index" do
@@ -43,25 +42,25 @@ describe UsersController, :type => :controller do
     let!(:u2) { FactoryGirl.create(:user) }
 
     describe "requesting html" do
-      it "should test users" do
+      it "tests users" do
         get :index
         expect(assigns[:users]).to include(u1, u2)
         expect(response).to be_successful
       end
     end
     describe "requesting json" do
-      it "should display users" do
+      it "displays users" 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
+    describe "query users" do
       it "finds the expected user via email" do
-        get :index,  uq: u1.email
+        get :index, uq: u1.email
         expect(assigns[:users]).to include(u1)
         expect(assigns[:users]).to_not include(u2)
         expect(response).to be_successful
@@ -73,7 +72,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, uq: u1.display_name
         expect(assigns[:users]).to include(u1)
         expect(assigns[:users]).to_not include(u2)
         expect(response).to be_successful
@@ -138,21 +137,20 @@ describe UsersController, :type => :controller do
         expect(response).to be_success
         expect(assigns[:trophies]).to match_array([file1, file2, file3])
       end
-
     end
   end
 
   describe "#update" do
     context "the profile of another user" do
       let(:another_user) { FactoryGirl.create(:user) }
-      it "should not allow other users to update" do
+      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(flash[:alert]).to include("Permission denied: cannot access this page.")
       end
     end
 
-    it "should set an avatar and redirect to profile" do
+    it "sets an avatar and redirect to profile" do
       expect(user.avatar?).to be false
       s1 = double('one')
       expect(UserEditProfileEventJob).to receive(:new).with(user.user_key).and_return(s1)
@@ -163,14 +161,14 @@ describe UsersController, :type => :controller do
       expect(flash[:notice]).to include("Your profile has been updated")
       expect(User.find_by_user_key(user.user_key).avatar?).to be true
     end
-    it "should validate the content type of an avatar" do
+    it "validates 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))
       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
+    it "validates 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 }
@@ -184,7 +182,7 @@ describe UsersController, :type => :controller do
         user.update(avatar: f)
       end
 
-      it "should delete an avatar" do
+      it "deletes an avatar" do
         s1 = double('one')
         expect(UserEditProfileEventJob).to receive(:new).with(user.user_key).and_return(s1)
         expect(Sufia.queue).to receive(:push).with(s1).once
@@ -195,7 +193,7 @@ describe UsersController, :type => :controller do
       end
     end
 
-    it "should refresh directory attributes" do
+    it "refreshes directory attributes" do
       s1 = double('one')
       expect(UserEditProfileEventJob).to receive(:new).with(user.user_key).and_return(s1)
       expect(Sufia.queue).to receive(:push).with(s1).once
@@ -205,13 +203,13 @@ describe UsersController, :type => :controller do
       expect(flash[:notice]).to include("Your profile has been updated")
     end
 
-    it "should set an social handles" do
+    it "sets 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' }
+      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(flash[:notice]).to include("Your profile has been updated")
       u = User.find_by_user_key(user.user_key)
@@ -234,10 +232,10 @@ describe UsersController, :type => :controller do
       before do
         user.trophies.create!(generic_file_id: file.id)
       end
-      it "should remove a trophy" do
-        expect {
-          post :update, id: user.user_key, 'remove_trophy_'+file.id => 'yes'
-        }.to change { user.trophies.count }.by(-1)
+      it "removes a trophy" do
+        expect do
+          post :update, id: user.user_key, 'remove_trophy_' + file.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
@@ -246,7 +244,7 @@ describe UsersController, :type => :controller do
 
   describe "#follow" do
     let(:another_user) { FactoryGirl.create(:user) }
-    it "should follow another user if not already following, and log an event" do
+    it "follows another user if not already following, and log an event" do
       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)
@@ -255,14 +253,14 @@ describe UsersController, :type => :controller do
       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
+    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(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}")
     end
-    it "should redirect to profile if user attempts to self-follow and not log an event" do
+    it "redirects 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))
@@ -272,7 +270,7 @@ describe UsersController, :type => :controller do
 
   describe "#unfollow" do
     let(:another_user) { FactoryGirl.create(:user) }
-    it "should unfollow another user if already following, and log an event" do
+    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)
       s1 = double('one')
       expect(UserUnfollowEventJob).to receive(:new).with(user.user_key, another_user.user_key).and_return(s1)
@@ -281,14 +279,14 @@ describe UsersController, :type => :controller do
       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
+    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(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}")
     end
-    it "should redirect to profile if user attempts to self-follow and not log an event" do
+    it "redirects 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))
@@ -301,19 +299,19 @@ describe UsersController, :type => :controller do
     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}
+    it "trophies a file" do
+      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
     end
-    it "should not trophy a file for a different user" do
-      post :toggle_trophy, {id: another_user.user_key, file_id: file_id}
+    it "does not trophy a file for a different user" do
+      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
+    it "does not trophy a file with no edit privs" do
       sign_in another_user
-      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
   end

data/spec/factories/api_items.rb

@@ -26,7 +26,7 @@ FactoryGirl.define do
           {
             creatorType: 'contributor',
             name: 'Jane Doeski'
-          },
+          }
         ],
         description: 'This was funded by the NSF in 2013',
         publisher: 'National Science Foundation',
@@ -70,7 +70,7 @@ FactoryGirl.define do
           {
             creatorType: 'inventor',
             name: 'Babs McGee'
-          },
+          }
         ],
         rights: 'http://creativecommons.org/licenses/by-sa/3.0/us/',
         tags: [

data/spec/factories/content_blocks.rb

@@ -1,4 +1,4 @@
 FactoryGirl.define do
-  factory :content_block do |cb|
+  factory :content_block do |_cb|
   end
 end

data/spec/factories/featured_works.rb

@@ -1,4 +1,4 @@
 FactoryGirl.define do
-  factory :featured_work do |u|
+  factory :featured_work do |_u|
   end
 end

data/spec/factories/generic_files.rb

@@ -23,7 +23,7 @@ FactoryGirl.define do
         initialize_with { new(id: id) }
         read_groups ["public"]
         resource_type ["Dissertation"]
-        subject %w"lorem ipsum dolor sit amet"
+        subject %w(lorem ipsum dolor sit amet)
         title ["fake_document.pdf"]
         before(:create) do |gf|
           gf.title = ["Fake PDF Title"]
@@ -34,7 +34,7 @@ FactoryGirl.define do
           id "fixturemp3"
         end
         initialize_with { new(id: id) }
-        subject %w"consectetur adipisicing elit"
+        subject %w(consectetur adipisicing elit)
         title ["Test Document MP3.mp3"]
         read_groups ["public"]
       end
@@ -46,7 +46,7 @@ FactoryGirl.define do
         resource_type ["Audio", "Dataset"]
         read_groups ["public"]
         title ["Fake Wav File.wav"]
-        subject %w"sed do eiusmod tempor incididunt ut labore"
+        subject %w(sed do eiusmod tempor incididunt ut labore)
       end
     end
   end

data/spec/factories/users.rb

@@ -19,31 +19,30 @@ FactoryGirl.define do
 
         # Create examples of single file successes and failures
         (1..10).each do |number|
-          file = MockFile.new(number.to_s, "Single File #{number.to_s}")
-          User.batchuser().send_message(user, message.single_success("single-batch-success", file), message.success_subject, false)
-          User.batchuser().send_message(user, message.single_failure("single-batch-failure", file), message.failure_subject, false)
+          file = MockFile.new(number.to_s, "Single File #{number}")
+          User.batchuser.send_message(user, message.single_success("single-batch-success", file), message.success_subject, false)
+          User.batchuser.send_message(user, message.single_failure("single-batch-failure", file), message.failure_subject, false)
         end
 
         # Create examples of mulitple file successes and failures
         files = []
         (1..50).each do |number|
-          files << MockFile.new(number.to_s, "File #{number.to_s}")
+          files << MockFile.new(number.to_s, "File #{number}")
         end
-        User.batchuser().send_message(user, message.multiple_success("multiple-batch-success", files), message.success_subject, false)
-        User.batchuser().send_message(user, message.multiple_failure("multiple-batch-failure", files), message.failure_subject, false)
+        User.batchuser.send_message(user, message.multiple_success("multiple-batch-success", files), message.success_subject, false)
+        User.batchuser.send_message(user, message.multiple_failure("multiple-batch-failure", files), message.failure_subject, false)
       end
     end
 
     factory :curator do
       email 'curator1@example.com'
     end
-
   end
 end
 
 class MockFile
   attr_accessor :to_s, :id
-  def initialize id, string
+  def initialize(id, string)
     self.id = id
     self.to_s = string
   end

data/spec/features/browse_dashboard_files_spec.rb

@@ -11,7 +11,7 @@ describe "Browse Dashboard", type: :feature do
   context "within dashboard" do
     let(:handles) { [:public_pdf] }
 
-    it "should search your files by default" do
+    it "searches your files by default" do
       visit "/dashboard"
       fill_in "q", with: "PDF"
       click_button "search-submit-header"
@@ -20,16 +20,15 @@ describe "Browse Dashboard", type: :feature do
   end
 
   context "within my files page" do
-
     before do
       visit "/dashboard/files"
     end
 
     context "no files" do
-      let(:handles) { [ ] }
+      let(:handles) { [] }
 
-      it "should link to my other tabs" do
-        # TODO this would make a good view test.
+      it "links to my other tabs" do
+        # TODO: this would make a good view test.
         ["My Collections", "My Highlights", "Files Shared with Me"].each do |tab|
           within("#my_nav") do
             click_link(tab)
@@ -40,10 +39,10 @@ describe "Browse Dashboard", type: :feature do
     end
 
     context "with one file" do
-      let(:handles) { [ :public_pdf ] }
+      let(:handles) { [:public_pdf] }
 
-      it "should display all the necessary information" do
-        # TODO this would make a good view test.
+      it "displays all the necessary information" do
+        # TODO: this would make a good view test.
         within("#document_#{fixtures.first.id}") do
           click_button("Select an action")
         end
@@ -62,9 +61,8 @@ describe "Browse Dashboard", type: :feature do
       let(:handles) { [:public_pdf, :public_mp3, :public_wav] }
 
       it "allows you to interact your own files" do
-
-      #refreshes the page of files
-        # TODO this would make a good view test.
+        # refreshes the page of files
+        # TODO: this would make a good view test.
         click_button "Refresh"
         within("#document_#{fixtures.first.id}") do
           click_button("Select an action")
@@ -72,7 +70,7 @@ describe "Browse Dashboard", type: :feature do
           expect(page).to have_content("Download File")
         end
 
-      # allows you to search your own files and remove constraints
+        # allows you to search your own files and remove constraints
         fill_in "q", with: "PDF"
         click_button "search-submit-header"
         expect(page).to have_content("Fake PDF Title")
@@ -83,7 +81,7 @@ describe "Browse Dashboard", type: :feature do
         end
         expect(page).to have_content("Fake Wav File")
 
-      # allows you to browse facets
+        # allows you to browse facets
         visit "/dashboard/files"
         click_link "Subject"
         click_link "more Subjects"
@@ -93,8 +91,8 @@ describe "Browse Dashboard", type: :feature do
         end
         expect(page).to have_content("File Details")
 
-      # allows me to edit files (from the fixtures)
-        # TODO this would make a good view test.
+        # allows me to edit files (from the fixtures)
+        # TODO: this would make a good view test.
         visit "/dashboard/files"
 
         fill_in "q", with: "Wav"
@@ -103,15 +101,13 @@ describe "Browse Dashboard", type: :feature do
         click_link "Edit File"
         expect(page).to have_content("Edit Fake Wav File.wav")
 
-      # allows me to edit files in batches"
+        # allows me to edit files in batches"
         visit "/dashboard/files"
 
         first('input#check_all').click
         click_button('Edit Selected')
         expect(page).to have_content('3 files')
-
       end
     end
   end
-
 end