sufia 4.0.0.beta2 → 4.0.0.beta3

data/spec/jobs/ingest_local_file_job_spec.rb

@@ -26,11 +26,11 @@ describe IngestLocalFileJob do
 
   describe "virus checking" do
     it "should run virus check" do
-      expect(Sufia::GenericFile::Actions).to receive(:virus_check).twice.and_return(0)
+      expect(Sufia::GenericFile::Actor).to receive(:virus_check).twice.and_return(0)
       job.run
     end
     it "should abort if virus check fails" do
-      Sufia::GenericFile::Actions.stub(:virus_check).and_raise(Sufia::VirusFoundError.new('A virus was found'))
+      allow(Sufia::GenericFile::Actor).to receive(:virus_check).and_raise(Sufia::VirusFoundError.new('A virus was found'))
       job.run
       expect(user.mailbox.inbox.first.subject).to eq("Local file ingest error")
     end

data/spec/lib/sufia/analytics_spec.rb

@@ -0,0 +1,29 @@
+require 'spec_helper'
+
+describe Sufia::Analytics do
+  before do
+    token = OAuth2::AccessToken.new(nil, nil)
+    allow(subject).to receive(:token).and_return(token)
+  end
+
+  it 'responds to :config' do
+    expect(subject).to respond_to(:config)
+  end
+
+  it 'reads its config from a yaml file' do
+    expect(subject.config.keys.sort).to eql ['app_name', 'app_version', 'client_email', 'privkey_path', 'privkey_secret']
+  end
+
+  it 'responds to :user' do
+    expect(subject).to respond_to(:user)
+  end
+
+  it 'instantiates a user' do
+    expect(subject.user).to be_a(Legato::User)
+  end
+
+  it 'responds to :profile' do
+    expect(subject).to respond_to(:profile)
+  end
+
+end

data/spec/lib/sufia/upload_complete_behavior_spec.rb

@@ -22,7 +22,7 @@ describe Sufia::FilesController::UploadCompleteBehavior do
       UploadThing.upload_complete_path(test_id).should == Sufia::Engine.routes.url_helpers.batch_edit_path(test_id)
     end
     it "respond with the dashboard path" do
-      UploadThing.destroy_complete_path({}).should ==   Sufia::Engine.routes.url_helpers.dashboard_index_path
+      UploadThing.destroy_complete_path({}).should ==   Sufia::Engine.routes.url_helpers.dashboard_files_path
     end
   end
   context "overriden path" do

data/spec/models/batch_spec.rb

@@ -3,14 +3,12 @@ require 'spec_helper'
 describe Batch do
   before(:all) do
     @user = FactoryGirl.find_or_create(:jill)
-    GenericFile.any_instance.should_receive(:characterize_if_changed).and_yield
-    GenericFile.any_instance.stub(:terms_of_service).and_return('1')
     @file = GenericFile.new
     @file.apply_depositor_metadata('mjg36')
     @file.save
-    @batch = Batch.create(:title => "test collection",
-                          :creator => @user.user_key,
-                          :part => @file.pid)
+    @batch = Batch.create(title: "test collection",
+                          creator: @user.user_key,
+                          part: @file.pid)
   end
   after(:all) do
     @user.delete
@@ -36,11 +34,7 @@ describe Batch do
     @batch.part.should == [@file.pid]
   end
   it "should be able to have more than one file" do
-    # not sure why this is needed here too, but when the test runs alone it is not needed but when run in the group it is needed
-    GenericFile.any_instance.stub(:terms_of_service).and_return('1')
-    #logger.info "before create"
     gf = GenericFile.new
-    #logger.info "after create"
     gf.apply_depositor_metadata('mjg36')
     gf.save
     @batch.part << gf.pid

data/spec/models/checksum_audit_log_spec.rb

@@ -5,11 +5,10 @@ describe ChecksumAuditLog do
     @f = GenericFile.new
     @f.add_file(File.open(fixture_path + '/world.png'), 'content', 'world.png')
     @f.apply_depositor_metadata('mjg36')
-    @f.stub(:characterize_if_changed).and_yield #don't run characterization
     @f.save!
     @version = @f.datastreams['content'].versions.first
-    @old = ChecksumAuditLog.create(:pid=>@f.pid, :dsid=>@version.dsid, :version=>@version.versionID, :pass=>1, :created_at=>2.minutes.ago)
-    @new = ChecksumAuditLog.create(:pid=>@f.pid, :dsid=>@version.dsid, :version=>@version.versionID, :pass=>0)
+    @old = ChecksumAuditLog.create(pid: @f.pid, dsid: @version.dsid, version: @version.versionID, pass: 1, created_at: 2.minutes.ago)
+    @new =  ChecksumAuditLog.create(pid: @f.pid, dsid: @version.dsid, version: @version.versionID, pass: 0)
   end
   after(:all) do
     @f.delete
@@ -22,11 +21,11 @@ describe ChecksumAuditLog do
     @f.logs(@version.dsid).should == [@new, @old]
   end
   it "should prune history for a datastream" do
-    success1 = ChecksumAuditLog.create(:pid=>@f.pid, :dsid=>@version.dsid, :version=>@version.versionID, :pass=>1)
+    success1 = ChecksumAuditLog.create(pid: @f.pid, dsid: @version.dsid, version: @version.versionID, pass: 1)
     ChecksumAuditLog.prune_history(@version)
-    success2 = ChecksumAuditLog.create(:pid=>@f.pid, :dsid=>@version.dsid, :version=>@version.versionID, :pass=>1)
+    success2 = ChecksumAuditLog.create(pid: @f.pid, dsid: @version.dsid, version: @version.versionID, pass: 1)
     ChecksumAuditLog.prune_history(@version)
