sufia 0.1.0 → 1.0.0

data/spec/controllers/generic_files_controller_spec.rb

@@ -74,6 +74,8 @@ describe GenericFilesController do
     end
 
     it "should create and save a file asset from the given params" do
+      date_today = Date.today
+      Date.stub(:today).and_return(date_today)
       file = fixture_file_upload('/world.png','image/png')
       xhr :post, :create, :files=>[file], :Filename=>"The world", :batch_id => "sample:batch_id", :permission=>{"group"=>{"public"=>"read"} }, :terms_of_service => '1'
       response.should be_success
@@ -87,8 +89,8 @@ describe GenericFilesController do
       saved_file.content.dsChecksumValid.should be_true
 
       # Confirming that date_uploaded and date_modified were set
-      saved_file.date_uploaded.should have_at_least(1).items
-      saved_file.date_modified.should have_at_least(1).items
+      saved_file.date_uploaded.should == date_today
+      saved_file.date_modified.should == date_today
     end
 
     it "should record what user created the first version of content" do
@@ -124,12 +126,12 @@ describe GenericFilesController do
       #TODO make sure this is moved to scholarsphere:
       #saved_file.depositor.should == 'jilluser'
       saved_file.depositor.should == 'jilluser@example.com'
-      saved_file.properties.to_solr.keys.should include('depositor_t')
+      saved_file.properties.to_solr.keys.should include('depositor_tesim')
       #TODO make sure this is moved to scholarsphere:
       #saved_file.properties.to_solr['depositor_t'].should == ['jilluser']
-      saved_file.properties.to_solr['depositor_t'].should == ['jilluser@example.com']
-      saved_file.to_solr.keys.should include('depositor_t')
-      saved_file.to_solr['depositor_t'].should == ['jilluser@example.com']
+      saved_file.properties.to_solr['depositor_tesim'].should == ['jilluser@example.com']
+      saved_file.to_solr.keys.should include('depositor_tesim')
+      saved_file.to_solr['depositor_tesim'].should == ['jilluser@example.com']
     end
     it "Should call virus check" do
       controller.should_receive(:virus_check).and_return(0)      
@@ -284,7 +286,7 @@ describe GenericFilesController do
       CharacterizeJob.should_receive(:new).with(@generic_file.pid).and_return(s2)
       Sufia.queue.should_receive(:push).with(s2).once
       file = fixture_file_upload('/image.jp2','image/jp2')
-      post :update, :id=>@generic_file.pid, :filedata=>file, :Filename=>"The world", :generic_file=>{:tag=>[''] }
+      post :update, :id=>@generic_file.pid, :filedata=>file, :Filename=>"The world"
 
       edited_file = GenericFile.find(@generic_file.pid)
       version2 = edited_file.content.latest_version
@@ -302,7 +304,7 @@ describe GenericFilesController do
       s2 = stub('one')
       CharacterizeJob.should_receive(:new).with(@generic_file.pid).and_return(s2)
       Sufia.queue.should_receive(:push).with(s2).once
-      post :update, :id=>@generic_file.pid, :revision=>'content.0', :generic_file=>{:tag=>['']}
+      post :update, :id=>@generic_file.pid, :revision=>'content.0'
 
       restored_file = GenericFile.find(@generic_file.pid)
       version3 = restored_file.content.latest_version

data/spec/controllers/single_use_link_controller_spec.rb

@@ -92,10 +92,14 @@ describe SingleUseLinkController do
       it "and_return 404 on second attempt" do
         get :download, id:@dhash 
         response.should be_success
-        lambda {get :download, id:@dhash}.should raise_error ActionController::RoutingError
+        get :download, id:@dhash
+        response.should render_template('error/single_use_error') 
       end
       it "and_return 404 on attempt to get download with show" do
-        lambda {get :download, id:@shash}.should raise_error ActionController::RoutingError
+        get :download, id:@dhash
+        response.should be_success
+        get :download, id:@dhash
+        response.should render_template('error/single_use_error')
       end
     end
 
@@ -108,10 +112,14 @@ describe SingleUseLinkController do
       it "and_return 404 on second attempt" do
         get :show, id:@shash 
         response.should be_success
