sufia 6.3.0 → 6.4.0

data/spec/controllers/batch_controller_spec.rb

@@ -17,6 +17,7 @@ describe BatchController do
       it "is successful" do
         expect(Sufia.queue).to receive(:push).with(batch_update_message).once
         post :update, id: batch.id, title: { '1' => 'foo' }, visibility: 'open', generic_file: { tag: [""] }
+        expect(assigns(:batch_update_job)).to eq(batch_update_message)
         expect(response).to redirect_to routes.url_helpers.dashboard_files_path
         expect(flash[:notice]).to include("Your files are being processed")
       end

data/spec/controllers/generic_files_controller_spec.rb

@@ -15,6 +15,14 @@ describe GenericFilesController do
       let(:mock) { GenericFile.new(id: 'test123') }
       let(:batch) { Batch.create }
       let(:batch_id) { batch.id }
+      let(:collection) {
+        Collection.create(title: 'test collection') do |c|
+          c.apply_depositor_metadata(user.user_key)
+        end
+      }
+      let(:collection_id) { collection.id }
+      let(:collection_noedit) { Collection.create(title: 'test collection - NO EDIT') }
+      let(:collection_noedit_id) { collection_noedit.id }
       let(:file) { fixture_file_upload('/world.png', 'image/png') }
 
       before do
@@ -39,10 +47,22 @@ describe GenericFilesController do
         end
       end
 
+      context "when user tries to upload to a collection they can't edit" do
+        # This shouldn't happen via the UI which will only present to the user collections they can edit.
+        it "adds new file but does not put the file in the collection" do
+          xhr :post, :create, files: [file], Filename: "The world", batch_id: batch_id, permission: { "group" => { "public" => "read" } }, terms_of_service: "1", collection: collection_noedit_id
+          expect(response).to be_success
+
+          updated_collection = Collection.find(collection_id)
+          # This is confirming that the file was NOT added to the collection the user cannot edit
+          expect(updated_collection.member_ids).to eq []
+        end
+      end
+
       context "when everything is perfect" do
         render_views
         it "spawns a content deposit event job" do
-          expect_any_instance_of(Sufia::GenericFile::Actor).to receive(:create_content).with(file, 'world.png', 'content', 'image/png').and_return(true)
+          expect_any_instance_of(Sufia::GenericFile::Actor).to receive(:create_content).with(file, 'world.png', 'content', 'image/png', nil).and_return(true)
           xhr :post, :create, files: [file], 'Filename' => 'The world', batch_id: batch_id, permission: { group: { public: 'read' } }, terms_of_service: '1'
           expect(response.body).to eq '[{"name":null,"size":null,"url":"/files/test123","thumbnail_url":"test123","delete_url":"deleteme","delete_type":"DELETE"}]'
           expect(flash[:error]).to be_nil
@@ -82,6 +102,20 @@ describe GenericFilesController do
           expect(saved_file.depositor).to eq 'jilluser@example.com'
           expect(saved_file.to_solr['depositor_tesim']).to eq ['jilluser@example.com']
         end
+
+        it "adds new file when collection is instructions id" do
+          xhr :post, :create, files: [file], Filename: "The world", batch_id: batch_id, permission: { "group" => { "public" => "read" } }, terms_of_service: "1", collection: '-1'
+          expect(response).to be_success
+        end
+
+        it "adds new file to collection" do
+          xhr :post, :create, files: [file], Filename: "The world", batch_id: batch_id, permission: { "group" => { "public" => "read" } }, terms_of_service: "1", collection: collection_id
+          expect(response).to be_success
+
+          updated_collection = Collection.find(collection_id)
+          # This is confirming that the file was added to the collection
+          expect(updated_collection.member_ids).to eq ['test123']
+        end
       end
 
       context "when the file has a virus" do

data/spec/controllers/my/files_controller_spec.rb

@@ -87,4 +87,9 @@ describe My::FilesController, type: :controller do
       expect(assigns(:batches)).to include("ss-" + batch_id2)
     end
   end