-    success3 = ChecksumAuditLog.create(:pid=>@f.pid, :dsid=>@version.dsid, :version=>@version.versionID, :pass=>1)
+    success3 = ChecksumAuditLog.create(pid: @f.pid, dsid: @version.dsid, version: @version.versionID, pass: 1)
     ChecksumAuditLog.prune_history(@version)
     lambda { ChecksumAuditLog.find(success2.id)}.should raise_exception ActiveRecord::RecordNotFound
     lambda { ChecksumAuditLog.find(success3.id)}.should raise_exception ActiveRecord::RecordNotFound

data/spec/models/collection_spec.rb

@@ -0,0 +1,24 @@
+require 'spec_helper'
+
+describe Collection do
+  before(:all) do
+    @user = FactoryGirl.create(:user)
+    @collection = Collection.new(title: "test collection").tap do |c|
+      c.apply_depositor_metadata(@user.user_key)
+    end
+  end
+
+  after(:all) do
+    @collection.delete
+  end
+
+  it "should have open visibility" do
+    @collection.save
+    expect(@collection.read_groups).to eq ['public']
+  end
+
+  it "should not allow a collection to be saved without a title" do
+     @collection.title = nil
+     expect{ @collection.save! }.to raise_error(ActiveFedora::RecordInvalid)
+  end
+end

data/spec/models/download_spec.rb

@@ -0,0 +1,21 @@
+require 'spec_helper'
+
+describe Sufia::Download do
+
+  before do
+    @download = Sufia::Download
+  end
+
+  it 'has an events metric' do
+    expect(@download.metrics).to be  == Legato::ListParameter.new(:metrics, [:totalEvents])
+  end
+
+  it 'has dimensions' do
+    expect(@download.dimensions).to be == Legato::ListParameter.new(:dimensions, [:eventCategory, :eventAction, :eventLabel, :date])
+  end
+
+  it 'responds to :for_file' do
+    expect(@download).to respond_to(:for_file)
+  end
+
+end

data/spec/models/featured_work_list_spec.rb

@@ -5,7 +5,6 @@ describe FeaturedWorkList do
   let(:file2) { FactoryGirl.create(:generic_file) }
 
   before do
-    GenericFile.any_instance.stub(:characterize_if_changed).and_yield
     FeaturedWork.create(generic_file_id: file1.noid)
     FeaturedWork.create(generic_file_id: file2.noid)
   end

data/spec/models/file_content_datastream_spec.rb

@@ -1,15 +1,11 @@
 require 'spec_helper'
 
 describe FileContentDatastream do
-  before do
-    Sufia.queue.stub(:push).with(an_instance_of CharacterizeJob) #don't run characterization
-  end
   describe "version control" do
     before do
       f = GenericFile.new
       f.add_file(File.open(fixture_path + '/world.png'), 'content', 'world.png')
       f.apply_depositor_metadata('mjg36')
-      f.stub(:characterize_if_changed).and_yield #don't run characterization
       f.save
       @file = f.reload
     end
@@ -34,7 +30,6 @@ describe FileContentDatastream do
     describe "add a version" do
       before do
         @file.add_file(File.open(fixture_path + '/world.png'), 'content', 'world.png')
-        @file.stub(:characterize_if_changed).and_yield #don't run characterization
         @file.save
       end
       it "should return two versions" do
@@ -51,22 +46,22 @@ describe FileContentDatastream do
   describe "extract_metadata" do
     before do
       @subject = FileContentDatastream.new(nil, 'content')
-      @subject.stub(:pid=>'my_pid')
-      @subject.stub(:dsVersionID=>'content.7')
+      @subject.stub(pid: 'my_pid')
+      @subject.stub(dsVersionID: 'content.7')
     end
-    it "should return an xml document", :unless => $in_travis do
+    it "should return an xml document", unless: $in_travis do
       f = File.new(fixture_path + '/world.png', 'rb')
       @subject.content = f.read
       xml = @subject.extract_metadata
       doc = Nokogiri::XML.parse(xml)
       doc.root.xpath('//ns:imageWidth/text()', {'ns'=>'http://hul.harvard.edu/ois/xml/ns/fits/fits_output'}).inner_text.should == '50'
     end
-    it "should return expected results when invoked via HTTP", :unless => $in_travis do
-      f = ActionDispatch::Http::UploadedFile.new(:tempfile => File.new(fixture_path + '/world.png'),
-                                                 :filename => 'world.png')
+    it "should return expected results when invoked via HTTP", unless: $in_travis do
+      f = ActionDispatch::Http::UploadedFile.new(tempfile: File.new(fixture_path + '/world.png'),
+                                                 filename: 'world.png')
       content = double("file")
-      content.stub(:read=>f.read)
-      content.stub(:rewind=>f.rewind)
+      content.stub(read: f.read)
+      content.stub(rewind: f.rewind)
       @subject.stub(:content).and_return(f)
       xml = @subject.extract_metadata
       doc = Nokogiri::XML.parse(xml)
@@ -77,7 +72,6 @@ describe FileContentDatastream do
     before do
       @generic_file = GenericFile.new
       @generic_file.apply_depositor_metadata('mjg36')
-      @generic_file.stub(:characterize_if_changed).and_yield #don't run characterization
     end
     after do
       @generic_file.delete

data/spec/models/file_usage_spec.rb

