sufia 6.2.0 → 6.3.0

data/spec/helpers/trophy_helper_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe TrophyHelper, :type => :helper do
+describe TrophyHelper, type: :helper do
   describe "#display_trophy_link" do
     let(:user) { FactoryGirl.create(:user) }
     let(:id) { '9999' }
@@ -9,7 +9,7 @@ describe TrophyHelper, :type => :helper do
     let(:url_attribute) { "[data-url=\"/users/#{user.to_param}/trophy?file_id=#{id}\"]" }
 
     context "when there is no trophy" do
-      it "should have a link for highlighting" do
+      it "has a link for highlighting" do
         out = helper.display_trophy_link(user, id) { |text| "foo #{text} bar" }
         node = Capybara::Node::Simple.new(out)
         expect(node).to have_selector("a.trophy-class.trophy-off#{text_attributes}#{url_attribute}")
@@ -22,15 +22,15 @@ describe TrophyHelper, :type => :helper do
         user.trophies.create(generic_file_id: id)
       end
 
-      it "should have a link for highlighting" do
+      it "has a link for highlighting" do
         out = helper.display_trophy_link(user, id) { |text| "foo #{text} bar" }
         node = Capybara::Node::Simple.new(out)
         expect(node).to have_selector("a.trophy-class.trophy-on#{text_attributes}#{url_attribute}")
         expect(node).to have_link 'foo Unhighlight File bar', href: '#'
       end
 
-      it "should allow removerow to be passed" do
-        out = helper.display_trophy_link(user, id, data: {removerow: true}) { |text| "foo #{text} bar" }
+      it "allows removerow to be passed" do
+        out = helper.display_trophy_link(user, id, data: { removerow: true }) { |text| "foo #{text} bar" }
         node = Capybara::Node::Simple.new(out)
         expect(node).to have_selector("a.trophy-class.trophy-on[data-removerow=\"true\"]#{text_attributes}#{url_attribute}")
       end

data/spec/inputs/multi_value_with_help_input_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe 'MultiValueWithHelpInput', type: :input do
-  subject { input_for file, field, { as: :multi_value_with_help, required: true } }
+  subject { input_for file, field, as: :multi_value_with_help, required: true }
   let(:file) { GenericFile.new }
 
   context "when the field has a translation" do
@@ -21,5 +21,4 @@ describe 'MultiValueWithHelpInput', type: :input do
       expect(subject).to have_selector('i.help-icon')
     end
   end
-
 end

data/spec/inputs/select_with_help_input_spec.rb

@@ -4,28 +4,32 @@ describe 'SelectWithHelpInput', type: :input do
   subject { input_for form, :resource_type, options }
   let(:file) { GenericFile.new }
   let(:form) { Sufia::Forms::BatchEditForm.new(file) }
-  let(:base_options) { { as: :select_with_help, collection: Sufia.config.resource_types,
-                         input_html: { class: 'form-control', multiple: true } } }
+  let(:base_options) do
+    { as: :select_with_help, collection: Sufia.config.resource_types,
+      input_html: { class: 'form-control', multiple: true } }
+  end
   let(:options) { base_options }
 
-  it "should not be required by default" do
-      expect(subject).to have_selector 'select'
-      expect(subject).not_to match(/required/)
+  it "is not required by default" do
+    expect(subject).to have_selector 'select'
+    expect(subject).not_to match(/required/)
   end
-end
 