+
+  it "sets add_files_to_collection when provided in params" do
+    get :index, add_files_to_collection: '12345'
+    expect(assigns(:add_files_to_collection)).to eql('12345')
+  end
 end

data/spec/factories/generic_files.rb

@@ -25,6 +25,7 @@ FactoryGirl.define do
         resource_type ["Dissertation"]
         subject %w(lorem ipsum dolor sit amet)
         title ["fake_document.pdf"]
+        mime_type 'application/pdf'
         before(:create) do |gf|
           gf.title = ["Fake PDF Title"]
         end
@@ -36,6 +37,7 @@ FactoryGirl.define do
         initialize_with { new(id: id) }
         subject %w(consectetur adipisicing elit)
         title ["Test Document MP3.mp3"]
+        mime_type 'audio/mpeg'
         read_groups ["public"]
       end
       factory :public_wav do
@@ -46,6 +48,7 @@ FactoryGirl.define do
         resource_type ["Audio", "Dataset"]
         read_groups ["public"]
         title ["Fake Wav File.wav"]
+        mime_type 'audio/wav'
         subject %w(sed do eiusmod tempor incididunt ut labore)
       end
     end

data/spec/features/collection_spec.rb

@@ -25,6 +25,15 @@ describe 'collection', type: :feature do
   let(:title2) { "Test Collection 2" }
   let(:description2) { "Description for collection 2 we are testing." }
 
+  let(:collection1) do
+    Collection.create(title: title1, description: description1,
+                      members: []) { |c| c.apply_depositor_metadata(user.user_key) }
+  end
+  let(:collection2) do
+    Collection.create(title: title2, description: description2,
+                      members: []) { |c| c.apply_depositor_metadata(user.user_key) }
+  end
+
   let(:user) { FactoryGirl.create(:user) }
 
   let(:gfs) do
@@ -140,6 +149,88 @@ describe 'collection', type: :feature do
     end
   end
 
+  describe 'collection sorting' do
+    before do
+      collection1 # create the collections by referencing them
+      sleep(1) # make sure the timestamps aren't equal
+      collection2
+      sleep(1)
+      collection1.title += 'changed'
+      collection1.save
+      # collection 1 is now earlier when sorting by create date but later
+      # when sorting by modified date
+
+      sign_in user
+      visit '/dashboard/collections'
+    end
+
+    it "has creation date for collections" do
+      expect(page).to have_content(collection1.create_date.to_date.to_formatted_s(:standard))
+    end
+
+    it "allows changing sort order" do
+      find(:xpath, "//select[@id='sort']/option[contains(., 'date modified')][contains(@value, 'asc')]") \
+        .select_option
+      click_button('Refresh')
+      expect(page).to have_css("#document_#{collection1.id}")
+      expect(page).to have_css("#document_#{collection2.id}")
+      expect(page.body.index("id=\"document_#{collection1.id}")).to be > page.body.index("id=\"document_#{collection2.id}")
+
+      find(:xpath, "//select[@id='sort']/option[contains(., 'date modified')][contains(@value, 'desc')]") \
+        .select_option
+      click_button('Refresh')
+      expect(page).to have_css("#document_#{collection1.id}")
+      expect(page).to have_css("#document_#{collection2.id}")
+      expect(page.body.index("id=\"document_#{collection1.id}")).to be < page.body.index("id=\"document_#{collection2.id}")
+    end
+  end
+
+  describe 'add files to collection' do
+    let!(:gf1) { gfs[0] }
+    let!(:gf2) { gfs[1] }
+
+    before do
+      collection1 # create collections by referencing them
+      collection2
+      sign_in user
+    end
+
+    it "preselects the collection we are adding files to" do
+      visit "/collections/#{collection1.id}"
+      click_link 'Add files'
+      first('input#check_all').click
+      click_button "Add to Collection"
+      expect(page).to have_css("input#id_#{collection1.id}[checked='checked']")
+      expect(page).not_to have_css("input#id_#{collection2.id}[checked='checked']")
+
+      visit "/collections/#{collection2.id}"
+      click_link 'Add files'
+      first('input#check_all').click
+      click_button "Add to Collection"
+      expect(page).not_to have_css("input#id_#{collection1.id}[checked='checked']")
+      expect(page).to have_css("input#id_#{collection2.id}[checked='checked']")
+    end
+  end
+
+  describe 'upload files to collection' do
+    let(:upload_to_collection) { true }
+    let!(:gf1) { gfs[0] }
+    let!(:gf2) { gfs[1] }
+
+    before do
+      Sufia.config.upload_to_collection = upload_to_collection
+      collection1 # create collections by referencing them
+      collection2
+      sign_in user
+    end
+
+    it "preselects the collection we are uploading files to" do
+      visit "/collections/#{collection1.id}"
+      click_link 'Upload files'
+      expect(page).to have_select('collection', selected: title1)
+    end
+  end
+
   describe 'edit collection' do
     let!(:collection) do
       Collection.create(title: 'collection title', description: 'collection description',

data/spec/features/contact_form_spec.rb

@@ -17,6 +17,7 @@ describe "Sending an email via the contact form", type: :feature do
     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

data/spec/forms/collection_edit_form_spec.rb

@@ -11,10 +11,10 @@ describe Sufia::Forms::CollectionEditForm do
                             :identifier, :based_near, :related_url] }
   end
 