@@ -0,0 +1,91 @@
+require 'spec_helper'
+
+describe FileUsage do
+
+  before :all do
+    @file = GenericFile.new
+    @file.apply_depositor_metadata("awead")
+    @file.save
+  end
+
+  after :all do
+    @file.delete
+  end
+
+  # This is what the data looks like that's returned from Google Analytics (GA) via the Legato gem
+  # Due to the nature of querying GA, testing this data in an automated fashion is problematc.
+  # Sample data structures were created by sending real events to GA from a test instance of 
+  # Scholarsphere.  The data below are essentially a "cut and paste" from the output of query
+  # results from the Legato gem.
+
+  let(:sample_download_statistics) {
+    [
+      OpenStruct.new(eventCategory: "Files", eventAction: "Downloaded", eventLabel: "sufia:x920fw85p", date: "20140101", totalEvents: "1"),
+      OpenStruct.new(eventCategory: "Files", eventAction: "Downloaded", eventLabel: "sufia:x920fw85p", date: "20140102", totalEvents: "1"),
+      OpenStruct.new(eventCategory: "Files", eventAction: "Downloaded", eventLabel: "sufia:x920fw85p", date: "20140103", totalEvents: "2"),
+      OpenStruct.new(eventCategory: "Files", eventAction: "Downloaded", eventLabel: "sufia:x920fw85p", date: "20140104", totalEvents: "3"),
+      OpenStruct.new(eventCategory: "Files", eventAction: "Downloaded", eventLabel: "sufia:x920fw85p", date: "20140105", totalEvents: "5"),
+    ]
+  }
+
+  let(:sample_pageview_statistics) {
+    [
+      OpenStruct.new(date: '20140101', pageviews: 4),
+      OpenStruct.new(date: '20140102', pageviews: 8),
+      OpenStruct.new(date: '20140103', pageviews: 6),
+      OpenStruct.new(date: '20140104', pageviews: 10),
+      OpenStruct.new(date: '20140105', pageviews: 2)
+    ]
+  }
+
+  let(:usage) {
+    allow_any_instance_of(FileUsage).to receive(:download_statistics).and_return(sample_download_statistics)
+    allow_any_instance_of(FileUsage).to receive(:pageview_statistics).and_return(sample_pageview_statistics)
+    FileUsage.new(@file.id)
+  }
+
+  describe "#initialize" do
+
+    it "should set the id" do
+      expect(usage.id).to eq(@file.pid)
+    end
+
+    it "should set the path" do
+      expect(usage.path).to eq("/files/#{Sufia::Noid.noidify(@file.id)}")
+    end
+
+    it "should set the created date" do
+      expect(usage.created).to eq(DateTime.parse(@file.create_date))
+    end
+
+  end
+
+  describe "statistics" do
+
+    before(:all) do
+      @system_timezone = ENV['TZ']
+      ENV['TZ'] = 'UTC'
+    end
+
+    after(:all) do
+      ENV['TZ'] = @system_timezone
+    end
+
+    it "should count the total numver of downloads" do
+      expect(usage.total_downloads).to eq(12)
+    end
+
+    it "should count the total numver of pageviews" do
+      expect(usage.total_pageviews).to eq(30)
+    end
+
+    it "should return an array of hashes for use with JQuery Flot" do
+      expect(usage.to_flot[0][:label]).to eq("Pageviews")
+      expect(usage.to_flot[1][:label]).to eq("Downloads")
+      expect(usage.to_flot[0][:data]).to include([1388534400000, 4], [1388620800000, 8], [1388707200000, 6], [1388793600000, 10], [1388880000000, 2]) 
+      expect(usage.to_flot[1][:data]).to include([1388534400000, 1], [1388620800000, 1], [1388707200000, 2], [1388793600000, 3],  [1388880000000, 5])
+    end 
+
+  end
+
+end

data/spec/models/fits_datastream_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe FitsDatastream, :unless => $in_travis do
+describe FitsDatastream, unless: $in_travis do
   describe "image" do
     before(:all) do
       @file = GenericFile.new

data/spec/models/generic_file/web_form_spec.rb

@@ -22,9 +22,9 @@ describe GenericFile do
 
   describe "accessible_attributes" do
     it "should have a list" do
-      subject.accessible_attributes.should == [:part_of, :resource_type, :title, :creator, :contributor, :description,
+      subject.accessible_attributes.should include(:part_of, :resource_type, :title, :creator, :contributor, :description,
         :tag, :rights, :publisher, :date_created, :date_uploaded, :date_modified, :subject, :language, :identifier,
-        :based_near, :related_url, :permissions]
+        :based_near, :related_url, :permissions)
     end
 
     it "should sanitize them" do

data/spec/models/generic_file_rdf_datastream_spec.rb

@@ -0,0 +1,12 @@
+require 'spec_helper'
+
+describe GenericFileRdfDatastream do
+  it "should have bibliographicCitation" do
+    subject.bibliographic_citation = "foo"
+    expect(subject.bibliographic_citation).to eq ["foo"]
+  end
+  it "should have source" do
+    subject.source = "foo"
+    expect(subject.source).to eq ["foo"]
+  end
+end

data/spec/models/generic_file_spec.rb

@@ -1,10 +1,11 @@
 require 'spec_helper'
 
 describe GenericFile do
+
+  subject { GenericFile.new }
+
   before do
     subject.apply_depositor_metadata('jcoyne')
-    @file = subject #TODO remove this line someday (use subject instead)
-
   end
 
   describe '#to_s' do
@@ -27,7 +28,7 @@ describe GenericFile do
   end
 
   describe "mime type recognition" do