-        lambda {get :show, id:@shash}.should raise_error ActionController::RoutingError
+        get :show, id:@shash
+        response.should render_template('error/single_use_error')
       end
       it "and_return 404 on attempt to get show with download" do
-        lambda {get :show, id:@dhash}.should raise_error ActionController::RoutingError
+        get :show, id:@shash
+        response.should be_success
+        get :show, id:@shash
+        response.should render_template('error/single_use_error')
       end
     end
   end

data/spec/fixtures/sufia_generic_stub.descMeta.txt

@@ -1,6 +1,6 @@
 <info:fedora/sufia:<%= @id %>> <http://purl.org/dc/terms/publisher> "<%= @user %>" .
 <info:fedora/sufia:<%= @id %>> <http://purl.org/dc/terms/description> "<%= @title %> Description" .
-<info:fedora/sufia:<%= @id %>> <http://purl.org/dc/terms/created> "<%= Time.now.strftime("%m/%d/%Y") %>" .
+<info:fedora/sufia:<%= @id %>> <http://purl.org/dc/terms/created> "<%= Time.now.ctime %>" .
 <info:fedora/sufia:<%= @id %>> <http://purl.org/dc/terms/contributor> "<%= @user %>" .
 <info:fedora/sufia:<%= @id %>> <http://purl.org/dc/terms/title> "<%= @title %>" .
 <info:fedora/sufia:<%= @id %>> <http://purl.org/dc/terms/relation> "test" .

data/spec/helpers/sufia_helper_spec.rb

@@ -0,0 +1,12 @@
+require 'spec_helper'
+
+describe SufiaHelper do
+  describe "link_to_profile" do
+    it "should use User#to_params" do
+      u = User.new
+      u.stub(:user_key).and_return('justin@example.com')
+      User.should_receive(:find_by_user_key).with('justin@example.com').and_return(u)
+      helper.link_to_profile('justin@example.com').should == "<a href=\"/users/justin@example-dot-com\">justin@example.com</a>"
+    end
+  end
+end

data/spec/models/characterize_job_spec.rb

@@ -0,0 +1,89 @@
+require 'spec_helper'
+
+describe CharacterizeJob do
+  before do
+    @generic_file = GenericFile.new
+    @generic_file.apply_depositor_metadata('jcoyne@example.com')
+    @generic_file.save!
+  end
+
+  after do
+    @generic_file.delete
+  end
+
+  subject { CharacterizeJob.new(@generic_file.id)}
+
+  describe "with a AVI (video) file" do
+    before do
+      @generic_file.add_file_datastream(File.new(fixture_path + '/countdown.avi'), :dsid=>'content', :mime_type=>'video/avi')
+      @generic_file.stub(:characterize_if_changed).and_yield
+      @generic_file.save!
+    end
+    it "should create a transcode job" do
+      job = stub("stub video job")
+      if $in_travis
+        @generic_file.stub(:video?).and_return(true)
+        GenericFile.should_receive(:find).with(@generic_file.id).and_return(@generic_file)
+      end
+      TranscodeVideoJob.should_receive(:new).with(@generic_file.id, 'content').and_return(job)
+      Sufia.queue.should_receive(:push).with(job)
+      subject.run
+    end
+    it "should create a thumbnail" do
+      GenericFile.any_instance.should_receive(:create_thumbnail)
+      subject.run
+    end
+  end
+
+  describe "with a WAV (audio) file" do
+    before do
+      @generic_file.add_file_datastream(File.new(fixture_path + '/piano_note.wav'), :dsid=>'content', :mime_type=>'audio/wav')
+      @generic_file.stub(:characterize_if_changed).and_yield
+      @generic_file.save!
+    end
+    it "should create a transcode job" do
+      job = stub("stub audio job")
+      if $in_travis
+        @generic_file.stub(:audio?).and_return(true)
+        GenericFile.should_receive(:find).with(@generic_file.id).and_return(@generic_file)
+      end
+      TranscodeAudioJob.should_receive(:new).with(@generic_file.id, 'content').and_return(job)
+      Sufia.queue.should_receive(:push).with(job)
+      subject.run
+    end
+  end
+
+  describe "with an mp3 (audio) file" do
+    before do
+      @generic_file.add_file_datastream(File.new(fixture_path + '/sufia/sufia_test5.mp3'), :dsid=>'content', :mime_type=>'audio/mp3')
+      @generic_file.stub(:characterize_if_changed).and_yield
+      @generic_file.save!
+    end
+    it "should create a transcode job. (we'd like ogg too)" do
+      # TODO just copy the 'content' datastream to the mp3 datastream if it's an mp3, and then transcode to ogg
+      job = stub("stub audio job")
+      if $in_travis
+        @generic_file.stub(:audio?).and_return(true)
+        GenericFile.should_receive(:find).with(@generic_file.id).and_return(@generic_file)
+      end
+      TranscodeAudioJob.should_receive(:new).with(@generic_file.id, 'content').and_return(job)
+      Sufia.queue.should_receive(:push).with(job)
+      subject.run
+    end
+  end
+
+  describe "with an jpeg2000 (image) file" do
+    before do
+      @generic_file.add_file_datastream(File.new(fixture_path + '/image.jp2'), :dsid=>'content', :mime_type=>'image/jp2')
+      @generic_file.stub(:characterize_if_changed).and_yield
+      @generic_file.save!
+    end
+
+    it "should create a thumbnail" do
+      GenericFile.any_instance.should_receive(:create_thumbnail)
+      subject.run
+    end
+  end
+end
+
+