-describe 'SelectWithHelpInput File Edit', type: :input do
-  let(:user) { FactoryGirl.find_or_create(:jill) }
-  let(:file) { GenericFile.create(batch: Batch.create, label: 'f1') { |f| f.apply_depositor_metadata(user) } }
-  let(:form) { Sufia::Forms::GenericFileEditForm.new(file) }
-  let(:base_options) { { as: :select_with_help, collection: Sufia.config.resource_types,
-                         input_html: { class: 'form-control', multiple: true } } }
-  let(:options) { base_options }
+  context 'with File Edit', type: :input do
+    let(:user) { FactoryGirl.find_or_create(:jill) }
+    let(:file) { GenericFile.create(batch: Batch.create, label: 'f1') { |f| f.apply_depositor_metadata(user) } }
+    let(:form) { Sufia::Forms::GenericFileEditForm.new(file) }
+    let(:base_options) do
+      { as: :select_with_help, collection: Sufia.config.resource_types,
+        input_html: { class: 'form-control', multiple: true } }
+    end
+    let(:options) { base_options }
 
-  subject { input_for form, :resource_type, options }
+    subject { input_for form, :resource_type, options }
 
-  it "should not be required by default" do
+    it "is not required by default" do
       expect(subject).to have_selector 'select'
       expect(subject).not_to match(/required/)
+    end
   end
 end

data/spec/javascripts/jasmine_spec.rb

@@ -12,18 +12,17 @@ describe "Jasmine" do
   it "expects all jasmine tests to pass" do
     load_rake_environment ["#{jasmine_path}/lib/jasmine/tasks/jasmine.rake"]
     jasmine_out = run_task 'jasmine:ci'
-    unless jasmine_out.include?  "0 failures"
+    if jasmine_out.include? "0 failures"
+      js_specs_count = Dir['spec/javascripts/**/*_spec.js*'].count
+      puts "#{jasmine_out.match(/\n(.+) specs/)[1]} jasmine specs run (in #{js_specs_count} jasmine test files)"
+    else
       puts "\n\n************************  Jasmine Output *************"
       puts jasmine_out
       puts "************************  Jasmine Output *************\n\n"
-    else
-      js_specs_count = Dir['spec/javascripts/**/*_spec.js*'].count
-      puts "#{jasmine_out.match(/\n(.+) specs/)[1]} jasmine specs run (in #{js_specs_count} jasmine test files)"
     end
     expect(jasmine_out).to include "0 failures"
     expect(jasmine_out).to_not include "\n0 specs"
   end
-
 end
 
 def jasmine_path

data/spec/javascripts/support/jasmine_helper.rb

@@ -1,15 +1,15 @@
-#Use this file to set/override Jasmine configuration options
-#You can remove it if you don't need it.
-#This file is loaded *after* jasmine.yml is interpreted.
+# Use this file to set/override Jasmine configuration options
+# You can remove it if you don't need it.
+# This file is loaded *after* jasmine.yml is interpreted.
 #
-#Example: using a different boot file.
-#Jasmine.configure do |config|
+# Example: using a different boot file.
+# Jasmine.configure do |config|
 #   config.boot_dir = '/absolute/path/to/boot_dir'
 #   config.boot_files = lambda { ['/absolute/path/to/boot_dir/file.js'] }
-#end
+# end
 #
-#Example: prevent PhantomJS auto install, uses PhantomJS already on your path.
-#Jasmine.configure do |config|
+# Example: prevent PhantomJS auto install, uses PhantomJS already on your path.
+# Jasmine.configure do |config|
 #   config.prevent_phantom_js_auto_install = true
-#end
+# end
 #

data/spec/jobs/active_fedora_id_based_job_spec.rb

@@ -2,13 +2,15 @@ require 'spec_helper'
 
 describe ActiveFedoraIdBasedJob do
   let(:user) { FactoryGirl.find_or_create(:jill) }
-  let(:file) { GenericFile.new.tap do |gf|
-                  gf.apply_depositor_metadata(user)
-                  gf.save!
-               end }
+  let(:file) do
+    GenericFile.new.tap do |gf|
+      gf.apply_depositor_metadata(user)
+      gf.save!
+    end
+  end
 
   it "finds object" do
-    job = ActiveFedoraIdBasedJob.new(file.id)
+    job = described_class.new(file.id)
     expect(job.generic_file).to_not be_nil
   end
 end