-    describe "image?" do
+    context "when image?" do
       it "should be true for jpeg2000" do
         subject.mime_type = 'image/jp2'
         subject.should be_image
@@ -41,13 +42,13 @@ describe GenericFile do
         subject.should be_image
       end
     end
-    describe "pdf?" do
+    context "when pdf?" do
       it "should be true for pdf" do
         subject.mime_type = 'application/pdf'
         subject.should be_pdf
       end
     end
-    describe "audio?" do
+    context "when audio?" do
       it "should be true for wav" do
         subject.mime_type = 'audio/x-wave'
         subject.should be_audio
@@ -65,7 +66,7 @@ describe GenericFile do
         subject.should be_audio
       end
     end
-    describe "video?" do
+    context "when video?" do
       it "should be true for avi" do
         subject.mime_type = 'video/avi'
         subject.should be_video
@@ -122,48 +123,48 @@ describe GenericFile do
       subject.read_groups=['group1', 'group2']
       subject.edit_users=['user1']
       subject.read_users=['user2', 'user3']
-      subject.permissions.should == [{:type=>"group", :access=>"read", :name=>"group1"},
-          {:type=>"group", :access=>"read", :name=>"group2"},
-          {:type=>"user", :access=>"read", :name=>"user2"},
-          {:type=>"user", :access=>"read", :name=>"user3"},
-          {:type=>"user", :access=>"edit", :name=>"user1"}]
+      subject.permissions.should == [{type: "group", access: "read", name: "group1"},
+          {type: "group", access: "read", name: "group2"},
+          {type: "user", access: "read", name: "user2"},
+          {type: "user", access: "read", name: "user3"},
+          {type: "user", access: "edit", name: "user1"}]
     end
     describe "updating permissions" do
       it "should create new group permissions" do
-        subject.permissions = {:new_group_name => {'group1'=>'read'}}
-        subject.permissions.should == [{:type=>"group", :access=>"read", :name=>"group1"},
-                                     {:type=>"user", :access=>"edit", :name=>"jcoyne"}]
+        subject.permissions = {new_group_name: {'group1'=>'read'}}
+        subject.permissions.should == [{type: "group", access: "read", name: "group1"},
+                                     {type: "user", access: "edit", name: "jcoyne"}]
       end
       it "should create new user permissions" do
-        subject.permissions = {:new_user_name => {'user1'=>'read'}}
-        subject.permissions.should == [{:type=>"user", :access=>"read", :name=>"user1"},
-                                     {:type=>"user", :access=>"edit", :name=>"jcoyne"}]
+        subject.permissions = {new_user_name: {'user1'=>'read'}}
+        subject.permissions.should == [{type: "user", access: "read", name: "user1"},
+                                     {type: "user", access: "edit", name: "jcoyne"}]
       end
       it "should not replace existing groups" do
-        subject.permissions = {:new_group_name=> {'group1' => 'read'}}
-        subject.permissions = {:new_group_name=> {'group2' => 'read'}}
-        subject.permissions.should == [{:type=>"group", :access=>"read", :name=>"group1"},
-                                     {:type=>"group", :access=>"read", :name=>"group2"},
-                                     {:type=>"user", :access=>"edit", :name=>"jcoyne"}]
+        subject.permissions = {new_group_name: {'group1' => 'read'}}
+        subject.permissions = {new_group_name: {'group2' => 'read'}}
+        subject.permissions.should == [{type: "group", access: "read", name: "group1"},
+                                     {type: "group", access: "read", name: "group2"},
+                                     {type: "user", access: "edit", name: "jcoyne"}]
       end
       it "should not replace existing users" do
-        subject.permissions = {:new_user_name=>{'user1'=>'read'}}
-        subject.permissions = {:new_user_name=>{'user2'=>'read'}}
-        subject.permissions.should == [{:type=>"user", :access=>"read", :name=>"user1"},
-                                     {:type=>"user", :access=>"read", :name=>"user2"},
-                                     {:type=>"user", :access=>"edit", :name=>"jcoyne"}]
+        subject.permissions = {new_user_name:{'user1'=>'read'}}
+        subject.permissions = {new_user_name:{'user2'=>'read'}}
+        subject.permissions.should == [{type: "user", access: "read", name: "user1"},
+                                     {type: "user", access: "read", name: "user2"},
+                                     {type: "user", access: "edit", name: "jcoyne"}]
       end
       it "should update permissions on existing users" do
-        subject.permissions = {:new_user_name=>{'user1'=>'read'}}
-        subject.permissions = {:user=>{'user1'=>'edit'}}
-        subject.permissions.should == [{:type=>"user", :access=>"edit", :name=>"user1"},
-                                     {:type=>"user", :access=>"edit", :name=>"jcoyne"}]
+        subject.permissions = {new_user_name:{'user1'=>'read'}}
+        subject.permissions = {user:{'user1'=>'edit'}}
+        subject.permissions.should == [{type: "user", access: "edit", name: "user1"},
+                                     {type: "user", access: "edit", name: "jcoyne"}]
       end
       it "should update permissions on existing groups" do
-        subject.permissions = {:new_group_name=>{'group1'=>'read'}}
-        subject.permissions = {:group=>{'group1'=>'edit'}}
-        subject.permissions.should == [{:type=>"group", :access=>"edit", :name=>"group1"},
-                                     {:type=>"user", :access=>"edit", :name=>"jcoyne"}]
+        subject.permissions = {new_group_name:{'group1'=>'read'}}
+        subject.permissions = {group:{'group1'=>'edit'}}
+        subject.permissions.should == [{type: "group", access: "edit", name: "group1"},
+                                     {type: "user", access: "edit", name: "jcoyne"}]
       end
     end
     it "should have a characterization datastream" do
