sufia 6.2.0 → 6.3.0

data/spec/spec_helper.rb

@@ -52,10 +52,10 @@ if $in_travis
         def extract_metadata
           return unless has_content?
           Hydra::FileCharacterization.characterize(content, filename_for_characterization, :fits) do |config|
-            config[:fits] = lambda { |filename|
+            config[:fits] = lambda do |filename|
               filename = File.expand_path("../fixtures/pdf_fits.xml", __FILE__)
               File.read(filename)
-            }
+            end
           end
         end
       end
@@ -68,9 +68,10 @@ if defined?(ClamAV)
 else
   class ClamAV
     include Singleton
-    def scanfile(f)
+    def scanfile(_f)
       0
     end
+
     def loaddb
       nil
     end
@@ -116,7 +117,7 @@ RSpec.configure do |config|
   config.use_transactional_fixtures = false
 
   config.before :each do |example|
-    unless (example.metadata[:type] == :view || example.metadata[:no_clean])
+    unless example.metadata[:type] == :view || example.metadata[:no_clean]
       ActiveFedora::Cleaner.clean!
     end
   end

data/spec/support/features/session_helpers.rb

@@ -3,7 +3,7 @@ module Features
   module SessionHelpers
     def sign_in(who = :user)
       logout
-      user = who.is_a?(User) ? who : FactoryGirl.build(:user).tap { |u| u.save! }
+      user = who.is_a?(User) ? who : FactoryGirl.build(:user).tap(&:save!)
       visit new_user_session_path
       fill_in 'Email', with: user.email
       fill_in 'Password', with: user.password

data/spec/support/input_support.rb

@@ -3,10 +3,9 @@ module InputSupport
 
   include RSpec::Rails::HelperExampleGroup
 
-  def input_for(object, attribute_name, options={})
+  def input_for(object, attribute_name, options = {})
     helper.simple_form_for object, url: '' do |f|
       f.input attribute_name, options
     end
   end
 end
-

data/spec/support/rake.rb

@@ -5,7 +5,7 @@ module RakeHelper
     @rake = Rake::Application.new
     Rake.application = @rake
     Rake::Task.define_task(:environment)
-    files.each {|file| load file}
+    files.each { |file| load file }
   end
 
   def run_task(task, arg = nil)

data/spec/support/selectors.rb

@@ -1,7 +1,5 @@
 module Selectors
-
   module Header
-
     def user_notifications_link
       within '#user_utility_links' do
         find '#notify_link'
@@ -16,8 +14,7 @@ module Selectors
   end
 
   module Dashboard
-
-    def db_item_actions_toggle item
+    def db_item_actions_toggle(item)
       within "#document_#{item.id}" do
         find '.dropdown-toggle'
       end
@@ -25,7 +22,6 @@ module Selectors
   end
 
   module NewTransfers
-
     def new_owner_dropdown
       find '#s2id_proxy_deposit_request_transfer_to'
     end
@@ -50,7 +46,6 @@ module Selectors
   end
 
   module Transfers
-
     def first_sent_cancel_button
       within '#outgoing-transfers' do
         find '.btn.btn-danger'

data/spec/support/statistic_helper.rb

@@ -1,6 +1,6 @@
 module StatisticHelper
   def statistic_date(date)
-    date.to_datetime.to_i*1000
+    date.to_datetime.to_i * 1000
   end
 
   RSpec.configure do |config|

data/spec/support/uploaded_file_monkeypatch.rb

@@ -1,4 +1,4 @@
-#Monkey patch UploadedFile so that it responds to read (same as ActionDispatch::Http::UploadedFile). Required by RestClient when posting to fedora.
+# Monkey patch UploadedFile so that it responds to read (same as ActionDispatch::Http::UploadedFile). Required by RestClient when posting to fedora.
 class Rack::Test::UploadedFile
   def read(*args)
     @tempfile.read(*args)

