sufia 6.2.0 → 6.3.0

data/spec/presenters/presenter_renderer_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe Sufia::PresenterRenderer, type: :view do
   let(:generic_file) { GenericFile.new }
   let(:presenter) { Sufia::GenericFilePresenter.new(generic_file) }
-  let(:renderer) { Sufia::PresenterRenderer.new(presenter, view) }
+  let(:renderer) { described_class.new(presenter, view) }
 
   describe "#label" do
     context "of a field with a translation" do

data/spec/presenters/sufia/generic_file_presenter_spec.rb

@@ -2,15 +2,15 @@ require 'spec_helper'
 
 describe Sufia::GenericFilePresenter do
   describe ".terms" do
-    it "should return a list" do
+    it "returns a list" do
       expect(described_class.terms).to eq([:resource_type, :title,
-        :creator, :contributor, :description, :tag, :rights, :publisher,
-        :date_created, :subject, :language, :identifier, :based_near,
-        :related_url])
+                                           :creator, :contributor, :description, :tag, :rights, :publisher,
+                                           :date_created, :subject, :language, :identifier, :based_near,
+                                           :related_url])
     end
   end
 
-  let(:presenter) { Sufia::GenericFilePresenter.new(file) }
+  let(:presenter) { described_class.new(file) }
 
   describe '#tweeter' do
     let(:file) { build(:generic_file).tap { |f| f.apply_depositor_metadata(user) } }

data/spec/presenters/sufia/version_list_presenter_spec.rb

@@ -17,10 +17,10 @@ describe Sufia::VersionListPresenter, :no_clean do
     end
   end
 
-  subject { Sufia::VersionListPresenter.new([resource_version, resource_version2]) }
+  subject { described_class.new([resource_version, resource_version2]) }
 
   describe "#each" do
-    it "should yield version_presenters" do
+    it "yields version_presenters" do
       versions_descending = []
       subject.each do |v|
         expect(v).to be_kind_of Sufia::VersionPresenter

data/spec/presenters/sufia/version_presenter_spec.rb

@@ -9,7 +9,7 @@ describe Sufia::VersionPresenter, :no_clean do
     end
   end
 
-  let(:presenter) { Sufia::VersionPresenter.new(resource_version) }
+  let(:presenter) { described_class.new(resource_version) }
 
   describe "#label" do
     subject { presenter.label }

data/spec/routing/featured_works_route_spec.rb

@@ -1,15 +1,15 @@
 require 'spec_helper'
 
-describe "file routes", :type => :routing do
+describe "file routes", type: :routing do
   routes { Sufia::Engine.routes }
-  it 'should create a featured_work' do
+  it 'creates a featured_work' do
     expect(post: '/files/1/featured_work').to route_to(controller: 'featured_works', action: 'create', id: '1')
   end
-  it 'should remove a featured_work' do
+  it 'removes a featured_work' do
     expect(delete: '/files/1/featured_work').to route_to(controller: 'featured_works', action: 'destroy', id: '1')
   end
 
-  it 'should update a collection of featured works' do
+  it 'updates a collection of featured works' do
     expect(featured_work_lists_path).to eq '/featured_works'
     expect(post: '/featured_works').to route_to(controller: 'featured_work_lists', action: 'create')
   end

data/spec/routing/ownership_transfers_route_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe "proxy deposit and transfers routing", :type => :routing do
+describe "proxy deposit and transfers routing", type: :routing do
   routes { Sufia::Engine.routes }
 
   it "lists transfers" do

data/spec/routing/route_spec.rb

@@ -1,210 +1,210 @@
 require 'spec_helper'
 
-describe 'Routes', :type => :routing do
+describe 'Routes', type: :routing do
   routes { Sufia::Engine.routes }
 
   describe 'Homepage' do