data/spec/jobs/audit_job_spec.rb

@@ -10,25 +10,25 @@ describe AuditJob do
     end
   end
 
-  let(:job) { AuditJob.new(file.id, 'content', uri) }
+  let(:job) { described_class.new(file.id, 'content', uri) }
 
   describe "audit on content" do
     let(:uri) { file.content.uri }
-    it "should pass" do
+    it "passes" do
       expect(job.run).to eq(true)
     end
   end
 
   describe "audit on a version of the content" do
     let(:uri) { file.content.versions.first.uri }
-    it "should pass" do
+    it "passes" do
       expect(job.run).to eq(true)
     end
   end
 
   describe "audit on an invalid version of the content" do
     let(:uri) { file.content.versions.first.uri + "bogus" }
-    it "should fail" do
+    it "fails" do
       expect(job.run).to eq(false)
     end
   end
@@ -44,13 +44,13 @@ describe AuditJob do
 
     context "when the audit passes" do
       let(:result) { true }
-      it "should not send mail" do
+      it "does not send mail" do
         expect(inbox.count).to eq(0)
       end
     end
     context "when the audit fails" do
       let(:result) { false }
-      it "should send failing mail" do
+      it "sends failing mail" do
         expect(inbox.count).to eq(1)
         inbox.each { |msg| expect(msg.last_message.subject).to eq(AuditJob::FAIL) }
       end
@@ -68,7 +68,7 @@ describe AuditJob do
       allow(mock_service).to receive(:check).and_return(true, false, false, true, false)
     end
 
-    it "should not prune failed audits" do
+    it "does not prune failed audits" do
       5.times { job.send(:run_audit) }
       expect(ChecksumAuditLog.logs_for(file.id, 'content').map(&:pass)).to eq [0, 1, 0, 0, 1, 0, 1]
     end

data/spec/jobs/batch_update_job_spec.rb

@@ -1,7 +1,6 @@
 require 'spec_helper'
 
 describe BatchUpdateJob do
-
   let(:user) { FactoryGirl.find_or_create(:jill) }
   let(:batch) { Batch.create }
 
@@ -20,7 +19,7 @@ describe BatchUpdateJob do
   end
 
   describe "#run" do
-    let(:title) { { file.id => ['File One'], file2.id => ['File Two'] }}
+    let(:title) { { file.id => ['File One'], file2.id => ['File Two'] } }
     let(:metadata) do
       { read_groups_string: '', read_users_string: 'archivist1, archivist2',
         tag: [''] }.with_indifferent_access
@@ -28,10 +27,10 @@ describe BatchUpdateJob do
 
     let(:visibility) { nil }
 
-    let(:job) { BatchUpdateJob.new(user.user_key, batch.id, title, metadata, visibility) }
+    let(:job) { described_class.new(user.user_key, batch.id, title, metadata, visibility) }
 
     context "with a failing update" do
-      it "should check permissions for each file before updating" do
+      it "checks permissions for each file before updating" do
         expect_any_instance_of(User).to receive(:can?).with(:edit, file).and_return(false)
         expect_any_instance_of(User).to receive(:can?).with(:edit, file2).and_return(false)
         job.run
@@ -44,7 +43,7 @@ describe BatchUpdateJob do
     describe "sends events" do
       let(:s1) { double('one') }
       let(:s2) { double('two') }
-      it "should log a content update event" do
+      it "logs a content update event" do
         expect_any_instance_of(User).to receive(:can?).with(:edit, file).and_return(true)
         expect_any_instance_of(User).to receive(:can?).with(:edit, file2).and_return(true)
         expect(ContentUpdateEventJob).to receive(:new).with(file.id, user.user_key).and_return(s1)
@@ -64,7 +63,7 @@ describe BatchUpdateJob do
         job.run
       end
 
-      it "should update the titles" do
+      it "updates the titles" do
         expect(file.reload.title).to eq ['File One']
       end
     end

