sufia 6.0.0 → 6.1.0

data/spec/models/local_authority_spec.rb

@@ -90,7 +90,7 @@ describe LocalAuthority, :type => :model do
       it "should return entries by term" do
         term = DomainTerm.where(model: "my_tests", term: "genre").first
         authorities = term.local_authorities.collect(&:id).uniq
-        hits = LocalAuthorityEntry.where("local_authority_id in (?)", authorities).where("label like ?", "A%").select("label, uri").limit(25)
+        LocalAuthorityEntry.where("local_authority_id in (?)", authorities).where("label like ?", "A%").select("label, uri").limit(25)
         expect(LocalAuthority.entries_by_term("my_tests", "genre", "A").count).to eq(6)
       end
     end

data/spec/models/proxy_deposit_request_spec.rb

@@ -62,7 +62,7 @@ describe ProxyDepositRequest, type: :model do
 
     its(:status) { is_expected.to eq 'canceled' }
     its(:fulfillment_date) { is_expected.not_to be_nil }
-   end
+  end
 
   describe 'transfer' do
     context 'when the transfer_to user is not found' do

data/spec/models/trophy_spec.rb

@@ -1,24 +1,24 @@
 require 'spec_helper'
 
 describe Trophy, :type => :model do
-   before(:all) do
+  before(:all) do
     @trophy = Trophy.create(user_id:99,generic_file_id:"99")
   end
 
   it "should have a user" do
-     expect(@trophy).to respond_to(:user_id)
-     expect(@trophy.user_id).to eq(99)
+    expect(@trophy).to respond_to(:user_id)
+    expect(@trophy.user_id).to eq(99)
   end
 
   it "should have a file" do
-     expect(@trophy).to respond_to(:generic_file_id)
-     expect(@trophy.generic_file_id).to eq("99")
+    expect(@trophy).to respond_to(:generic_file_id)
+    expect(@trophy.generic_file_id).to eq("99")
   end
 
   it "should not allow six trophies" do
-     (1..6).each {|n| Trophy.create(user_id:120,generic_file_id:n.to_s)}
-     expect(Trophy.where(user_id:120).count).to eq(5)
-     Trophy.where(user_id:120).map(&:delete)
+    (1..6).each { |n| Trophy.create(user_id:120,generic_file_id:n.to_s) }
+    expect(Trophy.where(user_id:120).count).to eq(5)
+    Trophy.where(user_id:120).map(&:delete)
   end
 end
 

data/spec/models/user_spec.rb

@@ -22,6 +22,39 @@ describe User, :type => :model do
     expect(user).to respond_to(:linkedin_handle)
     expect(user).to respond_to(:orcid)
   end
+
+  describe 'Arkivo and Zotero integration' do
+    it 'sets an Arkivo token after_initialize if API is enabled' do
+      expect(User.new).to respond_to(:arkivo_token)
+    end
+
+    describe 'Arkivo token generation' do
+      before do
+        allow(SecureRandom).to receive(:base64).with(24).and_return(token1, token1, token2)
+      end
+
+      let(:token1) { 'token1' }
+      let(:token2) { 'token2' }
+
+      it 'generates a new token if a user is found with the existing token' do
+        user1 = User.create(email: 'foo@example.org', password: 'foobarbaz')
+        expect(user1.arkivo_token).to eq token1
+        user2 = User.create(email: 'bar@example.org', password: 'bazquuxquuux')
+        expect(user2.arkivo_token).to eq token2
+      end
+    end
+
+    describe 'Zotero tokens' do
+      let(:token) { 'something' }
+
+      it 'has a custom getter/setter for Zotero request tokens' do
+        user.zotero_token = token
+        expect(user.read_attribute(:zotero_token)).to eq Marshal::dump(token)
+        expect(user.zotero_token).to eq token
+      end
+    end
+  end
+
   describe 'ORCID validation and normalization' do
     it 'saves when a valid bare ORCID is supplied' do
       user.orcid = '0000-0000-1111-2222'

data/spec/presenters/sufia/collection_presenter_spec.rb