-  describe "unique?" do
+  describe "multiple?" do
     context "with :title" do
-      subject { described_class.unique?(:title) }
-      it { is_expected.to be true }
+      subject { described_class.multiple?(:title) }
+      it { is_expected.to be false }
     end
   end
 end

data/spec/forms/generic_file_edit_form_spec.rb

@@ -23,7 +23,7 @@ describe Sufia::Forms::GenericFileEditForm do
     let(:params) { ActionController::Parameters.new(title: ['foo'], description: [''], "permissions_attributes" => { "2" => { "access" => "edit", "_destroy" => "true", "id" => "a987551e-b87f-427a-8721-3e5942273125" } }) }
     subject { described_class.model_attributes(params) }
 
-    it "onlies change title" do
+    it "only changes title" do
       expect(subject['title']).to eq ["foo"]
       expect(subject['description']).to be_empty
       expect(subject['permissions_attributes']).to eq("2" => { "access" => "edit", "id" => "a987551e-b87f-427a-8721-3e5942273125", "_destroy" => "true" })

data/spec/jobs/create_derivatives_job_spec.rb

@@ -171,4 +171,10 @@ describe CreateDerivativesJob do
       end
     end
   end
+
+  describe 'minimagick setup' do
+    it 'uses posix-spawn' do
+      expect(MiniMagick.shell_api).to eq('posix-spawn')
+    end
+  end
 end

data/spec/models/file_content_datastream_spec.rb

@@ -45,7 +45,7 @@ describe FileContentDatastream, type: :model do
       @generic_file.apply_depositor_metadata('mjg36')
     end
 
-    it "onlies return true when the datastream has actually changed" do
+    it "only returns true when the datastream has actually changed" do
       @generic_file.add_file(File.open(fixture_path + '/world.png', 'rb'), path: 'content', original_name: 'world.png')
       expect(@generic_file.content).to be_changed
       @generic_file.save!

data/spec/models/file_download_stat_spec.rb

@@ -46,7 +46,7 @@ RSpec.describe FileDownloadStat, type: :model do
     describe "cache empty" do
       let(:stats) do
         expect(described_class).to receive(:ga_statistics).and_return(sample_download_statistics)
-        described_class.statistics(file_id, Date.today - 4.day)
+        described_class.statistics(file_id, Date.today - 4.days)
       end
 
       it "includes cached ga data" do
@@ -59,17 +59,17 @@ RSpec.describe FileDownloadStat, type: :model do
         # at this point all data should be cached
         allow(described_class).to receive(:ga_statistics).with(Date.today, file_id).and_raise("We should not call Google Analytics All data should be cached!")
 
