sufia 7.0.0.beta4 → 7.0.0.rc1

data/spec/models/file_download_stat_spec.rb

@@ -1,7 +1,8 @@
 describe FileDownloadStat, type: :model do
-  let(:file_id) { "99" }
+  let(:file_id) { file.id }
   let(:date) { Time.current }
   let(:file_stat) { described_class.create(downloads: "2", date: date, file_id: file_id) }
+  let(:file) { mock_model(FileSet, id: 99) }
 
   it "has attributes" do
     expect(file_stat).to respond_to(:downloads)
@@ -12,7 +13,7 @@ describe FileDownloadStat, type: :model do
     expect(file_stat.downloads).to eq(2)
   end
 
-  describe "#get_float_statistics" do
+  describe "#statistics" do
     let(:dates) {
       ldates = []
       4.downto(0) { |idx| ldates << (Time.zone.today - idx.day) }
@@ -36,15 +37,14 @@ describe FileDownloadStat, type: :model do
         OpenStruct.new(eventCategory: "Files", eventAction: "Downloaded", eventLabel: "sufia:x920fw85p", date: date_strs[0], totalEvents: "1"),
         OpenStruct.new(eventCategory: "Files", eventAction: "Downloaded", eventLabel: "sufia:x920fw85p", date: date_strs[1], totalEvents: "1"),
         OpenStruct.new(eventCategory: "Files", eventAction: "Downloaded", eventLabel: "sufia:x920fw85p", date: date_strs[2], totalEvents: "2"),
-        OpenStruct.new(eventCategory: "Files", eventAction: "Downloaded", eventLabel: "sufia:x920fw85p", date: date_strs[3], totalEvents: "3"),
-        # OpenStruct.new(eventCategory: "Files", eventAction: "Downloaded", eventLabel: "sufia:x920fw85p", date: date_strs[4], totalEvents: "5"),
+        OpenStruct.new(eventCategory: "Files", eventAction: "Downloaded", eventLabel: "sufia:x920fw85p", date: date_strs[3], totalEvents: "3")
       ]
     }
 
     describe "cache empty" do
       let(:stats) do
         expect(described_class).to receive(:ga_statistics).and_return(sample_download_statistics)
-        described_class.statistics(file_id, Time.zone.today - 4.days)
+        described_class.statistics(file, Time.zone.today - 4.days)
       end
 
       it "includes cached ga data" do
@@ -55,9 +55,9 @@ describe FileDownloadStat, type: :model do
         expect(described_class.to_flots(stats)).to include(*download_output)
 
         # at this point all data should be cached
-        allow(described_class).to receive(:ga_statistics).with(Time.zone.today, file_id).and_raise("We should not call Google Analytics All data should be cached!")
+        allow(described_class).to receive(:ga_statistics).with(Time.zone.today, file).and_raise("We should not call Google Analytics All data should be cached!")
 
-        stats2 = described_class.statistics(file_id, Time.zone.today - 4.days)
+        stats2 = described_class.statistics(file, Time.zone.today - 4.days)
         expect(described_class.to_flots(stats2)).to include(*download_output)
       end
     end
@@ -67,7 +67,7 @@ describe FileDownloadStat, type: :model do
 
       let(:stats) do
         expect(described_class).to receive(:ga_statistics).and_return(sample_download_statistics)
-        described_class.statistics(file_id, Time.zone.today - 5.days)
+        described_class.statistics(file, Time.zone.today - 5.days)
       end
 
       it "includes cached data" do

data/spec/models/file_view_stat_spec.rb

@@ -1,8 +1,9 @@
 RSpec.describe FileViewStat, type: :model do
-  let(:file_id) { "99" }
+  let(:file_id) { file.id }
   let(:user_id) { 123 }
   let(:date) { Time.current }
   let(:file_stat) { described_class.create(views: "25", date: date, file_id: file_id, user_id: user_id) }
+  let(:file) { mock_model(FileSet, id: 99) }
 
   it "has attributes" do
     expect(file_stat).to respond_to(:views)
@@ -14,7 +15,7 @@ RSpec.describe FileViewStat, type: :model do
     expect(file_stat.user_id).to eq(user_id)
   end
 