@@ -179,41 +180,41 @@ describe GenericFile do
   end
   describe "delegations" do
     it "should delegate methods to properties metadata" do
-      @file.should respond_to(:relative_path)
-      @file.should respond_to(:depositor)
+      subject.should respond_to(:relative_path)
+      subject.should respond_to(:depositor)
     end
     it "should delegate methods to descriptive metadata" do
-      @file.should respond_to(:related_url)
-      @file.should respond_to(:based_near)
-      @file.should respond_to(:part_of)
-      @file.should respond_to(:contributor)
-      @file.should respond_to(:creator)
-      @file.should respond_to(:title)
-      @file.should respond_to(:description)
-      @file.should respond_to(:publisher)
-      @file.should respond_to(:date_created)
-      @file.should respond_to(:date_uploaded)
-      @file.should respond_to(:date_modified)
-      @file.should respond_to(:subject)
-      @file.should respond_to(:language)
-      @file.should respond_to(:rights)
-      @file.should respond_to(:resource_type)
-      @file.should respond_to(:identifier)
+      subject.should respond_to(:related_url)
+      subject.should respond_to(:based_near)
+      subject.should respond_to(:part_of)
+      subject.should respond_to(:contributor)
+      subject.should respond_to(:creator)
+      subject.should respond_to(:title)
+      subject.should respond_to(:description)
+      subject.should respond_to(:publisher)
+      subject.should respond_to(:date_created)
+      subject.should respond_to(:date_uploaded)
+      subject.should respond_to(:date_modified)
+      subject.should respond_to(:subject)
+      subject.should respond_to(:language)
+      subject.should respond_to(:rights)
+      subject.should respond_to(:resource_type)
+      subject.should respond_to(:identifier)
     end
     it "should delegate methods to characterization metadata" do
-      @file.should respond_to(:format_label)
-      @file.should respond_to(:mime_type)
-      @file.should respond_to(:file_size)
-      @file.should respond_to(:last_modified)
-      @file.should respond_to(:filename)
-      @file.should respond_to(:original_checksum)
-      @file.should respond_to(:well_formed)
-      @file.should respond_to(:file_title)
-      @file.should respond_to(:file_author)
-      @file.should respond_to(:page_count)
+      subject.should respond_to(:format_label)
+      subject.should respond_to(:mime_type)
+      subject.should respond_to(:file_size)
+      subject.should respond_to(:last_modified)
+      subject.should respond_to(:filename)
+      subject.should respond_to(:original_checksum)
+      subject.should respond_to(:well_formed)
+      subject.should respond_to(:file_title)
+      subject.should respond_to(:file_author)
+      subject.should respond_to(:page_count)
     end
     it "should redefine to_param to make redis keys more recognizable" do
-      @file.to_param.should == @file.noid
+      subject.to_param.should == subject.noid
     end
     describe "that have been saved" do
       # This file has no content, so it doesn't characterize
@@ -221,69 +222,69 @@ describe GenericFile do
       #   Sufia.queue.should_receive(:push).once
       # end
       after(:each) do
-        unless @file.inner_object.class == ActiveFedora::UnsavedDigitalObject
+        unless subject.inner_object.class == ActiveFedora::UnsavedDigitalObject
           begin
-            @file.delete
+            subject.delete
           rescue ActiveFedora::ObjectNotFoundError
             # do nothing
           end
         end
       end
       it "should have activity stream-related methods defined" do
-        @file.save
-        f = @file.reload
+        subject.save
+        f = subject.reload
         f.should respond_to(:stream)
         f.should respond_to(:events)
         f.should respond_to(:create_event)
         f.should respond_to(:log_event)
       end
       it "should be able to set values via delegated methods" do
-        @file.related_url = "http://example.org/"
-        @file.creator = "John Doe"
-        @file.title = "New work"
-        @file.save
-        f = @file.reload
+        subject.related_url = "http://example.org/"
+        subject.creator = "John Doe"
+        subject.title = "New work"
+        subject.save
+        f = subject.reload
         f.related_url.should == ["http://example.org/"]
         f.creator.should == ["John Doe"]
         f.title.should == ["New work"]
       end
       it "should be able to be added to w/o unexpected graph behavior" do
-        @file.creator = "John Doe"
-        @file.title = "New work"
-        @file.save
-        f = @file.reload
+        subject.creator = "John Doe"
+        subject.title = "New work"
+        subject.save
+        f = subject.reload
         f.creator.should == ["John Doe"]
         f.title.should == ["New work"]
         f.creator = "Jane Doe"
         f.title << "Newer work"
         f.save
-        f = @file.reload
+        f = subject.reload
         f.creator.should == ["Jane Doe"]
         f.title.should == ["New work", "Newer work"]
       end
     end
   end