-        stats2 = described_class.statistics(file_id, Date.today - 4.day)
+        stats2 = described_class.statistics(file_id, Date.today - 4.days)
         expect(described_class.to_flots stats2).to include(*download_output)
       end
     end
 
     describe "cache loaded" do
-      let!(:file_download_stat) { described_class.create(date: (Date.today - 5.day).to_datetime, file_id: file_id, downloads: "25") }
+      let!(:file_download_stat) { described_class.create(date: (Date.today - 5.days).to_datetime, file_id: file_id, downloads: "25") }
 
       let(:stats) do
         expect(described_class).to receive(:ga_statistics).and_return(sample_download_statistics)
-        described_class.statistics(file_id, Date.today - 5.day)
+        described_class.statistics(file_id, Date.today - 5.days)
       end
 
       it "includes cached data" do

data/spec/models/file_usage_spec.rb

@@ -55,7 +55,7 @@ describe FileUsage, type: :model do
   end
 
   let(:usage) do
-    allow_any_instance_of(GenericFile).to receive(:create_date).and_return((Date.today - 4.day).to_s)
+    allow_any_instance_of(GenericFile).to receive(:create_date).and_return((Date.today - 4.days).to_s)
     expect(FileDownloadStat).to receive(:ga_statistics).and_return(sample_download_statistics)
     expect(FileViewStat).to receive(:ga_statistics).and_return(sample_pageview_statistics)
     described_class.new(file.id)
@@ -123,7 +123,7 @@ describe FileUsage, type: :model do
 
       describe "create date after earliest" do
         let(:usage) do
-          allow_any_instance_of(GenericFile).to receive(:create_date).and_return((Date.today - 4.day).to_s)
+          allow_any_instance_of(GenericFile).to receive(:create_date).and_return((Date.today - 4.days).to_s)
           expect(FileDownloadStat).to receive(:ga_statistics).and_return(sample_download_statistics)
           expect(FileViewStat).to receive(:ga_statistics).and_return(sample_pageview_statistics)
           Sufia.config.analytic_start_date = earliest

data/spec/models/file_view_stat_spec.rb

@@ -47,7 +47,7 @@ RSpec.describe FileViewStat, type: :model do
     describe "cache empty" do
       let(:stats) do
         expect(described_class).to receive(:ga_statistics).and_return(sample_pageview_statistics)
-        described_class.statistics(file_id, Date.today - 4.day, user_id)
+        described_class.statistics(file_id, Date.today - 4.days, user_id)
       end
 
       it "includes cached ga data" do
@@ -61,17 +61,17 @@ RSpec.describe FileViewStat, type: :model do
         # at this point all data should be cached
         allow(described_class).to receive(:ga_statistics).with(Date.today, file_id).and_raise("We should not call Google Analytics All data should be cached!")
 
-        stats2 = described_class.statistics(file_id, Date.today - 5.day)
+        stats2 = described_class.statistics(file_id, Date.today - 5.days)
         expect(described_class.to_flots stats2).to include(*view_output)
       end
     end
 
     describe "cache loaded" do
-      let!(:file_view_stat) { described_class.create(date: (Date.today - 5.day).to_datetime, file_id: file_id, views: "25") }
+      let!(:file_view_stat) { described_class.create(date: (Date.today - 5.days).to_datetime, file_id: file_id, views: "25") }
 
       let(:stats) do
         expect(described_class).to receive(:ga_statistics).and_return(sample_pageview_statistics)
-        described_class.statistics(file_id, Date.today - 5.day)
+        described_class.statistics(file_id, Date.today - 5.days)
       end
 
       it "includes cached data" do

data/spec/models/generic_file_spec.rb

@@ -491,7 +491,7 @@ describe GenericFile, type: :model do
       expect(subject.edit_users).to eq ['jcoyne']
     end
 