-  describe "#get_float_statistics" do
+  describe "#statistics" do
     let(:dates) {
       ldates = []
       4.downto(0) { |idx| ldates << (Time.zone.today - idx.day) }
@@ -38,14 +39,13 @@ RSpec.describe FileViewStat, type: :model do
         OpenStruct.new(date: date_strs[0], pageviews: 4),
         OpenStruct.new(date: date_strs[1], pageviews: 8),
         OpenStruct.new(date: date_strs[2], pageviews: 6),
-        OpenStruct.new(date: date_strs[3], pageviews: 10),
-        # OpenStruct.new(date: date_strs[4], pageviews: 2)
+        OpenStruct.new(date: date_strs[3], pageviews: 10)
       ]
     }
     describe "cache empty" do
       let(:stats) do
         expect(described_class).to receive(:ga_statistics).and_return(sample_pageview_statistics)
-        described_class.statistics(file_id, Time.zone.today - 4.days, user_id)
+        described_class.statistics(file, Time.zone.today - 4.days, user_id)
       end
 
       it "includes cached ga data" do
@@ -57,9 +57,9 @@ RSpec.describe FileViewStat, type: :model do
         expect(stats.first.user_id).to eq user_id
 
         # at this point all data should be cached
-        allow(described_class).to receive(:ga_statistics).with(Time.zone.today, file_id).and_raise("We should not call Google Analytics All data should be cached!")
+        allow(described_class).to receive(:ga_statistics).with(Time.zone.today, file).and_raise("We should not call Google Analytics All data should be cached!")
 
-        stats2 = described_class.statistics(file_id, Time.zone.today - 5.days)
+        stats2 = described_class.statistics(file, Time.zone.today - 5.days)
         expect(described_class.to_flots(stats2)).to include(*view_output)
       end
     end
@@ -69,7 +69,7 @@ RSpec.describe FileViewStat, type: :model do
 
       let(:stats) do
         expect(described_class).to receive(:ga_statistics).and_return(sample_pageview_statistics)
-        described_class.statistics(file_id, Time.zone.today - 5.days)
+        described_class.statistics(file, Time.zone.today - 5.days)
       end
 
       it "includes cached data" do

data/spec/models/generic_work_spec.rb

@@ -49,6 +49,30 @@ describe GenericWork do
     end
   end
 
+  describe "featured works" do
+    let(:work) { create(:public_work) }
+    before { FeaturedWork.create(work_id: work.id) }
+
+    subject { work }
+    it { is_expected.to be_featured }
+
+    context "when a previously featured work is deleted" do
+      it "deletes the featured work as well" do
+        expect { work.destroy }.to change { FeaturedWork.all.count }.from(1).to(0)
+      end
+    end
+
+    context "when the work becomes private" do
+      it "deletes the featured work" do
+        expect do
+          work.visibility = Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PRIVATE
+          work.save!
+        end.to change { FeaturedWork.all.count }.from(1).to(0)
+        expect(work).not_to be_featured
+      end
+    end
+  end
+
   describe "metadata" do
     it "has descriptive metadata" do
       expect(subject).to respond_to(:relative_path)

data/spec/models/proxy_deposit_request_spec.rb

@@ -3,10 +3,8 @@ describe ProxyDepositRequest, type: :model do
   let(:receiver) { create(:user) }
   let(:receiver2) { create(:user) }
   let(:work) do
-    GenericWork.new do |w|
-      w.title = ["Test work"]
+    GenericWork.create(title: ["Test work"]) do |w|
       w.apply_depositor_metadata(sender.user_key)
-      w.save!
     end
   end
 
@@ -20,7 +18,7 @@ describe ProxyDepositRequest, type: :model do
   its(:fulfillment_date) { is_expected.to be_nil }
   its(:sender_comment) { is_expected.to eq 'please take this' }
 
-  it { is_expected.to delegate_method(:to_s).to(:work) }
+  it { is_expected.to delegate_method(:to_s).to(:solr_doc) }
 
   context "After approval" do
     before do

data/spec/models/sufia/ability_spec.rb

@@ -1,9 +1,10 @@
 require 'cancan/matchers'
 
 describe Sufia::Ability, type: :model do
+  let(:ability) { Ability.new(user) }
+  subject { ability }
   describe "a user with no roles" do
     let(:user) { nil }