-    it 'should route the root url to the homepage controller' do
-      expect({ get: '/' }).to route_to(controller: 'homepage', action: 'index')
+    it 'routes the root url to the homepage controller' do
+      expect(get: '/').to route_to(controller: 'homepage', action: 'index')
     end
   end
 
   describe 'GenericFile' do
-    it 'should route to citation' do
-      expect({ get: '/files/1/citation' }).to route_to(controller: 'generic_files', action: 'citation', id: '1')
+    it 'routes to citation' do
+      expect(get: '/files/1/citation').to route_to(controller: 'generic_files', action: 'citation', id: '1')
     end
 
-    it 'should route to stats' do
-      expect({ get: '/files/1/stats' }).to route_to(controller: 'generic_files', action: 'stats', id: '1')
+    it 'routes to stats' do
+      expect(get: '/files/1/stats').to route_to(controller: 'generic_files', action: 'stats', id: '1')
     end
 
-    it 'should route to audit' do
-      expect({ post: '/files/7/audit' }).to route_to(controller: 'generic_files', action: 'audit', id: '7')
+    it 'routes to audit' do
+      expect(post: '/files/7/audit').to route_to(controller: 'generic_files', action: 'audit', id: '7')
     end
 
-    it 'should route to create' do
-      expect({ post: '/files' }).to route_to(controller: 'generic_files', action: 'create')
+    it 'routes to create' do
+      expect(post: '/files').to route_to(controller: 'generic_files', action: 'create')
     end
 
-    it 'should route to new' do
-      expect({ get: '/files/new' }).to route_to(controller: 'generic_files', action: 'new')
+    it 'routes to new' do
+      expect(get: '/files/new').to route_to(controller: 'generic_files', action: 'new')
     end
 
-    it 'should route to edit' do
-      expect({ get: '/files/3/edit' }).to route_to(controller: 'generic_files', action: 'edit', id: '3')
+    it 'routes to edit' do
+      expect(get: '/files/3/edit').to route_to(controller: 'generic_files', action: 'edit', id: '3')
     end
 
-    it "should route to show" do
-      expect({ get: '/files/4' }).to route_to(controller: 'generic_files', action: 'show', id: '4')
+    it "routes to show" do
+      expect(get: '/files/4').to route_to(controller: 'generic_files', action: 'show', id: '4')
     end
 
-    it "should route to update" do
-      expect({ put: '/files/5' }).to route_to(controller: 'generic_files', action: 'update', id: '5')
+    it "routes to update" do
+      expect(put: '/files/5').to route_to(controller: 'generic_files', action: 'update', id: '5')
     end
 
-    it "should route to destroy" do
-      expect({ delete: '/files/6' }).to route_to(controller: 'generic_files', action: 'destroy', id: '6')
+    it "routes to destroy" do
+      expect(delete: '/files/6').to route_to(controller: 'generic_files', action: 'destroy', id: '6')
     end
 
-    it "should *not* route to index" do
-      expect({ get: '/files' }).not_to route_to(controller: 'generic_files', action: 'index')
+    it "*not*s route to index" do
+      expect(get: '/files').not_to route_to(controller: 'generic_files', action: 'index')
     end
   end
 
   describe 'Batch' do
-    it "should route to edit" do
-      expect({ get: '/batches/1/edit' }).to route_to(controller: 'batch', action: 'edit', id: '1')
+    it "routes to edit" do
+      expect(get: '/batches/1/edit').to route_to(controller: 'batch', action: 'edit', id: '1')
     end
 
-    it "should route to update" do
-      expect({ post: '/batches/2' }).to route_to(controller: 'batch', action: 'update', id: '2')
+    it "routes to update" do
+      expect(post: '/batches/2').to route_to(controller: 'batch', action: 'update', id: '2')
     end
   end
 
   describe 'Download' do
-    it "should route to show" do
-      expect({ get: '/downloads/9' }).to route_to(controller: 'downloads', action: 'show', id: '9')
+    it "routes to show" do
+      expect(get: '/downloads/9').to route_to(controller: 'downloads', action: 'show', id: '9')
     end
   end
 
   describe 'Dashboard' do