data/spec/tasks/rake_spec.rb

@@ -2,21 +2,20 @@ require 'spec_helper'
 require 'rake'
 
 describe "Rake tasks" do
-
   describe "sufia:empty_batches" do
     before do
       load_rake_environment [File.expand_path("../../../sufia-models/lib/tasks/batch_cleanup.rake", __FILE__)]
     end
     subject { run_task "sufia:empty_batches" }
-    
+
     context "without an empty batch" do
       it { is_expected.to eq "Output: \n Errors:" }
     end
-    
+
     context "with an empty batch" do
       before { Batch.create("empty-batch") }
       it { is_expected.to start_with("Output: empty-batch contains no files - to delete, rerun with the remove option") }
-      
+
       describe "removing the empty batch" do
         subject { run_task "sufia:empty_batches", "remove" }
         it { is_expected.to start_with("Output: empty-batch contains no files - deleted") }
@@ -75,5 +74,4 @@ describe "Rake tasks" do
       File.delete("abc123.txt")
     end
   end
-
 end

data/spec/views/admin/stats/index.html.erb_spec.rb

@@ -1,45 +1,45 @@
 require 'spec_helper'
 
 describe "admin/stats/index.html.erb" do
+  before do
+    assign(:files_count, {})
+    assign(:top_formats, [])
+    assign(:users_stats, {})
+    assign(:recent_users, [])
+    assign(:deposit_stats, {})
+    assign(:depositors, [])
+  end
+
   context "default depositors" do
-    let(:top_5_active_users) do 
+    let(:top_5_active_users) do
       users = {}
-      5.times { |i| users[i.to_s] = i}
+      5.times { |i| users[i.to_s] = i }
       users
     end
     before do
-      assign(:files_count, {})
-      assign(:top_formats, [])
-      assign(:users_stats, {})
-      assign(:recent_users, [])
       assign(:active_users, top_5_active_users)
       render
     end
-    it "should show top 5 depositors and option to view more" do
+    it "shows top 5 depositors and option to view more" do
       expect(rendered).to have_content("(top 5)")
       expect(rendered).to have_content("View top 20")
     end
   end
 
   context "top 20 depositors" do
-    let(:top_20_active_users) do 
+    let(:top_20_active_users) do
       users = {}
-      20.times { |i| users[i.to_s] = i}
+      20.times { |i| users[i.to_s] = i }
       users
     end
     before do
-      assign(:files_count, {})
-      assign(:top_formats, [])
-      assign(:users_stats, {})
-      assign(:recent_users, [])
       assign(:active_users, top_20_active_users)
       params[:dep_count] = 20
       render
     end
-    it "should show top 20 depositors, without an option to view more" do
+    it "shows top 20 depositors, without an option to view more" do
       expect(rendered).to have_content("(top 20)")
       expect(rendered).to_not have_content("View top 20")
     end
   end
-
-end
+end

data/spec/views/batch/edit.html.erb_spec.rb

@@ -16,7 +16,7 @@ describe 'batch/edit.html.erb' do
     render
   end
 
-  it "should draw the page" do
+  it "draws the page" do
     # form
     expect(rendered).to have_selector "form#new_generic_file"
     # should have browser validations
@@ -35,7 +35,5 @@ describe 'batch/edit.html.erb' do
     page.all('select#generic_file_rights option').each do |elem|
       expect(elem.value).to_not be_empty
     end
-
   end
 end
-

data/spec/views/batch_edits/check_all_spec.rb

@@ -1,20 +1,20 @@
 require 'spec_helper'
 
-describe 'Check All', :type => :view do
-  before (:all) do
-    @document_list = ['a','b','c']
+describe 'Check All', type: :view do
+  before(:all) do
+    @document_list = ['a', 'b', 'c']
     @batch_size_on_other_page = 0
     @max_batch_size = 100
   end
 