-    subject { Ability.new(user) }
     it { is_expected.not_to be_able_to(:create, FileSet) }
     it { is_expected.not_to be_able_to(:create, TinymceAsset) }
     it { is_expected.not_to be_able_to(:create, ContentBlock) }
@@ -16,7 +17,6 @@ describe Sufia::Ability, type: :model do
 
   describe "a registered user" do
     let(:user) { create(:user) }
-    subject { Ability.new(user) }
     it { is_expected.to be_able_to(:create, FileSet) }
     it { is_expected.not_to be_able_to(:create, TinymceAsset) }
     it { is_expected.not_to be_able_to(:create, ContentBlock) }
@@ -28,7 +28,6 @@ describe Sufia::Ability, type: :model do
   describe "a user in the admin group" do
     let(:user) { create(:user) }
     before { allow(user).to receive_messages(groups: ['admin', 'registered']) }
-    subject { Ability.new(user) }
     it { is_expected.to be_able_to(:create, FileSet) }
     it { is_expected.to be_able_to(:create, TinymceAsset) }
     it { is_expected.to be_able_to(:create, ContentBlock) }
@@ -40,18 +39,13 @@ describe Sufia::Ability, type: :model do
   describe "proxies and transfers" do
     let(:sender) { create(:user) }
     let(:user) { create(:user) }
-    let(:work) do
-      GenericWork.create!(title: ["Test work"]) do |work|
-        work.apply_depositor_metadata(sender.user_key)
-      end
-    end
-    subject { Ability.new(user) }
+    let(:work) { create(:work, user: sender) }
+
     it { should_not be_able_to(:transfer, work.id) }
 
-    describe "depositor_for_document" do
-      it "returns the depositor" do
-        expect(subject.send(:depositor_for_document, work.id)).to eq sender.user_key
-      end
+    describe "user_is_depositor?" do
+      subject { ability.send(:user_is_depositor?, work.id) }
+      it { is_expected.to be false }
     end
 
     context "with a ProxyDepositRequest for a work they have deposited" do

data/spec/models/user_spec.rb

@@ -116,20 +116,6 @@ describe User, type: :model do
     end
   end
 
-  describe "trophy_works" do
-    let(:user) { FactoryGirl.create(:user) }
-    let(:work1) { GenericWork.create(title: ["work A"]) { |w| w.apply_depositor_metadata(user) } }
-    let(:work2) { GenericWork.create(title: ["work B"]) { |w| w.apply_depositor_metadata(user) } }
-    let(:work3) { GenericWork.create(title: ["work C"]) { |w| w.apply_depositor_metadata(user) } }
-    let!(:trophy1) { user.trophies.create!(work_id: work1.id) }
-    let!(:trophy2) { user.trophies.create!(work_id: work2.id) }
-    let!(:trophy3) { user.trophies.create!(work_id: work3.id) }
-
-    it "returns a list of generic works" do
-      expect(user.trophy_works).to eq [work1, work2, work3]
-    end
-  end
-
   describe "activity streams" do
     let(:now) { Time.zone.now.to_i }
     let(:activities) {

data/spec/models/work_view_stat_spec.rb

@@ -1,8 +1,9 @@
 RSpec.describe WorkViewStat, type: :model do
-  let(:work_id) { "199" }
+  let(:work_id) { work.id }
   let(:user_id) { 123 }
   let(:date) { DateTime.new.in_time_zone }
   let(:work_stat) { described_class.create(work_views: "25", date: date, work_id: work_id, user_id: user_id) }
+  let(:work) { mock_model(GenericWork, id: 199) }
 
   it "has attributes" do
     expect(work_stat).to respond_to(:work_views)
@@ -14,7 +15,21 @@ RSpec.describe WorkViewStat, type: :model do
     expect(work_stat.user_id).to eq(user_id)
   end
 
-  describe "#get_float_statistics" do
+  describe ".ga_statistic" do
+    let(:start_date) { 2.days.ago }
+    let(:views) { double }
+    let(:profile) { double(sufia__pageview: views) }
+    let(:expected_path) { Rails.application.routes.url_helpers.curation_concerns_generic_work_path(work) }
+    before do
+      allow(Sufia::Analytics).to receive(:profile).and_return(profile)
+    end
+    it "calls the Legato method with the correct path" do
+      expect(views).to receive(:for_path).with(expected_path)
+      described_class.ga_statistics(start_date, work)
+    end
+  end
+
+  describe "#statistics" do
     let(:dates) {
       ldates = []
       4.downto(0) { |idx| ldates << (Time.zone.today - idx.day) }
@@ -38,14 +53,13 @@ RSpec.describe WorkViewStat, type: :model do
         OpenStruct.new(date: date_strs[0], pageviews: 4),
         OpenStruct.new(date: date_strs[1], pageviews: 8),
         OpenStruct.new(date: date_strs[2], pageviews: 6),
-        OpenStruct.new(date: date_strs[3], pageviews: 10),
-        # OpenStruct.new(date: date_strs[4], pageviews: 2)
+        OpenStruct.new(date: date_strs[3], pageviews: 10)
       ]
     }
     describe "cache empty" do
       let(:stats) do
         expect(described_class).to receive(:ga_statistics).and_return(sample_work_pageview_statistics)