data/spec/jobs/characterize_job_spec.rb

@@ -11,7 +11,7 @@ describe CharacterizeJob do
     end
   end
 
-  subject { CharacterizeJob.new(@generic_file.id)}
+  subject { described_class.new(@generic_file.id) }
 
   it 'spawns a CreateDerivatives job' do
     expect(CreateDerivativesJob).to receive(:new).with(@generic_file.id).once.and_call_original

data/spec/jobs/content_depositor_change_event_job_spec.rb

@@ -8,7 +8,7 @@ describe ContentDepositorChangeEventJob do
       gf.apply_depositor_metadata(@depositor.user_key)
       gf.save!
     end
-    ContentDepositorChangeEventJob.new(@file.id, @receiver.user_key).run
+    described_class.new(@file.id, @receiver.user_key).run
   end
 
   it "changes the depositor and records an original depositor" do

data/spec/jobs/create_derivatives_job_spec.rb

@@ -11,7 +11,7 @@ describe CreateDerivativesJob do
     Sufia.config.enable_ffmpeg = @ffmpeg_enabled
   end
 
-  subject { CreateDerivativesJob.new(@generic_file.id) }
+  subject { described_class.new(@generic_file.id) }
 
   describe 'thumbnail generation' do
     before do
@@ -134,8 +134,8 @@ describe CreateDerivativesJob do
       #   @generic_file.save!
       # end
 
-      #Need a way to do this in hydra-derivatives
-      it 'should copy the content to the mp3 datastream and transcode to ogg', skip: true do
+      # Need a way to do this in hydra-derivatives
+      it 'copies the content to the mp3 datastream and transcode to ogg', skip: true do
         subject.run
         reloaded = @generic_file.reload
         derivative = reloaded.attached_files['mp3']
@@ -155,8 +155,8 @@ describe CreateDerivativesJob do
       #   @generic_file.save!
       # end
 
-      #Need a way to do this in hydra-derivatives
-      it 'should copy the content to the ogg datastream and transcode to mp3', skip: true do
+      # Need a way to do this in hydra-derivatives
+      it 'copies the content to the ogg datastream and transcode to mp3', skip: true do
         subject.run
         reloaded = @generic_file.reload
         derivative = reloaded.attached_files['mp3']

data/spec/jobs/event_jobs_spec.rb

@@ -15,7 +15,7 @@ describe 'event jobs' do
     $redis.keys('User:*').each { |key| $redis.del key }
     $redis.keys('GenericFile:*').each { |key| $redis.del key }
   end
-  it "should log user edit profile events" do
+  it "logs user edit profile events" do
     # UserEditProfile should log the event to the editor's dashboard and his/her followers' dashboards
     @another_user.follow(@user)
     count_user = @user.events.length
@@ -28,7 +28,7 @@ describe 'event jobs' do
     expect(@another_user.events.length).to eq(count_another + 1)
     expect(@another_user.events.first).to eq(event)
   end
-  it "should log user follow events" do
+  it "logs user follow events" do
     # UserFollow should log the event to the follower's dashboard, the followee's dashboard, and followers' dashboards
     @third_user.follow(@user)
     expect(@user.events.length).to eq(0)
@@ -44,7 +44,7 @@ describe 'event jobs' do
     expect(@third_user.events.length).to eq(1)
     expect(@third_user.events.first).to eq(event)
   end
-  it "should log user unfollow events" do
+  it "logs user unfollow events" do
     # UserUnfollow should log the event to the unfollower's dashboard, the unfollowee's dashboard, and followers' dashboards
     @third_user.follow(@user)
     @user.follow(@another_user)
@@ -61,7 +61,7 @@ describe 'event jobs' do
     expect(@third_user.events.length).to eq(1)
     expect(@third_user.events.first).to eq(event)
   end
-  it "should log content deposit events" do
+  it "logs content deposit events" do
     # ContentDeposit should log the event to the depositor's profile, followers' dashboards, and the GF
     @another_user.follow(@user)
     @third_user.follow(@user)