data/spec/models/checksum_audit_log_spec.rb

@@ -19,6 +19,7 @@ describe ChecksumAuditLog do
     @f = GenericFile.new
     @f.add_file_datastream(File.new(fixture_path + '/world.png'), :dsid=>'content')
     @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)

data/spec/models/event_jobs_spec.rb

@@ -40,7 +40,7 @@ describe 'event jobs' do
     count_user = @user.events.length
     count_another = @another_user.events.length
     Time.should_receive(:now).at_least(:once).and_return(1)
-    event = { action: 'User <a href="/users/jilluser@example.com">jilluser@example.com</a> has edited his or her profile', timestamp: '1' }
+    event = { action: 'User <a href="/users/jilluser@example-dot-com">jilluser@example.com</a> has edited his or her profile', timestamp: '1' }
     UserEditProfileEventJob.new(@user.user_key).run
     @user.events.length.should == count_user + 1
     @user.events.first.should == event
@@ -54,7 +54,7 @@ describe 'event jobs' do
     @another_user.events.length.should == 0
     @third_user.events.length.should == 0
     Time.should_receive(:now).at_least(:once).and_return(1)
-    event = { action: 'User <a href="/users/jilluser@example.com">jilluser@example.com</a> is now following <a href="/users/archivist1@example.com">archivist1@example.com</a>', timestamp: '1' }
+    event = { action: 'User <a href="/users/jilluser@example-dot-com">jilluser@example.com</a> is now following <a href="/users/archivist1@example-dot-com">archivist1@example.com</a>', timestamp: '1' }
     UserFollowEventJob.new(@user.user_key, @another_user.user_key).run
     @user.events.length.should == 1
     @user.events.first.should == event
@@ -71,7 +71,7 @@ describe 'event jobs' do
     @another_user.events.length.should == 0
     @third_user.events.length.should == 0
     Time.should_receive(:now).at_least(:once).and_return(1)
-    event = { action: 'User <a href="/users/jilluser@example.com">jilluser@example.com</a> has unfollowed <a href="/users/archivist1@example.com">archivist1@example.com</a>', timestamp: '1' }
+    event = { action: 'User <a href="/users/jilluser@example-dot-com">jilluser@example.com</a> has unfollowed <a href="/users/archivist1@example-dot-com">archivist1@example.com</a>', timestamp: '1' }
     UserUnfollowEventJob.new(@user.user_key, @another_user.user_key).run
     @user.events.length.should == 1
     @user.events.first.should == event
@@ -90,7 +90,7 @@ describe 'event jobs' do
     @third_user.events.length.should == 0
     @gf.events.length.should == 0
     Time.should_receive(:now).at_least(:once).and_return(1)
-    event = {action: 'User <a href="/users/jilluser@example.com">jilluser@example.com</a> has deposited <a href="/files/123">Hamlet</a>', timestamp: '1' }
+    event = {action: 'User <a href="/users/jilluser@example-dot-com">jilluser@example.com</a> has deposited <a href="/files/123">Hamlet</a>', timestamp: '1' }
     ContentDepositEventJob.new('test:123', @user.user_key).run
     @user.profile_events.length.should == 1
     @user.profile_events.first.should == event