-  it "should support to_solr" do
-    @file.stub(:pid).and_return('stubbed_pid')
-    @file.part_of = "Arabiana"
-    @file.contributor = "Mohammad"
-    @file.creator = "Allah"
-    @file.title = "The Work"
-    @file.description = "The work by Allah"
-    @file.publisher = "Vertigo Comics"
-    @file.date_created = "1200-01-01"
-    @file.date_uploaded = Date.parse("2011-01-01")
-    @file.date_modified = Date.parse("2012-01-01")
-    @file.subject = "Theology"
-    @file.language = "Arabic"
-    @file.rights = "Wide open, buddy."
-    @file.resource_type = "Book"
-    @file.identifier = "urn:isbn:1234567890"
-    @file.based_near = "Medina, Saudi Arabia"
-    @file.related_url = "http://example.org/TheWork/"
-    @file.mime_type = "image/jpeg"
-    @file.format_label = "JPEG Image"
-    local = @file.to_solr
+  it "supports to_solr" do
+    allow(subject).to receive(:pid).and_return('stubbed_pid')
+    subject.part_of = "Arabiana"
+    subject.contributor = "Mohammad"
+    subject.creator = "Allah"
+    subject.title = "The Work"
+    subject.description = "The work by Allah"
+    subject.publisher = "Vertigo Comics"
+    subject.date_created = "1200-01-01"
+    subject.date_uploaded = Date.parse("2011-01-01")
+    subject.date_modified = Date.parse("2012-01-01")
+    subject.subject = "Theology"
+    subject.language = "Arabic"
+    subject.rights = "Wide open, buddy."
+    subject.resource_type = "Book"
+    subject.identifier = "urn:isbn:1234567890"
+    subject.based_near = "Medina, Saudi Arabia"
+    subject.related_url = "http://example.org/TheWork/"
+    subject.mime_type = "image/jpeg"
+    subject.format_label = "JPEG Image"
+    local = subject.to_solr
     local.should_not be_nil
     local[Solrizer.solr_name("desc_metadata__part_of")].should be_nil
     local[Solrizer.solr_name("desc_metadata__date_uploaded")].should be_nil
@@ -308,26 +309,25 @@ describe GenericFile do
     local["noid_tsi"].should eq('stubbed_pid')
   end
   it "should support multi-valued fields in solr" do
-    @file.tag = ["tag1", "tag2"]
-    lambda { @file.save }.should_not raise_error
-    @file.delete
+    subject.tag = ["tag1", "tag2"]
+    lambda { subject.save }.should_not raise_error
+    subject.delete
   end
   it "should support setting and getting the relative_path value" do
-    @file.relative_path = "documents/research/NSF/2010"
-    @file.relative_path.should == "documents/research/NSF/2010"
+    subject.relative_path = "documents/research/NSF/2010"
+    subject.relative_path.should == "documents/research/NSF/2010"
   end
   describe "create_thumbnail" do
     before do
       @f = GenericFile.new
-      #@f.stub(:characterize_if_changed).and_yield #don't run characterization
       @f.apply_depositor_metadata('mjg36')
     end
     after do
       @f.delete
     end
-    describe "with a video", :if => Sufia.config.enable_ffmpeg do
+    describe "with a video", if: Sufia.config.enable_ffmpeg do
       before do
-        @f.stub(:mime_type=>'video/quicktime')  #Would get set by the characterization job
+        @f.stub(mime_type: 'video/quicktime')  #Would get set by the characterization job
         @f.add_file(File.open("#{fixture_path}/countdown.avi", 'rb'), 'content', 'countdown.avi')
         @f.save
       end
@@ -343,7 +343,6 @@ describe GenericFile do
       u = FactoryGirl.create(:jill)
       @f = GenericFile.new.tap do |gf|
         gf.apply_depositor_metadata(u)
-        gf.stub(:characterize_if_changed).and_yield #don't run characterization
         gf.save!
       end
       @t = Trophy.create(user_id: u.id, generic_file_id: @f.pid)
@@ -364,7 +363,6 @@ describe GenericFile do
       f = GenericFile.new
       f.add_file(File.open(fixture_path + '/world.png'), 'content', 'world.png')
       f.apply_depositor_metadata(u)
-      f.stub(:characterize_if_changed).and_yield #don't run characterization
       f.save!
       @f = f.reload
     end
@@ -391,12 +389,12 @@ describe GenericFile do
     end
     it "should log a failing audit" do
       @f.datastreams.each { |ds| ds.stub(:dsChecksumValid).and_return(false) }
-      GenericFile.stub(:run_audit).and_return(double(:respose, :pass=>1, :created_at=>'2005-12-20', :pid=>'foo:123', :dsid=>'foo', :version=>'1'))
+      GenericFile.stub(:run_audit).and_return(double(:respose, pass:1, created_at: '2005-12-20', pid: 'foo:123', dsid: 'foo', version: '1'))
       @f.audit!
       ChecksumAuditLog.all.all? { |cal| cal.pass == 0 }.should be_true
     end
     it "should log a passing audit" do
-      GenericFile.stub(:run_audit).and_return(double(:respose, :pass=>1, :created_at=>'2005-12-20', :pid=>'foo:123', :dsid=>'foo', :version=>'1'))
+      GenericFile.stub(:run_audit).and_return(double(:respose, pass:1, created_at: '2005-12-20', pid: 'foo:123', dsid: 'foo', version: '1'))
       @f.audit!
       ChecksumAuditLog.all.all? { |cal| cal.pass == 1 }.should be_true
     end
@@ -411,11 +409,10 @@ describe GenericFile do
       @f = GenericFile.new
       @f.add_file(File.open(fixture_path + '/world.png'), 'content', 'world.png')
       @f.apply_depositor_metadata('mjg36')
-      @f.stub(:characterize_if_changed).and_yield #don't run characterization
       @f.save!
       @version = @f.datastreams['content'].versions.first