@@ -8,7 +8,7 @@ describe Sufia::CollectionPresenter do
                             :language, :identifier, :based_near, :related_url] }
   end
 
-  let(:collection) { Collection.new(description: 'a nice collection', title: 'A clever title') }
+  let(:collection) { Collection.new(id: 'my-nice-collection', description: 'a nice collection', title: 'A clever title') }
   let(:presenter) { described_class.new(collection) }
 
   describe "#terms_with_values" do

data/spec/routing/api_route_spec.rb

@@ -0,0 +1,91 @@
+require 'spec_helper'
+
+describe 'routing and paths', type: :routing do
+  routes { Sufia::Engine.routes }
+
+  let(:item_id) { '123' }
+
+  describe 'Arkivo' do
+    context 'with a constraint defined' do
+      before do
+        allow(Sufia::ArkivoConstraint).to receive(:matches?) { false }
+      end
+
+      it 'does not recognize routes' do
+        expect(post: '/api/items').not_to be_routable
+      end
+    end
+
+    context 'without a constraint defined' do
+      before do
+        allow(Sufia::ArkivoConstraint).to receive(:matches?) { true }
+      end
+
+      it 'routes POSTs to the items resource' do
+        expect(post: '/api/items').to route_to(controller: 'api/items', action: 'create', format: :json)
+      end
+
+      it 'does not route GETs to the items resource' do
+        expect(get: '/api/items').not_to route_to(controller: 'api/items', action: 'index', format: :json)
+      end
+
+      it 'does not route DELETEs to the items resource' do
+        expect(delete: '/api/items').not_to route_to(controller: 'api/items', action: 'destroy', format: :json)
+      end
+
+      it 'does not route PUTs to the items resource' do
+        expect(put: '/api/items').not_to route_to(controller: 'api/items', action: 'update', format: :json)
+      end
+
+      it 'does not route PATCHes to the items resource' do
+        expect(patch: '/api/items').not_to route_to(controller: 'api/items', action: 'update', format: :json)
+      end
+
+      context 'with a member resource' do
+        subject { "/api/items/#{item_id}" }
+
+        it 'routes GETs to an item resource' do
+          expect(get: subject).to route_to(controller: 'api/items', action: 'show', id: item_id, format: :json)
+        end
+
+        it 'routes PUTs to an item resource' do
+          expect(put: subject).to route_to(controller: 'api/items', action: 'update', id: item_id, format: :json)
+        end
+
+        it 'routes DELETEs to an item resource' do
+          expect(delete: subject).to route_to(controller: 'api/items', action: 'destroy', id: item_id, format: :json)
+        end
+      end
+    end
+  end
+
+  describe 'Zotero' do
+    it 'routes GETs to the zotero resource' do
+      expect(get: '/api/zotero').to route_to(controller: 'api/zotero', action: 'initiate')
+    end
+  end
+
+  describe 'Zotero callbacks' do
+    it 'routes GETs to the callback resource' do
+      expect(get: '/api/zotero/callback').to route_to(controller: 'api/zotero', action: 'callback')
+    end
+  end
+
+  describe 'path helpers' do
+    it 'has a path for creating new items' do
+      expect(api_items_path).to eq '/api/items'
+    end
+
+    it 'has a path for operating on existing items' do
+      expect(api_item_path(item_id)).to eq "/api/items/#{item_id}"
+    end
+
+    it 'has a path for initiating Zotero authentication' do
+      expect(api_zotero_initiate_path).to eq '/api/zotero'
+    end
+
+    it 'has a path for Zotero authN callbacks' do
+      expect(api_zotero_callback_path).to eq '/api/zotero/callback'
+    end
+  end
+end

data/spec/routing/route_spec.rb

@@ -72,7 +72,7 @@ describe 'Routes', :type => :routing do
       expect({ get: '/dashboard' }).to route_to(controller: 'dashboard', action: 'index')
     end
 
-      it "should route to dashboard activity" do
+    it "should route to dashboard activity" do
       expect({ get: '/dashboard/activity' }).to route_to(controller: 'dashboard', action: 'activity')
     end
 