-    it "should route to dashboard" do
-      expect({ get: '/dashboard' }).to route_to(controller: 'dashboard', action: 'index')
+    it "routes to dashboard" do
+      expect(get: '/dashboard').to route_to(controller: 'dashboard', action: 'index')
     end
 
-    it "should route to dashboard activity" do
-      expect({ get: '/dashboard/activity' }).to route_to(controller: 'dashboard', action: 'activity')
+    it "routes to dashboard activity" do
+      expect(get: '/dashboard/activity').to route_to(controller: 'dashboard', action: 'activity')
     end
 
-    it "should route to my files tab" do
-      expect({ get: '/dashboard/files' }).to route_to(controller: 'my/files', action: 'index')
+    it "routes to my files tab" do
+      expect(get: '/dashboard/files').to route_to(controller: 'my/files', action: 'index')
     end
 
-    it "should route to my collections tab" do
-      expect({ get: '/dashboard/collections' }).to route_to(controller: 'my/collections', action: 'index')
+    it "routes to my collections tab" do
+      expect(get: '/dashboard/collections').to route_to(controller: 'my/collections', action: 'index')
     end
 
-    it "should route to my highlighted tab" do
-      expect({ get: '/dashboard/highlights' }).to route_to(controller: 'my/highlights', action: 'index')
+    it "routes to my highlighted tab" do
+      expect(get: '/dashboard/highlights').to route_to(controller: 'my/highlights', action: 'index')
     end
 
-    it "should route to my shared tab" do
-      expect({ get: '/dashboard/shares' }).to route_to(controller: 'my/shares', action: 'index')
+    it "routes to my shared tab" do
+      expect(get: '/dashboard/shares').to route_to(controller: 'my/shares', action: 'index')
     end
   end
 
   describe 'Advanced Search' do
-    it "should route to search" do
-      expect({ get: '/search' }).to route_to(controller: 'advanced', action: 'index')
+    it "routes to search" do
+      expect(get: '/search').to route_to(controller: 'advanced', action: 'index')
     end
   end
 
   describe 'Authorities' do
-    it "should route to query" do
-      expect({ get: '/authorities/subject/bio' }).to route_to(controller: 'authorities', action: 'query', model: 'subject', term: 'bio')
+    it "routes to query" do
+      expect(get: '/authorities/subject/bio').to route_to(controller: 'authorities', action: 'query', model: 'subject', term: 'bio')
     end
   end
 
   describe 'Users' do
-    it 'should route to user trophies' do
-      expect({ post: '/users/bob135/trophy' }).to route_to(controller: 'users', action: 'toggle_trophy', id: 'bob135')
+    it 'routes to user trophies' do
+      expect(post: '/users/bob135/trophy').to route_to(controller: 'users', action: 'toggle_trophy', id: 'bob135')
     end
-    it 'should route to user profile' do
-      expect({ get: '/users/bob135' }).to route_to(controller: 'users', action: 'show', id: 'bob135')
+    it 'routes to user profile' do
+      expect(get: '/users/bob135').to route_to(controller: 'users', action: 'show', id: 'bob135')
     end
 
-    it "should route to edit profile" do
-      expect({ get: '/users/bob135/edit' }).to route_to(controller: 'users', action: 'edit', id: 'bob135')
+    it "routes to edit profile" do
+      expect(get: '/users/bob135/edit').to route_to(controller: 'users', action: 'edit', id: 'bob135')
     end
 
-    it "should route to update profile" do
-      expect({ put: '/users/bob135' }).to route_to(controller: 'users', action: 'update', id: 'bob135')
+    it "routes to update profile" do
+      expect(put: '/users/bob135').to route_to(controller: 'users', action: 'update', id: 'bob135')
     end
 