@@ -111,7 +111,7 @@ describe 'event jobs' do
     @third_user.events.length.should == 0
     @gf.events.length.should == 0
     Time.should_receive(:now).at_least(:once).and_return(1)
-    event = {action: 'User <a href="/users/jilluser@example.com">jilluser@example.com</a> has updated <a href="/files/123">Hamlet</a>', timestamp: '1' }
+    event = {action: 'User <a href="/users/jilluser@example-dot-com">jilluser@example.com</a> has updated <a href="/files/123">Hamlet</a>', timestamp: '1' }
     ContentUpdateEventJob.new('test:123', @user.user_key).run
     @user.profile_events.length.should == 1
     @user.profile_events.first.should == event
@@ -132,7 +132,7 @@ describe 'event jobs' do
     @third_user.events.length.should == 0
     @gf.events.length.should == 0
     Time.should_receive(:now).at_least(:once).and_return(1)
-    event = {action: 'User <a href="/users/jilluser@example.com">jilluser@example.com</a> has added a new version of <a href="/files/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/123">Hamlet</a>', timestamp: '1' }
     ContentNewVersionEventJob.new('test:123', @user.user_key).run
     @user.profile_events.length.should == 1
     @user.profile_events.first.should == event
@@ -153,7 +153,7 @@ describe 'event jobs' do
     @third_user.events.length.should == 0
     @gf.events.length.should == 0
     Time.should_receive(:now).at_least(:once).and_return(1)
-    event = {action: 'User <a href="/users/jilluser@example.com">jilluser@example.com</a> has restored a version \'content.0\' of <a href="/files/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/123">Hamlet</a>', timestamp: '1' }
     ContentRestoredVersionEventJob.new('test:123', @user.user_key, 'content.0').run
     @user.profile_events.length.should == 1
     @user.profile_events.first.should == event
@@ -172,7 +172,7 @@ describe 'event jobs' do
     @another_user.events.length.should == 0
     @third_user.events.length.should == 0
     Time.should_receive(:now).at_least(:once).and_return(1)