-      @old = ChecksumAuditLog.create(:pid=>@f.pid, :dsid=>@version.dsid, :version=>@version.versionID, :pass=>1, :created_at=>2.minutes.ago)
-      @new = ChecksumAuditLog.create(:pid=>@f.pid, :dsid=>@version.dsid, :version=>@version.versionID, :pass=>0)
+      @old = ChecksumAuditLog.create(pid: @f.pid, dsid: @version.dsid, version: @version.versionID, pass: 1, created_at: 2.minutes.ago)
+      @new = ChecksumAuditLog.create(pid: @f.pid, dsid: @version.dsid, version: @version.versionID, pass: 0)
     end
     it "should not prune failed audits" do
       @version.should_receive(:dsChecksumValid).and_return(true)
@@ -438,16 +435,6 @@ describe GenericFile do
 
   end
 
-  describe "save" do
-    after(:each) do
-      @file.delete
-    end
-    it "should schedule a characterization job" do
-      @file.add_file(File.open(fixture_path + '/world.png'), 'content', 'world.png')
-      Sufia.queue.should_receive(:push).once
-      @file.save
-    end
-  end
   describe "related_files" do
     let(:batch_id) { "foobar:100" }
     before(:each) do
@@ -485,8 +472,7 @@ describe GenericFile do
   end
   describe "noid integration" do
     before(:all) do
-      GenericFile.any_instance.should_receive(:characterize_if_changed).and_yield
-      @new_file = GenericFile.new(:pid => 'ns:123')
+      @new_file = GenericFile.new(pid: 'ns:123')
       @new_file.apply_depositor_metadata('mjg36')
       @new_file.save
     end
@@ -506,31 +492,19 @@ describe GenericFile do
     end
   end
   describe "characterize" do
-    it "should return expected results when called", :unless => $in_travis do
-      @file.add_file(File.open(fixture_path + '/world.png'), 'content', 'world.png')
-      # Without the stub(:save), the after save callback was being triggered
-      # which resulted the characterize_if_changed method being called; which
-      # enqueued a job for characterizing
-      @file.stub(:save)
-      @file.characterize
-      doc = Nokogiri::XML.parse(@file.characterization.content)
+    it "should return expected results when called", unless: $in_travis do
+      subject.add_file(File.open(fixture_path + '/world.png'), 'content', 'world.png')
+      subject.characterize
+      doc = Nokogiri::XML.parse(subject.characterization.content)
       doc.root.xpath('//ns:imageWidth/text()', {'ns'=>'http://hul.harvard.edu/ois/xml/ns/fits/fits_output'}).inner_text.should == '50'
     end
-    it "should not be triggered unless the content ds is changed" do
-      Sufia.queue.should_receive(:push).once
-      @file.content.content = "hey"
-      @file.save
-      @file.related_url = 'http://example.com'
-      Sufia.queue.should_receive(:push).never
-      @file.save
-      @file.delete
-    end
-    describe "after job runs" do
+    context "after characterization" do
       before(:all) do
         myfile = GenericFile.new
-        myfile.add_file(File.open(fixture_path + '/sufia/sufia_test4.pdf'), 'content', 'sufia_test4.pdf')
+        myfile.add_file(File.open(fixture_path + '/sufia/sufia_test4.pdf', 'rb').read, 'content', 'sufia_test4.pdf')
         myfile.label = 'label123'
         myfile.apply_depositor_metadata('mjg36')
+        myfile.characterize
         myfile.save
         @myfile = myfile.reload
       end
@@ -553,9 +527,7 @@ describe GenericFile do
         @myfile.title.should include("Microsoft Word - sample.pdf.docx")
         @myfile.filename[0].should == @myfile.label
       end
-      it "should include thumbnail generation in characterization job" do
-        @myfile.thumbnail.size.should_not be_nil
-      end
+
       it "should append each term only once" do
         @myfile.append_metadata
         @myfile.format_label.should == ["Portable Document Format"]
@@ -565,8 +537,8 @@ describe GenericFile do
   end
   describe "label" do
     it "should set the inner label" do
-      @file.label = "My New Label"
-      @file.inner_object.label.should == "My New Label"
+      subject.label = "My New Label"
+      subject.inner_object.label.should == "My New Label"
     end
   end
   context "with rightsMetadata" do
@@ -636,7 +608,7 @@ describe GenericFile do
       RIGHTS
       end
       it "should work via permissions=()" do
-        @file.permissions = {:user => {'mjg36' => 'read'}}
+        @file.permissions = {user: {'mjg36' => 'read'}}
         lambda { @file.save }.should_not raise_error
         @file.new_record?.should be_true
         @file.errors.should include(:edit_users)
@@ -645,7 +617,7 @@ describe GenericFile do
       end
       it "should work via update_attributes" do
         # automatically triggers save
-        lambda { @file.update_attributes(:read_users_string => 'mjg36') }.should_not raise_error
+        lambda { @file.update_attributes(read_users_string: 'mjg36') }.should_not raise_error
         @file.new_record?.should be_true
         @file.errors.should include(:edit_users)
         @file.errors[:edit_users].should include('Depositor must have edit access')
@@ -660,7 +632,7 @@ describe GenericFile do
         @file.valid?.should be_false
       end
       it "should work via permissions()" do
-        @rightsmd.permissions({:person => "mjg36"}, "read")
+        @rightsmd.permissions({person: "mjg36"}, "read")
         lambda { @file.save }.should_not raise_error
         @file.new_record?.should be_true
         @file.errors.should include(:edit_users)
@@ -736,7 +708,7 @@ describe GenericFile do
         RIGHTS
       end
       it "should work via permissions=()" do
-        @file.permissions = {:group => {'public' => 'edit'}}
+        @file.permissions = {group: {'public' => 'edit'}}
         lambda { @file.save }.should_not raise_error
         @file.new_record?.should be_true
         @file.errors.should include(:edit_groups)