-    it "should route to user follow" do
-      expect({ post: '/users/bob135/follow' }).to route_to(controller: 'users', action: 'follow', id: 'bob135')
+    it "routes to user follow" do
+      expect(post: '/users/bob135/follow').to route_to(controller: 'users', action: 'follow', id: 'bob135')
     end
 
-    it "should route to user unfollow" do
-      expect({ post: '/users/bob135/unfollow' }).to route_to(controller: 'users', action: 'unfollow', id: 'bob135')
+    it "routes to user unfollow" do
+      expect(post: '/users/bob135/unfollow').to route_to(controller: 'users', action: 'unfollow', id: 'bob135')
     end
   end
 
   describe "Directory" do
-    it "should route to user" do
-      expect({ get: '/directory/user/xxx666' }).to route_to(controller: 'directory', action: 'user', uid: 'xxx666')
+    it "routes to user" do
+      expect(get: '/directory/user/xxx666').to route_to(controller: 'directory', action: 'user', uid: 'xxx666')
     end
 
-    it "should route to user attribute" do
-      expect({ get: '/directory/user/zzz777/email' }).to route_to(controller: 'directory', action: 'user_attribute', uid: 'zzz777', attribute: 'email')
+    it "routes to user attribute" do
+      expect(get: '/directory/user/zzz777/email').to route_to(controller: 'directory', action: 'user_attribute', uid: 'zzz777', attribute: 'email')
     end
 
-    it "should route to group and allow periods" do
-      expect({ get: '/directory/group/all.staff' }).to route_to(controller: 'directory', action: 'group', cn: 'all.staff')
+    it "routes to group and allow periods" do
+      expect(get: '/directory/group/all.staff').to route_to(controller: 'directory', action: 'group', cn: 'all.staff')
     end
   end
 
   describe "Notifications" do
-    it "should have index" do
-      expect( get: '/notifications').to route_to(controller: 'mailbox', action: 'index')
+    it "has index" do
+      expect(get: '/notifications').to route_to(controller: 'mailbox', action: 'index')
       expect(notifications_path).to eq '/notifications'
     end
-    it "should allow deleting" do
-      expect( delete: '/notifications/123').to route_to(controller: 'mailbox', action: 'destroy', id: '123')
+    it "allows deleting" do
+      expect(delete: '/notifications/123').to route_to(controller: 'mailbox', action: 'destroy', id: '123')
       expect(notification_path(123)).to eq '/notifications/123'
     end
-    it "should allow deleting all of them" do
-      expect( delete: '/notifications/delete_all').to route_to(controller: 'mailbox', action: 'delete_all')
+    it "allows deleting all of them" do
+      expect(delete: '/notifications/delete_all').to route_to(controller: 'mailbox', action: 'delete_all')
       expect(delete_all_notifications_path).to eq '/notifications/delete_all'
     end
   end
 
   describe "Contact Form" do
-    it "should route to new" do
-      expect({ get: '/contact' }).to route_to(controller: 'contact_form', action: 'new')
+    it "routes to new" do
+      expect(get: '/contact').to route_to(controller: 'contact_form', action: 'new')
     end
 
-    it "should route to create" do
-      expect({ post: '/contact' }).to route_to(controller: 'contact_form', action: 'create')
+    it "routes to create" do
+      expect(post: '/contact').to route_to(controller: 'contact_form', action: 'create')
     end
   end
 
   describe "Dynamically edited pages" do
-    it "should route to about" do
-      expect({ get: '/about' }).to route_to(controller: 'pages', action: 'show', id: 'about_page')
+    it "routes to about" do
+      expect(get: '/about').to route_to(controller: 'pages', action: 'show', id: 'about_page')
     end
   end
 
   describe "Static Pages" do
-    it "should route to help" do
-      expect({ get: '/help' }).to route_to(controller: 'static', action: 'help')
+    it "routes to help" do
+      expect(get: '/help').to route_to(controller: 'static', action: 'help')
     end
 