@@ -71,7 +71,7 @@ describe 'event jobs' do
     expect(@third_user.events.length).to eq(0)
     expect(@gf.events.length).to eq(0)
     expect(Time).to receive(:now).at_least(:once).and_return(1)
-    event = {action: 'User <a href="/users/jilluser@example-dot-com">jilluser@example.com</a> has deposited <a href="/files/test-123">Hamlet</a>', timestamp: '1' }
+    event = { action: 'User <a href="/users/jilluser@example-dot-com">jilluser@example.com</a> has deposited <a href="/files/test-123">Hamlet</a>', timestamp: '1' }
     ContentDepositEventJob.new('test-123', @user.user_key).run
     expect(@user.profile_events.length).to eq(1)
     expect(@user.profile_events.first).to eq(event)
@@ -87,7 +87,7 @@ describe 'event jobs' do
     @third_user.follow(@another_user)
     allow_any_instance_of(User).to receive(:can?).and_return(true)
     allow(Time).to receive(:now).at_least(:once).and_return(1)
-    event = {action: 'User <a href="/users/jilluser@example-dot-com">jilluser@example.com</a> has transferred <a href="/files/test-123">Hamlet</a> to user <a href="/users/archivist1@example-dot-com">archivist1@example.com</a>', timestamp: '1' }
+    event = { action: 'User <a href="/users/jilluser@example-dot-com">jilluser@example.com</a> has transferred <a href="/files/test-123">Hamlet</a> to user <a href="/users/archivist1@example-dot-com">archivist1@example.com</a>', timestamp: '1' }
     ContentDepositorChangeEventJob.new('test-123', @another_user.user_key).run
     expect(@user.profile_events.length).to eq(1)
     expect(@user.profile_events.first).to eq(event)
@@ -98,7 +98,7 @@ describe 'event jobs' do
     expect(@gf.events.length).to eq(1)
     expect(@gf.events.first).to eq(event)
   end
-  it "should log content update events" do
+  it "logs content update events" do
     # ContentUpdate should log the event to the depositor's profile, followers' dashboards, and the GF
     @another_user.follow(@user)
     @third_user.follow(@user)
@@ -108,7 +108,7 @@ describe 'event jobs' do
     expect(@third_user.events.length).to eq(0)
     expect(@gf.events.length).to eq(0)
     expect(Time).to receive(:now).at_least(:once).and_return(1)
-    event = {action: 'User <a href="/users/jilluser@example-dot-com">jilluser@example.com</a> has updated <a href="/files/test-123">Hamlet</a>', timestamp: '1' }
+    event = { action: 'User <a href="/users/jilluser@example-dot-com">jilluser@example.com</a> has updated <a href="/files/test-123">Hamlet</a>', timestamp: '1' }
     ContentUpdateEventJob.new('test-123', @user.user_key).run
     expect(@user.profile_events.length).to eq(1)
     expect(@user.profile_events.first).to eq(event)
@@ -119,7 +119,7 @@ describe 'event jobs' do
     expect(@gf.events.length).to eq(1)
     expect(@gf.events.first).to eq(event)
   end
-  it "should log content new version events" do
+  it "logs content new version events" do
     # ContentNewVersion should log the event to the depositor's profile, followers' dashboards, and the GF
     @another_user.follow(@user)
     @third_user.follow(@user)
@@ -129,7 +129,7 @@ describe 'event jobs' do
     expect(@third_user.events.length).to eq(0)
     expect(@gf.events.length).to eq(0)
     expect(Time).to receive(:now).at_least(:once).and_return(1)