-    event = {action: 'User <a href="/users/jilluser@example.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
     @user.profile_events.length.should == 1
     @user.profile_events.first.should == event
@@ -191,7 +191,7 @@ describe 'event jobs' do
     @gf.events.length.should == 0
     @now = Time.now
     Time.should_receive(:now).at_least(:once).and_return(@now)
-    event = {action: 'User <a href="/users/jilluser@example.com">jilluser@example.com</a> has updated <a href="/files/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/123">Hamlet</a>', timestamp: @now.to_i.to_s }
     ContentUpdateEventJob.new('test:123', @user.user_key).run
     @user.profile_events.length.should == 1
     @user.profile_events.first.should == event

data/spec/models/file_content_datastream_spec.rb

@@ -16,19 +16,18 @@ require 'spec_helper'
 
 describe FileContentDatastream do
   before do
-    @subject = FileContentDatastream.new(nil, 'content')
-    @subject.stub(:pid=>'my_pid')
-    @subject.stub(:dsVersionID=>'content.7')
+    Sufia.queue.stub(:push).with(an_instance_of CharacterizeJob) #don't run characterization
   end
   describe "version control" do
-    before(:all) do
+    before do
       f = GenericFile.new
       f.add_file_datastream(File.new(fixture_path + '/world.png'), :dsid=>'content')
       f.apply_depositor_metadata('mjg36')
+      f.stub(:characterize_if_changed).and_yield #don't run characterization
       f.save
-      @file = GenericFile.find(f.pid)
+      @file = f.reload
     end
-    after(:all) do
+    after do
       @file.delete
     end
     it "should have a list of versions with one entry" do
@@ -47,8 +46,9 @@ describe FileContentDatastream do
       @file.content.get_version("foobar").should be_nil
     end
     describe "add a version" do
-      before(:all) do
+      before do
         @file.add_file_datastream(File.new(fixture_path + '/world.png'), :dsid=>'content')
+        @file.stub(:characterize_if_changed).and_yield #don't run characterization
         @file.save
       end
       it "should return two versions" do
@@ -63,10 +63,15 @@ describe FileContentDatastream do
     end
   end
   describe "extract_metadata" do
+    before do
+      @subject = FileContentDatastream.new(nil, 'content')
+      @subject.stub(:pid=>'my_pid')
+      @subject.stub(:dsVersionID=>'content.7')
+    end
     it "should have the path" do
       @subject.send(:fits_path).should be_present
     end
-    it "should return an xml document" do
+    it "should return an xml document", :unless => $in_travis do
       repo = mock("repo")
       repo.stub(:config=>{})
       f = File.new(fixture_path + '/world.png')
@@ -78,7 +83,7 @@ describe FileContentDatastream do
       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" do
+    it "should return expected results when invoked via HTTP", :unless => $in_travis do
       repo = mock("repo")
       repo.stub(:config=>{})
       f = ActionDispatch::Http::UploadedFile.new(:tempfile => File.new(fixture_path + '/world.png'),
@@ -96,6 +101,7 @@ 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
@@ -111,7 +117,7 @@ describe FileContentDatastream do
       @generic_file.thumbnail.changed?.should be_true
       @generic_file.content.changed?.should be_false
 
-      retrieved_file = GenericFile.find(@generic_file.pid)
+      retrieved_file = @generic_file.reload
       retrieved_file.content.changed?.should be_false
     end
   end

data/spec/models/fits_datastream_spec.rb

@@ -14,17 +14,11 @@
 
 require 'spec_helper'
 
-describe FitsDatastream do
+describe FitsDatastream, :unless => $in_travis do
   before(:all) do
-    GenericFile.any_instance.stub(:terms_of_service).and_return('1')
     @file = GenericFile.new
     @file.add_file_datastream(File.new(fixture_path + '/world.png'), :dsid=>'content')
-    @file.apply_depositor_metadata('mjg36')
-    @file.save
-    @file = GenericFile.find(@file.pid)
-  end
-  after(:all) do
-    @file.delete
+    @file.characterize
   end
   it "should have a format label" do
     @file.format_label.should == ["Portable Network Graphics"]

data/spec/models/generic_file_spec.rb

@@ -16,14 +16,14 @@ require 'spec_helper'
 
 describe GenericFile do
   before do
-    @file = GenericFile.new
-    @file.apply_depositor_metadata('jcoyne')
+    subject.apply_depositor_metadata('jcoyne')
+    @file = subject #TODO remove this line someday (use subject instead)
   end
 
   describe "terms_for_editing" do
     it "should return a list" do
       @file.terms_for_editing.should == [ :contributor, :creator, :title, :description, :publisher,
-       :date_created, :subject, :language, :rights, :identifier, :based_near, :tag, :related_url]
+       :date_created, :subject, :language, :rights, :resource_type, :identifier, :based_near, :tag, :related_url]
     end
   end
   describe "terms_for_display" do
@@ -34,6 +34,71 @@ describe GenericFile do
     end
   end
 
+  describe "mime type recognition" do
+    describe "image?" do
+      it "should be true for jpeg2000" do
+        subject.mime_type = 'image/jp2'
+        subject.should be_image
+      end
+      it "should be true for jpeg" do
+        subject.mime_type = 'image/jpg'
+        subject.should be_image
+      end
+      it "should be true for png" do
+        subject.mime_type = 'image/png'
+        subject.should be_image
+      end
+    end
+    describe "pdf?" do
+      it "should be true for pdf" do
+        subject.mime_type = 'application/pdf'
+        subject.should be_pdf
+      end
+    end
+    describe "audio?" do
+      it "should be true for wav" do
+        subject.mime_type = 'audio/x-wave'
+        subject.should be_audio
+        subject.mime_type = 'audio/x-wav'
+        subject.should be_audio
+      end
+      it "should be true for mpeg" do
+        subject.mime_type = 'audio/mpeg'
+        subject.should be_audio
+        subject.mime_type = 'audio/mp3'
+        subject.should be_audio
+      end
+      it "should be true for ogg" do
+        subject.mime_type = 'audio/ogg'
+        subject.should be_audio
+      end
+    end
+    describe "video?" do
+      it "should be true for avi" do
+        subject.mime_type = 'video/avi'
+        subject.should be_video
+      end
+      it "should be true for webm" do
+        subject.mime_type = 'video/webm'
+        subject.should be_video
+      end
+      it "should be true for mpeg" do
+        subject.mime_type = 'video/mp4'
+        subject.should be_video
+        subject.mime_type = 'video/mpeg'
+        subject.should be_video
+      end
+      it "should be true for quicktime" do
+        subject.mime_type = 'video/quicktime'
+        subject.should be_video
+      end
+      it "should be true for mxf" do
+        subject.mime_type = 'application/mxf'
+        subject.should be_video
+      end
+    end
+  end
+
   describe "attributes" do
     it "should have rightsMetadata" do
       @file.rightsMetadata.should be_instance_of ParanoidRightsDatastream
@@ -158,7 +223,7 @@ describe GenericFile do
       end
       it "should have activity stream-related methods defined" do
         @file.save
-        f = GenericFile.find(@file.pid)
+        f = @file.reload
         f.should respond_to(:stream)
         f.should respond_to(:events)
         f.should respond_to(:create_event)
@@ -169,7 +234,7 @@ describe GenericFile do
         @file.creator = "John Doe"
         @file.title = "New work"
         @file.save
-        f = GenericFile.find(@file.pid)
+        f = @file.reload
         f.related_url.should == ["http://example.org/"]
         f.creator.should == ["John Doe"]
         f.title.should == ["New work"]
@@ -178,13 +243,13 @@ describe GenericFile do
         @file.creator = "John Doe"
         @file.title = "New work"
         @file.save
-        f = GenericFile.find(@file.pid)
+        f = @file.reload
         f.creator.should == ["John Doe"]
         f.title.should == ["New work"]
         f.creator = "Jane Doe"
         f.title << "Newer work"
         f.save
-        f = GenericFile.find(@file.pid)
+        f = @file.reload
         f.creator.should == ["Jane Doe"]
         f.title.should == ["New work", "Newer work"]
       end
@@ -198,8 +263,8 @@ describe GenericFile do
     @file.description = "The work by Allah"
     @file.publisher = "Vertigo Comics"
     @file.date_created = "1200-01-01"
-    @file.date_uploaded = "2011-01-01"
-    @file.date_modified = "2012-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."
@@ -211,25 +276,27 @@ describe GenericFile do
     @file.format_label = "JPEG Image"
     local = @file.to_solr
     local.should_not be_nil
-    local["desc_metadata__part_of_t"].should be_nil
-    local["desc_metadata__date_uploaded_t"].should be_nil
-    local["desc_metadata__date_modified_t"].should be_nil
-    local["desc_metadata__rights_t"].should == ["Wide open, buddy."]
-    local["desc_metadata__related_url_t"].should be_nil
-    local["desc_metadata__contributor_t"].should == ["Mohammad"]
-    local["desc_metadata__creator_t"].should == ["Allah"]
-    local["desc_metadata__title_t"].should == ["The Work"]
-    local["desc_metadata__description_t"].should == ["The work by Allah"]
-    local["desc_metadata__publisher_t"].should == ["Vertigo Comics"]
-    local["desc_metadata__subject_t"].should == ["Theology"]
-    local["desc_metadata__language_t"].should == ["Arabic"]
-    local["desc_metadata__date_created_t"].should == ["1200-01-01"]
-    local["desc_metadata__resource_type_t"].should == ["Book"]
-    local["file_format_t"].should == "jpeg (JPEG Image)"
-    local["desc_metadata__identifier_t"].should == ["urn:isbn:1234567890"]
-    local["desc_metadata__based_near_t"].should == ["Medina, Saudi Arabia"]
-    local["mime_type_t"].should == ["image/jpeg"]    
-    local["noid_s"].should == "__DO_NOT_USE__"
+    local[Solrizer.solr_name("desc_metadata__part_of")].should be_nil
+    local[Solrizer.solr_name("desc_metadata__date_uploaded")].should be_nil
+    local[Solrizer.solr_name("desc_metadata__date_modified")].should be_nil
+    local[Solrizer.solr_name("desc_metadata__date_uploaded", :stored_sortable, type: :date)].should == ['2011-01-01T00:00:00Z']
+    local[Solrizer.solr_name("desc_metadata__date_modified", :stored_sortable, type: :date)].should == ['2012-01-01T00:00:00Z']
+    local[Solrizer.solr_name("desc_metadata__rights")].should == ["Wide open, buddy."]
+    local[Solrizer.solr_name("desc_metadata__related_url")].should be_nil
+    local[Solrizer.solr_name("desc_metadata__contributor")].should == ["Mohammad"]
+    local[Solrizer.solr_name("desc_metadata__creator")].should == ["Allah"]
+    local[Solrizer.solr_name("desc_metadata__title")].should == ["The Work"]
+    local[Solrizer.solr_name("desc_metadata__description")].should == ["The work by Allah"]
+    local[Solrizer.solr_name("desc_metadata__publisher")].should == ["Vertigo Comics"]
+    local[Solrizer.solr_name("desc_metadata__subject")].should == ["Theology"]
+    local[Solrizer.solr_name("desc_metadata__language")].should == ["Arabic"]
+    local[Solrizer.solr_name("desc_metadata__date_created")].should == ["1200-01-01"]
+    local[Solrizer.solr_name("desc_metadata__resource_type")].should == ["Book"]
+    local[Solrizer.solr_name("file_format")].should == "jpeg (JPEG Image)"
+    local[Solrizer.solr_name("desc_metadata__identifier")].should == ["urn:isbn:1234567890"]
+    local[Solrizer.solr_name("desc_metadata__based_near")].should == ["Medina, Saudi Arabia"]
+    local[Solrizer.solr_name("mime_type")].should == ["image/jpeg"]    
+    local["noid_tsi"].should == "__DO_NOT_USE__"
   end
   it "should support multi-valued fields in solr" do
     @file.tag = ["tag1", "tag2"]
@@ -241,24 +308,41 @@ describe GenericFile do
     @file.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::Engine.config.enable_ffmpeg do
+      before do
+        @f.stub(:mime_type=>'video/quicktime')  #Would get set by the characterization job
+        @f.add_file_datastream(File.new("#{fixture_path}/countdown.avi", 'rb'), :dsid=>'content')
+        @f.save
+      end
+      it "should make a png thumbnail" do
+        @f.create_thumbnail
+        @f.thumbnail.content.size.should == 4768 # this is a bad test. I just want to show that it did something.
+        @f.thumbnail.mimeType.should == 'image/png'
+      end
+    end
+
     describe "with an image that doesn't get resized" do
       before do
-        @f = GenericFile.new
         @f.stub(:mime_type=>'image/png', :width=>['50'], :height=>['50'])  #Would get set by the characterization job
         @f.add_file_datastream(File.new("#{fixture_path}/world.png", 'rb'), :dsid=>'content')
-        @f.apply_depositor_metadata('mjg36')
         @f.save
+      end
+      it "should keep the thumbnail at the original size (but transform to png)" do
         @mock_image = mock("image", :from_blob=>true)
+        @mock_image.should_not_receive(:scale)
+        @mock_image.should_receive(:to_blob).and_return('fake content')
         Magick::ImageList.should_receive(:new).and_return(@mock_image)
-      end
-      after do
-        @f.delete
-      end
-      it "should scale the thumbnail to original size" do
-        @mock_image.should_receive(:scale).with(50, 50).and_return(stub(:to_blob=>'fake content'))
         @f.create_thumbnail
-        @f.content.changed?.should be_false
         @f.thumbnail.content.should == 'fake content'
+        @f.thumbnail.mimeType.should == 'image/png'
       end
     end
   end
@@ -266,12 +350,11 @@ describe GenericFile do
     before(:each) do
       u = FactoryGirl.create(:user)
       f = GenericFile.new
-      f.stub(:characterize).and_return(true)
       f.add_file_datastream(File.new(fixture_path + '/world.png'), :dsid=>'content')
       f.apply_depositor_metadata(u.user_key)
+      f.stub(:characterize_if_changed).and_yield #don't run characterization
       f.save!
-      @f = GenericFile.find(f.pid)
-      @f.stub(:characterize).and_return(true)
+      @f = f.reload
     end
     it "should schedule a audit job for each datastream" do
       s1 = stub('one')
@@ -289,12 +372,6 @@ describe GenericFile do
       s5 = stub('five')
       AuditJob.should_receive(:new).with(@f.pid, 'content', "content.0").and_return(s5)
       Sufia.queue.should_receive(:push).with(s5)
-      s6 = stub('six')
-      AuditJob.should_receive(:new).with(@f.pid, 'characterization', "characterization.0").and_return(s6)
-      Sufia.queue.should_receive(:push).with(s6)
-      s7 = stub('seven')
-      AuditJob.should_receive(:new).with(@f.pid, 'thumbnail', "thumbnail.0").and_return(s7)
-      Sufia.queue.should_receive(:push).with(s7)
       @f.audit!
     end
     it "should log a failing audit" do
@@ -319,6 +396,7 @@ describe GenericFile do
       @f = GenericFile.new
       @f.add_file_datastream(File.new(fixture_path + '/world.png'), :dsid=>'content')
       @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)