data/spec/services/generic_file_audit_service_spec.rb

@@ -44,19 +44,55 @@ describe Sufia::GenericFileAuditService do
 
   describe "#audit_stat" do
     subject { service.send(:audit_stat) }
-    context "when no audits have been run" do
-      it "should report that audits have not been run" do
-        expect(subject).to eq "Audits have not yet been run on this file."
+
+    describe "file loaded from fedora" do
+      context "when no audits have been run" do
+        it "should report that audits have not been run" do
+          expect(subject).to eq "Audits have not yet been run on this file."
+        end
+      end
+
+      context "when no audit is passing" do
+        before do
+         ChecksumAuditLog.create!(pass: 1, generic_file_id: f.id, version: f.content.versions.first.label, dsid: 'content')
+        end
+
+        it "should report that audit result" do
+          expect(subject).to eq 1
+        end
       end
     end
 
-    context "when no audit is pasing" do
-      before do
-       ChecksumAuditLog.create!(pass: 1, generic_file_id: f.id, version: f.content.versions.first.label, dsid: 'content')
+    describe "file loaded from solr" do
+      let(:solr_file) { GenericFile.load_instance_from_solr(f.id) }
+      let(:service) { Sufia::GenericFileAuditService.new(solr_file) }
+
+      it "should not audit by version" do
+        expect(service).not_to receive(:audit_stat_by_version)
+        expect(subject).to eq "Audits have not yet been run on this file."
       end
 
-      it "should report that audits have not been run" do
-        expect(subject).to eq 1
+      context "when no audit is passing" do
+        before do
+          ChecksumAuditLog.create!(pass: 1, generic_file_id: f.id, version: f.content.versions.first.label, dsid: 'content')
+        end
+
+        it "should report that audit result" do
+          expect(service).not_to receive(:audit_stat_by_version)
+          expect(subject).to eq 1
+        end
+      end
+
+      context "when one audit is passing" do
+        before do
+          ChecksumAuditLog.create!(pass: 0, generic_file_id: f.id, version: f.content.versions.first.label, dsid: 'content')
+          ChecksumAuditLog.create!(pass: 1, generic_file_id: f.id, version: f.content.versions.first.label, dsid: 'content')
+        end
+
+        it "should report that audit result" do
+          expect(service).not_to receive(:audit_stat_by_version)
+          expect(subject).to eq 0
+        end
       end
     end
   end

data/spec/spec_helper.rb

@@ -1,13 +1,14 @@
+require 'coveralls'
+Coveralls.wear!
+
 ENV["RAILS_ENV"] ||= 'test'
 require "bundler/setup"
 
-
 require 'factory_girl'
 require 'engine_cart'
 EngineCart.load_application!
 
 require 'devise'
-
 require 'mida'
 require 'rspec/rails'
 require 'rspec/its'
@@ -20,6 +21,7 @@ require 'equivalent-xml'
 require 'equivalent-xml/rspec_matchers'
 require 'database_cleaner'
 require 'support/features'
+require 'support/rake'
 require 'support/input_support'
 require 'byebug' unless ENV['TRAVIS']
 
@@ -73,6 +75,19 @@ end
 
 Resque.inline = Rails.env.test?
 
+class JsonStrategy
+  def initialize
+    @strategy = FactoryGirl.strategy_by_name(:create).new
+  end
+
+  delegate :association, to: :@strategy
+
+  def result(evaluation)
+    @strategy.result(evaluation).to_json
+  end
+end
+
+FactoryGirl.register_strategy(:json, JsonStrategy)
 FactoryGirl.definition_file_paths = [File.expand_path("../factories", __FILE__)]
 FactoryGirl.find_definitions
 
@@ -134,7 +149,7 @@ RSpec.configure do |config|
 end
 
 module FactoryGirl
-  def self.find_or_create(handle, by=:email)
+  def self.find_or_create(handle, by = :email)
     tmpl = FactoryGirl.build(handle)
     tmpl.class.send("find_by_#{by}".to_sym, tmpl.send(by)) || FactoryGirl.create(handle)
   end