-        described_class.statistics(work_id, Time.zone.today - 4.days, user_id)
+        described_class.statistics(work, Time.zone.today - 4.days, user_id)
       end
 
       it "includes cached ga data" do
@@ -57,9 +71,9 @@ RSpec.describe WorkViewStat, type: :model do
         expect(stats.first.user_id).to eq user_id
 
         # at this point all data should be cached
-        allow(described_class).to receive(:ga_statistics).with(Time.zone.today, work_id).and_raise("We should not call Google Analytics All data should be cached!")
+        allow(described_class).to receive(:ga_statistics).with(Time.zone.today, work).and_raise("We should not call Google Analytics All data should be cached!")
 
-        stats2 = described_class.statistics(work_id, Time.zone.today - 5.days)
+        stats2 = described_class.statistics(work, Time.zone.today - 5.days)
         expect(described_class.to_flots(stats2)).to include(*view_output)
       end
     end
@@ -69,7 +83,7 @@ RSpec.describe WorkViewStat, type: :model do
 
       let(:stats) do
         expect(described_class).to receive(:ga_statistics).and_return(sample_work_pageview_statistics)
-        described_class.statistics(work_id, Time.zone.today - 5.days)
+        described_class.statistics(work, Time.zone.today - 5.days)
       end
 
       it "includes cached data" do

data/spec/presenters/sufia/file_usage_spec.rb

@@ -63,10 +63,6 @@ describe FileUsage, type: :model do
       expect(usage.id).to eq(file.id)
     end
 
-    it "sets the path" do
-      expect(usage.path).to eq("/concern/file_sets/#{URI.encode(file.id, '/')}")
-    end
-
     it "sets the created date" do
       expect(usage.created).to eq(file.create_date)
     end

data/spec/presenters/sufia/trophy_presenter_spec.rb

@@ -0,0 +1,46 @@
+RSpec.describe Sufia::TrophyPresenter do
+  describe "find_by_user" do
+    let(:user) { create(:user) }
+    let(:work1) { create(:work, user: user) }
+    let(:work2) { create(:work, user: user) }
+    let(:work3) { create(:work, user: user) }
+    let!(:trophy1) { user.trophies.create!(work_id: work1.id) }
+    let!(:trophy2) { user.trophies.create!(work_id: work2.id) }
+    let!(:trophy3) { user.trophies.create!(work_id: work3.id) }
+
+    subject { described_class.find_by_user(user) }
+    it "returns a list of generic works" do
+      expect(subject.size).to eq 3
+      expect(subject).to all(be_kind_of described_class)
+    end
+  end
+
+  let(:presenter) { described_class.new(solr_document) }
+  let(:solr_document) { SolrDocument.new(id: '123456', has_model_ssim: 'GenericWork', title_tesim: ['A Title']) }
+
+  describe "id" do
+    subject { presenter.id }
+    it { is_expected.to eq '123456' }
+  end
+
+  describe "to_param" do
+    subject { presenter.to_param }
+    it { is_expected.to eq '123456' }
+  end
+
+  describe "model_name" do
+    subject { presenter.model_name }
+    it { is_expected.to eq GenericWork.model_name }
+  end
+
+  describe 'thumbnail_path' do
+    let(:solr_document) { SolrDocument.new(thumbnail_path_ss: '/foo/bar.png') }
+    subject { presenter.thumbnail_path }
+    it { is_expected.to eq '/foo/bar.png' }
+  end
+
+  describe '#to_s' do
+    subject { presenter.to_s }
+    it { is_expected.to eq("A Title") }
+  end
+end