@@ -455,7 +533,7 @@ describe GenericFile do
     end
   end
   describe "characterize" do
-    it "should return expected results when called" do
+    it "should return expected results when called", :unless => $in_travis do
       @file.add_file_datastream(File.new(fixture_path + '/world.png'), :dsid=>'content')
       @file.characterize
       doc = Nokogiri::XML.parse(@file.characterization.content)
@@ -475,19 +553,12 @@ describe GenericFile do
         myfile = GenericFile.new
         myfile.add_file_datastream(File.new(fixture_path + '/sufia/sufia_test4.pdf'), :dsid=>'content')
         myfile.label = 'label123'
-        myfile.thumbnail.size.nil?.should be_true
         myfile.apply_depositor_metadata('mjg36')
         myfile.save
-        @myfile = GenericFile.find(myfile.pid)
+        @myfile = myfile.reload
       end
       after(:all) do
-        unless @myfile.inner_object.kind_of? ActiveFedora::UnsavedDigitalObject
-          begin
-            @myfile.delete
-          rescue ActiveFedora::ObjectNotFoundError
-            # do nothing
-          end
-        end
+        @myfile.delete
       end
       it "should return expected results after a save" do
         @myfile.file_size.should == ['218882']
@@ -506,7 +577,7 @@ describe GenericFile do
         @myfile.filename[0].should == @myfile.label
       end
       it "should include thumbnail generation in characterization job" do