-    it "onlies revoke eligible groups" do
+    it "only revokes eligible groups" do
       subject.set_read_groups(['group-2', 'group-3'], ['group-6'])
       # 'group-7' is not eligible to be revoked
       expect(subject.read_groups).to match_array ['group-2', 'group-3', 'group-7']
@@ -643,7 +643,7 @@ describe GenericFile, type: :model do
     end
 
     context "with no end date" do
-      let(:start_date) { 1.days.ago }
+      let(:start_date) { 1.day.ago }
       let(:end_date) { nil }
       before do
         @file.save
@@ -652,7 +652,7 @@ describe GenericFile, type: :model do
     end
 
     context "with an end date" do
-      let(:start_date) { 1.days.ago }
+      let(:start_date) { 1.day.ago }
       let(:end_date) { DateTime.now }
       before do
         @file.save
@@ -661,6 +661,18 @@ describe GenericFile, type: :model do
     end
   end
 
+  describe '#where_digest_is' do
+    subject { described_class.where_digest_is digest_string }
+    let(:digest_string) { 'f794b23c0c6fe1083d0ca8b58261a078cd968967' }
+    before do
+      @file.add_file(File.open(fixture_path + '/world.png'), path: 'content', original_name: 'world.png')
+      @file.save
+    end
+    it 'returns a list of files' do
+      expect(subject).to eq [@file]
+    end
+  end
+
   describe "where_access_is" do
     subject { described_class.where_access_is access_level }
     before do

data/spec/models/geo_names_resource_spec.rb

@@ -1,6 +1,16 @@
 require 'spec_helper'
 
 describe GeoNamesResource, type: :model do
+  before do
+    state = {
+      "totalResultsCount" => 1, "geonames" => [{
+        "countryId" => "1327865", "adminCode1" => "11", "countryName" => "Myanmar [Burma]", "fclName" => "country, state, region,...", "countryCode" => "MM", "lng" => "98", "fcodeName" => "first-order administrative division", "toponymName" => "Shan State", "fcl" => "A", "name" => "Shan State", "fcode" => "ADM1", "geonameId" => 1_297_099, "lat" => "22", "adminName1" => "Shan", "population" => 5_815_384
+      }]
+    }
+    ActiveResource::HttpMock.respond_to do |mock|
+      mock.get "/searchJSON?maxRows=10&q=State&username=", {}, state.to_json
+    end
+  end
   it "finds locations" do
     hits = described_class.find_location("State")
     expect(hits).not_to be_nil

data/spec/models/solr_document_spec.rb

@@ -8,6 +8,34 @@ describe SolrDocument, type: :model do
     it "is a date" do
       expect(subject.date_uploaded).to eq '03/14/2013'
     end
+    it "logs parse errors" do
+      expect(ActiveFedora::Base.logger).to receive(:info).with(/Unable to parse date.*/)
+      subject['date_uploaded_dtsi'] = 'Test'
+      subject.date_uploaded
+    end
+  end
+
+  describe "create_date" do
+    before do
+      subject['system_create_dtsi'] = '2013-03-14T00:00:00Z'
+    end
+    it "is a date" do
+      expect(subject.create_date).to eq '03/14/2013'
+    end
+    it "logs parse errors" do
+      expect(ActiveFedora::Base.logger).to receive(:info).with(/Unable to parse date.*/)
+      subject['system_create_dtsi'] = 'Test'
+      subject.create_date
+    end
+  end
+
+  describe "resource_type" do
+    before do
+      subject['resource_type_tesim'] = ['Image']
+    end
+    it "returns the resource type" do
+      expect(subject.resource_type).to eq ['Image']
+    end
   end
 
   describe '#to_param' do

data/spec/models/system_stats_spec.rb