data/spec/presenters/sufia/user_profile_presenter_spec.rb

@@ -18,6 +18,9 @@ RSpec.describe Sufia::UserProfilePresenter do
     let!(:badtrophy) { user.trophies.create!(work_id: 'not_a_generic_work') }
     subject { presenter.trophies }
 
-    it { is_expected.to match_array [work1, work2, work3] }
+    it "has an array of presenters" do
+      expect(subject).to all(be_kind_of Sufia::TrophyPresenter)
+      expect(subject.map(&:id)).to match_array [work1.id, work2.id, work3.id]
+    end
   end
 end

data/spec/presenters/sufia/work_usage_spec.rb

@@ -1,9 +1,5 @@
 describe WorkUsage, type: :model do
-  let!(:work) do
-    GenericWork.create(id: 'abc12345xy', title: ['bilbo work 1']) do |work|
-      work.apply_depositor_metadata("gordonl")
-    end
-  end
+  let!(:work) { create(:work, id: 'abc12345xy') }
 
   let(:dates) {
     ldates = []
@@ -47,15 +43,17 @@ describe WorkUsage, type: :model do
       expect(usage.id).to eq(work.id)
     end
 
-    it "sets the path" do
-      expect(usage.path).to eq("/concern/generic_works/#{URI.encode(work.id, '/')}")
-    end
-
     it "sets the created date" do
       expect(usage.created).to eq(work.create_date)
     end
   end
 
+  describe "#to_s" do
+    let(:work) { create(:work, title: ['Butter sculpture']) }
+    subject { usage.to_s }
+    it { is_expected.to eq 'Butter sculpture' }
+  end
+
   describe "statistics" do
     let!(:system_timezone) { ENV['TZ'] }
     before do
@@ -125,14 +123,7 @@ describe WorkUsage, type: :model do
 
   describe "on a migrated work" do
     let(:date_uploaded) { "2014-12-31" }
-
-    let(:work_migrated) do
-      GenericWork.create(id: '678901234', title: ['bilbo work 2']) do |work|
-        work.apply_depositor_metadata("gordonl")
-        work.date_uploaded = date_uploaded
-        work.save
-      end
-    end
+    let(:work_migrated) { create(:work, id: '678901234', date_uploaded: date_uploaded) }
 
     let(:usage) {
       expect(WorkViewStat).to receive(:ga_statistics).and_return(sample_pageview_statistics)

data/spec/routing/route_spec.rb

@@ -115,12 +115,6 @@ describe 'Routes', type: :routing do
     end
   end
 
-  describe 'Authorities' do
-    it "routes to query" do
-      expect(get: '/authorities/subject/bio').to route_to(controller: 'authorities', action: 'query', model: 'subject', term: 'bio')
-    end
-  end
-
   describe 'Trophies' do
     it 'routes to user trophies' do
       expect(post: '/works/1234abc/trophy').to route_to(controller: 'sufia/trophies', action: 'toggle_trophy', id: '1234abc')

data/spec/spec_helper.rb

@@ -21,6 +21,7 @@ require 'engine_cart'
 EngineCart.load_application!
 
 require 'devise'
+require 'devise/version'
 require 'mida'
 require 'rspec/rails'
 require 'rspec/its'
@@ -150,9 +151,14 @@ RSpec.configure do |config|
 
   config.include Shoulda::Matchers::Independent
 
-  config.include Devise::TestHelpers, type: :controller
-  config.include EngineRoutes, type: :controller
+  if Devise::VERSION >= '4.2'
+    # This is for an unreleased version of Devise (will either be 4.2 or 5.0)
+    config.include Devise::Test::ControllerHelpers, type: :controller
+  else
+    config.include Devise::TestHelpers, type: :controller
+  end
 
+  config.include EngineRoutes, type: :controller
   config.include Warden::Test::Helpers, type: :feature
   config.after(:each, type: :feature) { Warden.test_reset! }