-  it 'should render batch edits actions' do
+  it 'renders batch edits actions' do
     allow(controller).to receive(:controller_name).and_return('batch_edits')
     controller.prepend_view_path "app/views/batch_edits"
     html = render partial: 'batch_edits/check_all'
     expect(html).to have_selector("li[data-behavior='batch-edit-select-abc']")
   end
 
-  it 'should render actions for my items' do
+  it 'renders actions for my items' do
     allow(controller).to receive(:controller_name).and_return('my')
     controller.prepend_view_path "app/views/my"
     html = render partial: 'batch_edits/check_all'

data/spec/views/batch_edits/edit.html.erb_spec.rb

@@ -11,9 +11,7 @@ describe 'batch_edits/edit.html.erb' do
     render
   end
 
-  it "should draw tooltip for description" do
+  it "draws tooltip for description" do
     expect(rendered).to have_selector ".generic_file_description a i.help-icon"
   end
 end
-
-

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

@@ -1,7 +1,6 @@
 require 'spec_helper'
 
 describe 'catalog/index.html.erb' do
-
   let(:collection) { stub_model(Collection, title: 'collection1', id: 'abc123') }
   let(:doc) { SolrDocument.new(collection.to_solr) }
 
@@ -17,7 +16,7 @@ describe 'catalog/index.html.erb' do
     params[:view] = 'gallery'
 
     resp = []
-    assign(:response, resp )
+    assign(:response, resp)
     allow(resp).to receive(:total_pages).and_return(1)
     allow(resp).to receive(:current_page).and_return(1)
     allow(resp).to receive(:limit_value).and_return(10)
@@ -34,5 +33,4 @@ describe 'catalog/index.html.erb' do
     page = Capybara::Node::Simple.new(rendered)
     expect(page).to have_selector("span.glyphicon.glyphicon-th.collection-icon-search")
   end
-
 end

data/spec/views/catalog/sort_and_per_page.html.erb_spec.rb

@@ -1,11 +1,11 @@
 require 'spec_helper'
 
-describe 'catalog/_sort_and_per_page.html.erb', :type => :view do
+describe 'catalog/_sort_and_per_page.html.erb', type: :view do
   before do
     allow(controller).to receive(:current_user).and_return(stub_model(User))
     allow_any_instance_of(Ability).to receive(:can?).and_return(true)
-    @resp = ["a","b","c"]
-    assign(:response, @resp )
+    @resp = ["a", "b", "c"]
+    assign(:response, @resp)
     allow(@resp).to receive(:total_count).and_return(20)
     allow(@resp).to receive(:limit_value).and_return(3)
     allow(@resp).to receive(:rows).and_return(3)
@@ -21,10 +21,9 @@ describe 'catalog/_sort_and_per_page.html.erb', :type => :view do
     expect(page).to have_selector('span.page_entries', count: 1)
     expect(rendered).to include("<strong>4</strong> - <strong>6</strong> of <strong>20</strong>")
   end
-  
+
   it 'displays the relevance option for sorting' do
     render
     expect(rendered).to include("<li><a href=\"/catalog?sort=score+desc%2C+date_uploaded_dtsi+desc\">relevance</a></li>")
   end
-
 end

data/spec/views/collections/_form.html.erb_spec.rb

@@ -1,8 +1,10 @@
 require 'spec_helper'
 
 describe 'collections/_form.html.erb' do
-  let(:collection) { Collection.new(title: 'the title', description: 'the description',
-                                     creator: ['the creator'])}
+  let(:collection) do
+    Collection.new(title: 'the title', description: 'the description',
+                   creator: ['the creator'])
+  end
 
   let(:collection_form) { Sufia::Forms::CollectionEditForm.new(collection) }
 
@@ -11,7 +13,7 @@ describe 'collections/_form.html.erb' do
     assign(:form, collection_form)
   end
 