-    event = {action: 'User <a href="/users/jilluser@example-dot-com">jilluser@example.com</a> has added a new version of <a href="/files/test-123">Hamlet</a>', timestamp: '1' }
+    event = { action: 'User <a href="/users/jilluser@example-dot-com">jilluser@example.com</a> has added a new version of <a href="/files/test-123">Hamlet</a>', timestamp: '1' }
     ContentNewVersionEventJob.new('test-123', @user.user_key).run
     expect(@user.profile_events.length).to eq(1)
     expect(@user.profile_events.first).to eq(event)
@@ -140,7 +140,7 @@ describe 'event jobs' do
     expect(@gf.events.length).to eq(1)
     expect(@gf.events.first).to eq(event)
   end
-  it "should log content restored version events" do
+  it "logs content restored version events" do
     # ContentRestoredVersion should log the event to the depositor's profile, followers' dashboards, and the GF
     @another_user.follow(@user)
     @third_user.follow(@user)
@@ -150,7 +150,7 @@ describe 'event jobs' do
     expect(@third_user.events.length).to eq(0)
     expect(@gf.events.length).to eq(0)
     expect(Time).to receive(:now).at_least(:once).and_return(1)
-    event = {action: 'User <a href="/users/jilluser@example-dot-com">jilluser@example.com</a> has restored a version \'content.0\' of <a href="/files/test-123">Hamlet</a>', timestamp: '1' }
+    event = { action: 'User <a href="/users/jilluser@example-dot-com">jilluser@example.com</a> has restored a version \'content.0\' of <a href="/files/test-123">Hamlet</a>', timestamp: '1' }
     ContentRestoredVersionEventJob.new('test-123', @user.user_key, 'content.0').run
     expect(@user.profile_events.length).to eq(1)
     expect(@user.profile_events.first).to eq(event)
@@ -161,7 +161,7 @@ describe 'event jobs' do
     expect(@gf.events.length).to eq(1)
     expect(@gf.events.first).to eq(event)
   end
-  it "should log content delete events" do
+  it "logs content delete events" do
     # ContentDelete should log the event to the depositor's profile and followers' dashboards
     @another_user.follow(@user)
     @third_user.follow(@user)
@@ -169,7 +169,7 @@ describe 'event jobs' do
     expect(@another_user.events.length).to eq(0)
     expect(@third_user.events.length).to eq(0)
     expect(Time).to receive(:now).at_least(:once).and_return(1)
-    event = {action: 'User <a href="/users/jilluser@example-dot-com">jilluser@example.com</a> has deleted file \'test-123\'', timestamp: '1' }
+    event = { action: 'User <a href="/users/jilluser@example-dot-com">jilluser@example.com</a> has deleted file \'test-123\'', timestamp: '1' }
     ContentDeleteEventJob.new('test-123', @user.user_key).run
     expect(@user.profile_events.length).to eq(1)
     expect(@user.profile_events.first).to eq(event)
@@ -178,7 +178,7 @@ describe 'event jobs' do
     expect(@third_user.events.length).to eq(1)
     expect(@third_user.events.first).to eq(event)
   end
-  it "should not log content-related jobs to followers who lack access" do
+  it "does not log content-related jobs to followers who lack access" do
     # No Content-related eventjobs should log an event to a follower who does not have access to the GF
     @another_user.follow(@user)
     @third_user.follow(@user)
@@ -188,7 +188,7 @@ describe 'event jobs' do
     expect(@gf.events.length).to eq(0)
     @now = Time.now
     expect(Time).to receive(:now).at_least(:once).and_return(@now)
-    event = {action: 'User <a href="/users/jilluser@example-dot-com">jilluser@example.com</a> has updated <a href="/files/test-123">Hamlet</a>', timestamp: @now.to_i.to_s }
+    event = { action: 'User <a href="/users/jilluser@example-dot-com">jilluser@example.com</a> has updated <a href="/files/test-123">Hamlet</a>', timestamp: @now.to_i.to_s }
     ContentUpdateEventJob.new('test-123', @user.user_key).run
     expect(@user.profile_events.length).to eq(1)
     expect(@user.profile_events.first).to eq(event)