@@ -0,0 +1,184 @@
+require 'spec_helper'
+
+describe ::SystemStats, type: :model do
+  let(:user1) { FactoryGirl.find_or_create(:user) }
+  let(:morning_two_days_ago) { 2.days.ago.to_date.to_datetime.to_s }
+  let(:yesterday) { 1.day.ago.to_datetime.to_s }
+  let(:this_morning) { 0.days.ago.to_date.to_datetime.to_s }
+
+  let(:stats) { described_class.new(depositor_count, user_stats[:start_date], user_stats[:end_date]) }
+
+  describe "#top_depositors" do
+    let(:user_stats) { {} }
+
+    context "when requested count is withing bounds" do
+      let!(:user2) { FactoryGirl.find_or_create(:archivist) }
+      let(:depositor_count) { 15 }
+
+      # I am specifically creating objects in this test
+      # I am doing this for one test to make sure that the full loop works
+      before do
+        GenericFile.new(id: "abc123") do |gf|
+          gf.apply_depositor_metadata(user1)
+          gf.update_index
+        end
+        GenericFile.new(id: "def123") do |gf|
+          gf.apply_depositor_metadata(user2)
+          gf.update_index
+        end
+        GenericFile.new(id: "zzz123") do |gf|
+          gf.create_date = [2.days.ago]
+          gf.apply_depositor_metadata(user1)
+          gf.update_index
+        end
+        Collection.new(id: "ccc123") do |c|
+          c.apply_depositor_metadata(user1)
+          c.update_index
+        end
+      end
+
+      it "queries for the data" do
+        expect(stats.top_depositors).to include(display_name(user1) => 3, display_name(user2) => 1)
+      end
+    end
+
+    context "when requested count is too small" do
+      let(:depositor_count) { 3 }
+      let(:actual_count) { 5 }
+      it "queries for 5 items" do
+        expect(stats).to receive(:open).with("http://127.0.0.1:8983/solr/test/terms?terms.fl=depositor_tesim&terms.sort=count&terms.limit=#{actual_count}&wt=json&omitHeader=true").and_return(StringIO.new('{"terms":{"depositor_tesim":["example.com",4,"user2",3,"archivist1",1]}}'))
+        stats.top_depositors
+      end
+    end
+
+    context "when requested count is too big" do
+      let(:depositor_count) { 99 }
+      let(:actual_count) { 20 }
+      it "queries for 20 items" do
+        expect(stats).to receive(:open).with("http://127.0.0.1:8983/solr/test/terms?terms.fl=depositor_tesim&terms.sort=count&terms.limit=#{actual_count}&wt=json&omitHeader=true").and_return(StringIO.new('{"terms":{"depositor_tesim":["example.com",4,"user2",3,"archivist1",1]}}'))
+        stats.top_depositors
+      end
+    end
+  end
+
+  def display_name(user)
+    user.user_key.split('@')[0]
+  end
+
+  describe "#document_by_permission" do
+    let(:user_stats) { {} }
+    let(:depositor_count) { nil }
+
+    before do
+      FactoryGirl.build(:public_pdf, depositor: user1, id: "pdf1223").update_index
+      FactoryGirl.build(:public_wav, depositor: user1, id: "wav1223").update_index
+      FactoryGirl.build(:public_mp3, depositor: user1, id: "mp31223", create_date: [2.days.ago]).update_index
+      FactoryGirl.build(:registered_file, depositor: user1, id: "reg1223").update_index
+      FactoryGirl.build(:generic_file, depositor: user1, id: "private1223").update_index
+      Collection.new(id: "ccc123") do |c|
+        c.apply_depositor_metadata(user1)
+        c.update_index
+      end
+    end
+    it "get all documents by permissions" do
+      expect(stats.document_by_permission).to include(public: 3, private: 1, registered: 1, total: 5)
+    end
+
+    context "when passing a start date" do
+      let(:user_stats) { { start_date: yesterday } }
+      it "get documents after date by permissions" do
+        expect(stats.document_by_permission).to include(public: 2, private: 1, registered: 1, total: 4)
+      end
+
+      context "when passing an end date" do
+        let(:user_stats) { { start_date: morning_two_days_ago, end_date: yesterday } }
+        it "get documents between dates by permissions" do
+          expect(stats.document_by_permission).to include(public: 1, private: 0, registered: 0, total: 1)
+        end
+      end
+    end
+  end
+
+  describe "#top_formats" do
+    let(:user_stats) { {} }
+    let(:depositor_count) { nil }
+
+    before do
+      FactoryGirl.build(:public_pdf, depositor: user1, id: "pdf1111").update_index
+      FactoryGirl.build(:public_wav, depositor: user1, id: "wav1111").update_index
+      FactoryGirl.build(:public_mp3, depositor: user1, id: "mp31111", create_date: [2.days.ago]).update_index
+      FactoryGirl.build(:registered_file, depositor: user1, id: "word1111", mime_type: "application/vnd.ms-word.document").update_index
+    end
+
+    subject { stats.top_formats }
+
+    it { is_expected.to include("mpeg" => 1, "pdf" => 1, "wav" => 1, "vnd.ms-word.document" => 1) }
+
+    context "when more than 5 formats available" do
+      before do
+        FactoryGirl.build(:public_pdf, depositor: user1, id: "pdf2222").update_index
+        FactoryGirl.build(:public_wav, depositor: user1, id: "wav2222").update_index
+        FactoryGirl.build(:public_mp3, depositor: user1, id: "mp32222", create_date: [2.days.ago]).update_index
+        FactoryGirl.build(:registered_file, depositor: user1, id: "reg2222", mime_type: "application/vnd.ms-word.document").update_index
+        FactoryGirl.build(:generic_file, depositor: user1, id: "png1111", mime_type: "image/png").update_index
+        FactoryGirl.build(:generic_file, depositor: user1, id: "png2222", mime_type: "image/png").update_index
+        FactoryGirl.build(:generic_file, depositor: user1, id: "jpeg2222", mime_type: "image/jpeg").update_index
+      end
+
+      it do
+        is_expected.to include("mpeg" => 2, "pdf" => 2, "wav" => 2, "vnd.ms-word.document" => 2, "png" => 2)
+        is_expected.not_to include("jpeg" => 1)
+      end
+    end
+  end
+
+  describe "#recent_users" do
+    let!(:user2) { FactoryGirl.find_or_create(:archivist) }
+
+    let(:one_day_ago_date) { 1.day.ago.to_datetime }
+    let(:two_days_ago_date) { 2.days.ago.to_datetime.end_of_day }
+    let(:one_day_ago) { one_day_ago_date.strftime("%Y-%m-%d") }
+    let(:two_days_ago) { two_days_ago_date.strftime("%Y-%m-%d") }
+    let(:depositor_count) { nil }
+
+    subject { stats.recent_users }
+
+    context "without dates" do
+      let(:user_stats) { {} }
+      let(:mock_order) { double }
+      let(:mock_limit) { double }
+      it "defaults to latest 5 users" do
+        expect(mock_order).to receive(:limit).with(5).and_return(mock_limit)
+        expect(User).to receive(:order).with('created_at DESC').and_return(mock_order)
+        is_expected.to eq mock_limit
+      end
+    end
+
+    context "with start date" do
+      let(:user_stats) { { start_date: one_day_ago } }
+
+      it "allows queries against user_stats without an end date " do
+        expect(User).to receive(:recent_users).with(one_day_ago_date, nil).and_return([user2])
+        is_expected.to eq([user2])
+      end
+    end
+    context "with start date and end date" do
+      let(:user_stats) { { start_date: two_days_ago, end_date: one_day_ago } }
+      it "queries" do
+        expect(User).to receive(:recent_users).with(two_days_ago_date, one_day_ago_date).and_return([user2])
+        is_expected.to eq([user2])
+      end
+    end
+  end
+
+  describe "#users_count" do
+    let(:user_stats) { {} }
+    let(:depositor_count) { nil }
+    let!(:user1) { FactoryGirl.find_or_create(:user) }
+    let!(:user2) { FactoryGirl.find_or_create(:archivist) }
+
+    subject { stats.users_count }
+
+    it { is_expected.to eq 2 }
+  end
+end