-  it "should draw the metadata fields for collection" do
+  it "draws the metadata fields for collection" do
     render
     expect(rendered).to have_selector("input#collection_title")
     expect(rendered).to_not have_selector("div#additional_title.multi_value")

data/spec/views/collections/_show_descriptions.html.erb_spec.rb

@@ -1,14 +1,14 @@
 require 'spec_helper'
 
-describe 'collections/_show_descriptions.html.erb', :type => :view do
+describe 'collections/_show_descriptions.html.erb', type: :view do
   context 'displaying a custom collection' do
     let(:collection) do
       mock_model(Collection,
-                  resource_type: [], creator: [], contributor: [], tag: [],
-                  description: '', title: 'hmm',
-                  rights: [], publisher: [], date_created: ['2000-01-01'], subject: [],
-                  language: [], identifier: [], based_near: [], related_url: [],
-                  members: ['foo', 'bar'], bytes: 123456678
+                 resource_type: [], creator: [], contributor: [], tag: [],
+                 description: '', title: 'hmm',
+                 rights: [], publisher: [], date_created: ['2000-01-01'], subject: [],
+                 language: [], identifier: [], based_near: [], related_url: [],
+                 members: ['foo', 'bar'], bytes: 123_456_678
                 )
     end
     before do
@@ -17,8 +17,7 @@ describe 'collections/_show_descriptions.html.erb', :type => :view do
 
     let(:presenter) { Sufia::CollectionPresenter.new(collection) }
 
-
-    it "should draw the metadata fields for collection" do
+    it "draws the metadata fields for collection" do
       render
       expect(rendered).to have_content 'Date Created'
       expect(rendered).to include('itemprop="dateCreated"')

data/spec/views/collections/_show_document_list.erb_spec.rb

@@ -1,7 +1,6 @@
 require 'spec_helper'
 
-describe 'collections/_show_document_list.html.erb', :type => :view do
-
+describe 'collections/_show_document_list.html.erb', type: :view do
   let(:user) { FactoryGirl.find_or_create(:jill) }
   let(:collection) { mock_model(Collection) }
 
@@ -12,7 +11,7 @@ describe 'collections/_show_document_list.html.erb', :type => :view do
     gf
   end
 
-  let(:documents) {[file]}
+  let(:documents) { [file] }
 
   context 'when not logged in' do
     before do
@@ -22,10 +21,9 @@ describe 'collections/_show_document_list.html.erb', :type => :view do
       allow(file).to receive(:edit_people).and_return([])
     end
 
-    it "should render collection" do
-      render(partial: 'collections/show_document_list.html.erb', locals: {documents: documents})
+    it "renders collection" do
+      render(partial: 'collections/show_document_list.html.erb', locals: { documents: documents })
       expect(rendered).to have_content 'One Hundred Years of Solitude'
     end
   end
-
 end

data/spec/views/dashboard/index_spec.rb

@@ -1,7 +1,6 @@
 require 'spec_helper'
 
-describe "dashboard/index.html.erb", :type => :view do
-
+describe "dashboard/index.html.erb", type: :view do
   before do
     @user = mock_model(User, name: "Charles Francis Xavier", user_key: "charles")
     allow(@user).to receive(:title).and_return("Professor, Head")
@@ -10,7 +9,7 @@ describe "dashboard/index.html.erb", :type => :view do
     allow(@user).to receive(:email).and_return("chuck@xsgy.edu")
     allow(@user).to receive(:login).and_return("chuck")
     allow(@user).to receive(:all_following).and_return(["magneto"])
-    allow(@user).to receive(:followers).and_return(["wolverine","storm"])
+    allow(@user).to receive(:followers).and_return(["wolverine", "storm"])
     allow(@user).to receive(:can_receive_deposits_from).and_return([])
     allow(@user).to receive(:total_file_views).and_return(1)
     allow(@user).to receive(:total_file_downloads).and_return(3)