@@ -745,7 +717,7 @@ describe GenericFile do
       end
       it "should work via update_attributes" do
         # automatically triggers save
-        lambda { @file.update_attributes(:edit_groups_string => 'public') }.should_not raise_error
+        lambda { @file.update_attributes(edit_groups_string: 'public') }.should_not raise_error
         @file.new_record?.should be_true
         @file.errors.should include(:edit_groups)
         @file.errors[:edit_groups].should include('Public cannot have edit access')
@@ -760,7 +732,7 @@ describe GenericFile do
         @file.valid?.should be_false
       end
       it "should work via permissions()" do
-        @rightsmd.permissions({:group => "public"}, "edit")
+        @rightsmd.permissions({group: "public"}, "edit")
         lambda { @file.save }.should_not raise_error
         @file.new_record?.should be_true
         @file.errors.should include(:edit_groups)
@@ -836,7 +808,7 @@ describe GenericFile do
         RIGHTS
       end
       it "should work via permissions=()" do
-        @file.permissions = {:group => {'registered' => 'edit'}}
+        @file.permissions = {group: {'registered' => 'edit'}}
         lambda { @file.save }.should_not raise_error
         @file.new_record?.should be_true
         @file.errors.should include(:edit_groups)
@@ -845,7 +817,7 @@ describe GenericFile do
       end
       it "should work via update_attributes" do
         # automatically triggers save
-        lambda { @file.update_attributes(:edit_groups_string => 'registered') }.should_not raise_error
+        lambda { @file.update_attributes(edit_groups_string: 'registered') }.should_not raise_error
         @file.new_record?.should be_true
         @file.errors.should include(:edit_groups)
         @file.errors[:edit_groups].should include('Registered cannot have edit access')
@@ -860,7 +832,7 @@ describe GenericFile do
         @file.valid?.should be_false
       end
       it "should work via permissions()" do
-        @rightsmd.permissions({:group => "registered"}, "edit")
+        @rightsmd.permissions({group: "registered"}, "edit")
         lambda { @file.save }.should_not raise_error
         @file.new_record?.should be_true
         @file.errors.should include(:edit_groups)
@@ -938,7 +910,7 @@ describe GenericFile do
       RIGHTS
       end
       it "should work via permissions=()" do
-        @file.permissions = {:group => {'registered' => 'read'}}
+        @file.permissions = {group: {'registered' => 'read'}}
         lambda { @file.save }.should_not raise_error
         @file.new_record?.should be_false
         @file.errors.should be_empty
@@ -946,7 +918,7 @@ describe GenericFile do
       end
       it "should work via update_attributes" do
         # automatically triggers save
-        lambda { @file.update_attributes(:read_groups_string => 'registered') }.should_not raise_error
+        lambda { @file.update_attributes(read_groups_string: 'registered') }.should_not raise_error
         @file.new_record?.should be_false
         @file.errors.should be_empty
         @file.valid?.should be_true
@@ -959,7 +931,7 @@ describe GenericFile do
         @file.valid?.should be_true
       end
       it "should work via permissions()" do
-        @rightsmd.permissions({:group => "registered"}, "read")
+        @rightsmd.permissions({group: "registered"}, "read")
         lambda { @file.save }.should_not raise_error
         @file.new_record?.should be_false
         @file.errors.should be_empty
@@ -996,25 +968,22 @@ describe GenericFile do
     end
   end
   describe "file content validation" do
-    before do
-      GenericFile.any_instance.stub(:create_derivatives)
-    end
     context "when file contains a virus" do
       let(:f) { File.new(fixture_path + '/small_file.txt') }
       after(:each) do
         subject.destroy if subject.persisted?
       end
       it "populates the errors hash during validation" do
-        allow(Sufia::GenericFile::Actions).to receive(:virus_check).and_raise(Sufia::VirusFoundError, "A virus was found in #{f.path}: EL CRAPO VIRUS")
+        allow(Sufia::GenericFile::Actor).to receive(:virus_check).and_raise(Sufia::VirusFoundError, "A virus was found in #{f.path}: EL CRAPO VIRUS")
         subject.add_file(f, 'content', 'small_file.txt')
         subject.save
         subject.should_not be_persisted
-        subject.errors.messages.should == { content: ["A virus was found in #{f.path}: EL CRAPO VIRUS"] }
+        expect(subject.errors.messages).to eq(base: ["A virus was found in #{f.path}: EL CRAPO VIRUS"])
       end
       it "does not save a new version of a GenericFile" do
         subject.add_file(f, 'content', 'small_file.txt')
         subject.save
-        allow(Sufia::GenericFile::Actions).to receive(:virus_check).and_raise(Sufia::VirusFoundError)
+        allow(Sufia::GenericFile::Actor).to receive(:virus_check).and_raise(Sufia::VirusFoundError)
         subject.add_file(File.new(fixture_path + '/sufia_generic_stub.txt') , 'content', 'sufia_generic_stub.txt')
         subject.save
         subject.reload.content.content.should == "small\n"
@@ -1045,4 +1014,17 @@ describe GenericFile do
      expect(f2.to_solr[title_key]).to eq(f2.title)
     end
   end
+
+  describe "public?" do
+    it "is true when read group is set to public" do
+      subject.read_groups = ['public']
+      expect(subject.public?).to be_true
+    end
+
+    it "is false when read group is not set to public" do
+      subject.read_groups = ['foo']
+      expect(subject.public?).to be_false
+    end
+
+  end
 end