-    it "should route to terms" do
-      expect({ get: '/terms' }).to route_to(controller: 'static', action: 'terms')
+    it "routes to terms" do
+      expect(get: '/terms').to route_to(controller: 'static', action: 'terms')
     end
 
-    it "should route to zotero" do
-      expect({ get: '/zotero' }).to route_to(controller: 'static', action: 'zotero')
+    it "routes to zotero" do
+      expect(get: '/zotero').to route_to(controller: 'static', action: 'zotero')
     end
 
-    it "should route to mendeley" do
-      expect({ get: '/mendeley' }).to route_to(controller: 'static', action: 'mendeley')
+    it "routes to mendeley" do
+      expect(get: '/mendeley').to route_to(controller: 'static', action: 'mendeley')
     end
 
-    it "should route to versions" do
-      expect({ get: '/versions' }).to route_to(controller: 'static', action: 'versions')
+    it "routes to versions" do
+      expect(get: '/versions').to route_to(controller: 'static', action: 'versions')
     end
 
-    it "should *not* route a bogus static page" do
-      expect({ get: '/awesome' }).not_to route_to(controller: 'static', action: 'awesome')
+    it "*not*s route a bogus static page" do
+      expect(get: '/awesome').not_to route_to(controller: 'static', action: 'awesome')
     end
   end
 
   describe "Catch-all" do
-    it "should route non-existent routes to errors" do
+    it "routes non-existent routes to errors" do
       pending "The default route is turned off in testing, so that errors are raised"
-      expect({ get: '/awesome' }).to route_to(controller: 'errors', action: 'routing', error: 'awesome')
+      expect(get: '/awesome').to route_to(controller: 'errors', action: 'routing', error: 'awesome')
     end
   end
 end

data/spec/services/generic_file_audit_service_spec.rb

@@ -8,7 +8,7 @@ describe Sufia::GenericFileAuditService do
     end
   end
 
-  let(:service) { Sufia::GenericFileAuditService.new(f) }
+  let(:service) { described_class.new(f) }
 
   describe "#audit" do
     before do
@@ -47,17 +47,17 @@ describe Sufia::GenericFileAuditService do
 
     describe "file loaded from fedora" do
       context "when no audits have been run" do
-        it "should report that audits have not been run" do
+        it "reports 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')
+          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
+        it "reports that audit result" do
           expect(subject).to eq 1
         end
       end
@@ -65,9 +65,9 @@ describe Sufia::GenericFileAuditService do
 
     describe "file loaded from solr" do
       let(:solr_file) { GenericFile.load_instance_from_solr(f.id) }
-      let(:service) { Sufia::GenericFileAuditService.new(solr_file) }
+      let(:service) { described_class.new(solr_file) }
 
-      it "should not audit by version" do
+      it "does 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
@@ -77,7 +77,7 @@ describe Sufia::GenericFileAuditService 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
+        it "reports that audit result" do
           expect(service).not_to receive(:audit_stat_by_version)
           expect(subject).to eq 1
         end
@@ -89,7 +89,7 @@ describe Sufia::GenericFileAuditService 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
+        it "reports that audit result" do
           expect(service).not_to receive(:audit_stat_by_version)
           expect(subject).to eq 0
         end

data/spec/services/repository_audit_service_spec.rb

@@ -10,9 +10,13 @@ describe Sufia::RepositoryAuditService do
   end
 
   describe "#audit_everything" do
-    it "should audit everything" do
-      expect_any_instance_of(GenericFile).to receive(:audit)
-      Sufia::RepositoryAuditService.audit_everything
+    it "audits everything" do
+      # check that the method we are mocking still exists
+      expect(Sufia::GenericFileAuditService.new(nil)).to respond_to(:audit)
+
+      # make sure the audit gets called
+      expect_any_instance_of(Sufia::GenericFileAuditService).to receive(:audit)
+      described_class.audit_everything
     end
   end
 end