@@ -28,13 +27,12 @@ describe "dashboard/index.html.erb", :type => :view do
   let(:can_create_collection) { true }
 
   describe "heading" do
-
     before do
       render
       @heading = view.content_for(:heading)
     end
 
-    it "should display welcome message and links" do
+    it "displays welcome message and links" do
       expect(@heading).to have_link("Upload", sufia.new_generic_file_path)
       expect(@heading).to have_link("Create Collection", collections.new_collection_path)
       expect(@heading).to have_link("View Files", sufia.dashboard_files_path)
@@ -44,27 +42,25 @@ describe "dashboard/index.html.erb", :type => :view do
 
     context "when the user can't create files" do
       let(:can_create_file) { false }
-      it "should not display the upload button" do
+      it "does not display the upload button" do
         expect(@heading).not_to have_link("Upload", sufia.new_generic_file_path)
       end
     end
     context "when the user can't create collections" do
       let(:can_create_collection) { false }
-      it "should not display the create collection button" do
+      it "does not display the create collection button" do
         expect(@heading).not_to have_link("Create Collection", collections.new_collection_path)
       end
     end
-
   end
 
   describe "sidebar" do
-
     before do
       render
       @sidebar = view.content_for(:sidebar)
     end
 
-    it "should display information about the user" do
+    it "displays information about the user" do
       expect(@sidebar).to include "Charles Francis Xavier"
       expect(@sidebar).to include "Professor, Head"
       expect(@sidebar).to include "Xavier’s School for Gifted Youngsters"
@@ -72,12 +68,12 @@ describe "dashboard/index.html.erb", :type => :view do
       expect(@sidebar).to include "chuck@xsgy.edu"
     end
 
-    it "should have links to view and edit the user's profile" do
+    it "has links to view and edit the user's profile" do
       expect(@sidebar).to include '<a class="btn btn-default" href="' + sufia.profile_path(@user) + '">View Profile</a>'
       expect(@sidebar).to include '<a class="btn btn-default" href="' + sufia.edit_profile_path(@user) + '">Edit Profile</a>'
     end
 
-    it "should display user statistics" do
+    it "displays user statistics" do
       expect(@sidebar).to include "Your Statistics"
       expect(@sidebar).to include '<span class="badge">1</span>'
       expect(@sidebar).to include '<span class="badge">2</span>'
@@ -87,29 +83,26 @@ describe "dashboard/index.html.erb", :type => :view do
       expect(@sidebar).to include '<span class="badge-optional">3</span> Downloads'
     end
 
-    it "should show the statistics before the profile" do
+    it "shows the statistics before the profile" do
       expect(@sidebar).to match(/Your Statistics.*Charles Francis Xavier/m)
     end
   end
 
   describe "main" do
-
     context "with activities and notifications" do
-
       before do
         @now = DateTime.now.to_i
         assign(:activity, [
-            { action: 'so and so edited their profile', timestamp: @now },
-            { action: 'so and so uploaded a file', timestamp: (@now - 360 ) }
+          { action: 'so and so edited their profile', timestamp: @now },
+          { action: 'so and so uploaded a file', timestamp: (@now - 360) }
         ])
       end
 
-      it "should include recent activities and notifications" do
+      it "includes recent activities and notifications" do
         render
         expect(rendered).to include "so and so edited their profile"
         expect(rendered).to include "6 minutes ago"
       end
-
     end
 
     context "with notifications" do
@@ -167,13 +160,13 @@ describe "dashboard/index.html.erb", :type => :view do
     end
 
     context "without activities and notifications" do
-      it "should include headings for activities and notifications" do
+      it "includes headings for activities and notifications" do
         render
         expect(rendered).to include "User Activity"
         expect(rendered).to include "User Notifications"
       end
 
-      it "should show no activities or notifications" do
+      it "shows no activities or notifications" do
         render
         expect(rendered).to include "User has no notifications"
         expect(rendered).to include "User has no recent activity"