data/spec/support/features.rb

@@ -4,10 +4,8 @@ require File.expand_path('../fixture_helpers', __FILE__)
 require File.expand_path('../selectors', __FILE__)
 require File.expand_path('../proxies', __FILE__)
 require File.expand_path('../locations', __FILE__)
-require File.expand_path('../poltergeist', __FILE__)
 require File.expand_path('../cleaner', __FILE__)
 require File.expand_path('../statistic_helper', __FILE__)
-require File.expand_path('../rake_output', __FILE__)
 
 RSpec.configure do |config|
   config.include Features::SessionHelpers, type: :feature

data/spec/support/locations.rb

@@ -1,30 +1,9 @@
 module Locations
-  def go_to_dashboard
-    visit '/dashboard'
-    # causes selenium to wait until text appears on the page
-    expect(page).to have_content('My Dashboard')
-  end
-
   def go_to_dashboard_files
     visit '/dashboard/files'
     expect(page).to have_selector('li.active', text: "My Files")
   end
 
-  def go_to_dashboard_collections
-    visit '/dashboard/collections'
-    expect(page).to have_content('My Collections')
-  end
-
-  def go_to_dashboard_shares
-    visit '/dashboard/shares'
-    expect(page).to have_content('Files Shared with Me')
-  end
-
-  def go_to_dashboard_highlights
-    visit '/dashboard/highlights'
-    expect(page).to have_content('My Highlights')
-  end
-
   def go_to_user_profile
     first(".dropdown-toggle").click
     click_link "my profile"

data/spec/support/rake.rb

@@ -0,0 +1,41 @@
+require 'rake'
+
+module RakeHelper
+  def load_rake_environment(files)
+    @rake = Rake::Application.new
+    Rake.application = @rake
+    Rake::Task.define_task(:environment)
+    files.each {|file| load file}
+  end
+
+  def run_task(task, arg = nil)
+    capture_stdout_stderr do
+      @rake[task].invoke(arg)
+    end
+  end
+
+  # saves original $stdout in variable
+  # set $stdout as local instance of StringIO
+  # yields to code execution
+  # returns the local instance of StringIO
+  # resets $stdout to original value
+  def capture_stdout_stderr
+    out = StringIO.new
+    err = StringIO.new
+    $stdout = out
+    $stderr = err
+    begin
+      yield
+    rescue SystemExit => e
+      puts "error = #{e.inspect}"
+    end
+    return "Output: #{out.string}\n Errors:#{err.string}"
+  ensure
+    $stdout = STDOUT
+    $stdout = STDERR
+  end
+
+  RSpec.configure do |config|
+    config.include RakeHelper
+  end
+end

data/spec/support/selectors.rb

@@ -22,56 +22,6 @@ module Selectors
         find '.dropdown-toggle'
       end
     end
-
-    def db_item_title item
-      within "#document_#{item.id}" do
-        find "#src_copy_link#{item.id}"
-      end
-    end
-
-    def db_file_checkbox file
-      within "#document_#{file.id}" do
-        find '.batch_document_selector'
-      end
-    end
-
-    def db_collection_radio_button collection
-      within '#collection-list-container' do
-        find "input[id*='#{collection.id}']"
-      end
-    end
-
-    def db_create_empty_collection_button
-      first '#hydra-collection-add'
-    end
-
-    def db_create_populated_collection_button
-      within '#collection-list-container' do
-        first '#hydra-collection-add'
-      end
-    end
-
-    def db_visibility_link file
-      within "#document_#{file.id}" do
-        find "a#permission_#{file.id}"
-      end
-    end
-
-    def db_facet_category_toggle id
-      find("a[data-target='#{id}']")
-    end
-  end
-
-  module EditCollections
-
-    def ec_update_submit
-      within '.col-xs-12.col-sm-10' do
-        within '.primary-actions' do
-          find_button 'Update Collection'
-        end
-      end
-    end
-
   end
 
   module NewTransfers