-        @myfile.thumbnail.size.nil?.should be_false
+        @myfile.thumbnail.size.should_not be_nil
       end
       it "should append each term only once" do
         @myfile.append_metadata
@@ -537,19 +608,19 @@ describe GenericFile do
     it "should have read groups writer" do
       subject.read_groups = ['group-2', 'group-3']
       subject.rightsMetadata.groups.should == {'group-2' => 'read', 'group-3'=>'read', 'group-8' => 'edit'}
-      subject.rightsMetadata.individuals.should == {"person1"=>"read","person2"=>"read"}
+      subject.rightsMetadata.individuals.should == {"person1"=>"read","person2"=>"read", 'jcoyne' => 'edit'}
     end
 
     it "should have read groups string writer" do
       subject.read_groups_string = 'umg/up.dlt.staff, group-3'
       subject.rightsMetadata.groups.should == {'umg/up.dlt.staff' => 'read', 'group-3'=>'read', 'group-8' => 'edit'}
-      subject.rightsMetadata.individuals.should == {"person1"=>"read","person2"=>"read"}
+      subject.rightsMetadata.individuals.should == {"person1"=>"read","person2"=>"read", 'jcoyne' => 'edit'}
     end
     it "should only revoke eligible groups" do
       subject.set_read_groups(['group-2', 'group-3'], ['group-6'])
       # 'group-7' is not eligible to be revoked
       subject.rightsMetadata.groups.should == {'group-2' => 'read', 'group-3'=>'read', 'group-7' => 'read', 'group-8' => 'edit'}
-      subject.rightsMetadata.individuals.should == {"person1"=>"read","person2"=>"read"}
+      subject.rightsMetadata.individuals.should == {"person1"=>"read","person2"=>"read", 'jcoyne' => 'edit'}
     end
   end
   describe "permissions validation" do