sufia 0.0.3 → 0.0.4

data/lib/sufia/generic_file/characterization.rb

@@ -37,7 +37,6 @@ module Sufia
         self.characterization.ng_xml = self.content.extract_metadata
         self.append_metadata
         self.filename = self.label
-        self.terms_of_service = '1'
         save unless self.new_object?
       end
 

data/lib/sufia/generic_file/thumbnail.rb

@@ -26,7 +26,6 @@ module Sufia
             thumb = first.scale(338, 493)
             self.thumbnail.content = thumb.to_blob { self.format = "PNG" }
             #logger.debug "Has the content changed before saving? #{self.content.changed?}"
-            self.terms_of_service = '1'
             stat = self.save
             break
           rescue => e
@@ -41,8 +40,8 @@ module Sufia
         img = Magick::ImageList.new
         img.from_blob(content.content)
         # horizontal img
-        height = self.height.first.to_i
-        width = self.width.first.to_i
+        height = Float(self.height.first.to_i)
+        width = Float(self.width.first.to_i)
         scale = height / width
         if width > height
           if width > 150 and height > 105
@@ -59,7 +58,6 @@ module Sufia
           end
         end
         self.thumbnail.content = thumb.to_blob
-        self.terms_of_service = '1'
         #logger.debug "Has the content before saving? #{self.content.changed?}"
         self.save
       end

data/lib/sufia/jobs/unzip_job.rb

@@ -38,7 +38,6 @@ class UnzipJob
         @generic_file.apply_depositor_metadata(zip_file.edit_users.first)
         @generic_file.date_uploaded = Time.now.ctime
         @generic_file.date_modified = Time.now.ctime
-        @generic_file.terms_of_service = '1'
         @generic_file.save
       end
     end

data/lib/sufia/user.rb

@@ -41,9 +41,6 @@ module Sufia::User
     validates :avatar, :attachment_content_type => { :content_type => /^image\/(jpg|jpeg|pjpeg|png|x-png|gif)$/ }, :if => Proc.new { |p| p.avatar.file? }
     validates :avatar, :attachment_size => { :less_than => 2.megabytes }, :if => Proc.new { |p| p.avatar.file? }
 
-    # Pagination hook
-    self.per_page = 5
-
   end
 
   # This method should display the unique identifier for this user as defined by devise.

data/lib/sufia/version.rb

@@ -1,3 +1,3 @@
 module Sufia
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/spec/controllers/batch_controller_spec.rb

@@ -17,7 +17,6 @@ require 'spec_helper'
 describe BatchController do
   before do
     controller.stub(:has_access?).and_return(true)
-    GenericFile.any_instance.stub(:terms_of_service).and_return('1')
     @user = FactoryGirl.find_or_create(:user)
     sign_in @user
     User.any_instance.stub(:groups).and_return([])
@@ -43,16 +42,16 @@ describe BatchController do
       @file2.delete
     end
     it "should equeue a batch update job" do
-      params = {'generic_file' => {'terms_of_service' => '1', 'read_groups_string' => '', 'read_users_string' => 'archivist1, archivist2', 'tag' => ['']}, 'id' => @batch.pid, 'controller' => 'batch', 'action' => 'update'}
+      params = {'generic_file' => {'read_groups_string' => '', 'read_users_string' => 'archivist1, archivist2', 'tag' => ['']}, 'id' => @batch.pid, 'controller' => 'batch', 'action' => 'update'}
       s1 = stub('one')
       BatchUpdateJob.should_receive(:new).with(@user.user_key, params).and_return(s1)
       Sufia.queue.should_receive(:push).with(s1).once
-      post :update, :id=>@batch.pid, "generic_file"=>{"terms_of_service"=>"1", "read_groups_string"=>"", "read_users_string"=>"archivist1, archivist2", "tag"=>[""]}     
+      post :update, :id=>@batch.pid, "generic_file"=>{"read_groups_string"=>"", "read_users_string"=>"archivist1, archivist2", "tag"=>[""]}     
     end
     describe "when views are shown" do
       render_views
       it "should show flash messages" do
-        post :update, :id=>@batch.pid, "generic_file"=>{"terms_of_service"=>"1", "read_groups_string"=>"","read_users_string"=>"archivist1, archivist2", "tag"=>[""]}
+        post :update, :id=>@batch.pid, "generic_file"=>{"read_groups_string"=>"","read_users_string"=>"archivist1, archivist2", "tag"=>[""]}
         response.should redirect_to @routes.url_helpers.dashboard_index_path
         flash[:notice].should_not be_nil
         flash[:notice].should_not be_empty
@@ -61,41 +60,41 @@ describe BatchController do
     end
     describe "when user has edit permissions on a file" do
       it "should set the users with read access" do
-        post :update, :id=>@batch.pid, "generic_file"=>{"terms_of_service"=>"1", "read_groups_string"=>"", "read_users_string"=>"archivist1, archivist2", "tag"=>[""]}
+        post :update, :id=>@batch.pid, "generic_file"=>{"read_groups_string"=>"", "read_users_string"=>"archivist1, archivist2", "tag"=>[""]}
         file = GenericFile.find(@file.pid)
         file.read_users.should == ['archivist1', 'archivist2']
 
         response.should redirect_to @routes.url_helpers.dashboard_index_path
       end
       it "should set the groups with read access" do
-        post :update, :id=>@batch.pid, "generic_file"=>{"terms_of_service"=>"1", "read_groups_string"=>"group1, group2", "read_users_string"=>"", "tag"=>[""]}
+        post :update, :id=>@batch.pid, "generic_file"=>{"read_groups_string"=>"group1, group2", "read_users_string"=>"", "tag"=>[""]}
         file = GenericFile.find(@file.pid)
         file.read_groups.should == ['group1', 'group2']
       end
       it "should set public read access" do
-        post :update, :id=>@batch.pid, "visibility"=>"open", "generic_file"=>{"terms_of_service"=>"1", "read_groups_string"=>"", "read_users_string"=>"", "tag"=>[""]}
+        post :update, :id=>@batch.pid, "visibility"=>"open", "generic_file"=>{"read_groups_string"=>"", "read_users_string"=>"", "tag"=>[""]}
         file = GenericFile.find(@file.pid)
         file.read_groups.should == ['public']
       end
       it "should set public read access and groups at the same time" do
-        post :update, :id=>@batch.pid, "visibility"=>"open", "generic_file"=>{"terms_of_service"=>"1", "read_groups_string"=>"group1, group2", "read_users_string"=>"", "tag"=>[""]}
+        post :update, :id=>@batch.pid, "visibility"=>"open", "generic_file"=>{"read_groups_string"=>"group1, group2", "read_users_string"=>"", "tag"=>[""]}
         file = GenericFile.find(@file.pid)
         file.read_groups.should == ['group1', 'group2', 'public']
       end
       it "should set public discover access and groups at the same time" do
-        post :update, :id=>@batch.pid, "permission"=>{"group"=>{"public"=>"none"}}, "generic_file"=>{"terms_of_service"=>"1", "read_groups_string"=>"group1, group2", "read_users_string"=>"", "tag"=>[""]}
+        post :update, :id=>@batch.pid, "permission"=>{"group"=>{"public"=>"none"}}, "generic_file"=>{"read_groups_string"=>"group1, group2", "read_users_string"=>"", "tag"=>[""]}
         file = GenericFile.find(@file.pid)
         file.read_groups.should == ['group1', 'group2']
         file.discover_groups.should == []
       end
       it "should set metadata like title" do
-        post :update, :id=>@batch.pid, "generic_file"=>{"terms_of_service"=>"1", "tag"=>["footag", "bartag"]}, "title"=>{@file.pid=>"New Title"} 
+        post :update, :id=>@batch.pid, "generic_file"=>{"tag"=>["footag", "bartag"]}, "title"=>{@file.pid=>"New Title"} 
         file = GenericFile.find(@file.pid)
         file.title.should == ["New Title"]
         file.tag.should == ["footag", "bartag"]
       end
       it "should not set any tags" do
-        post :update, :id=>@batch.pid, "generic_file"=>{"terms_of_service"=>"1", "read_groups_string"=>"", "read_users_string"=>"archivist1", "tag"=>[""]}
+        post :update, :id=>@batch.pid, "generic_file"=>{"read_groups_string"=>"", "read_users_string"=>"archivist1", "tag"=>[""]}
         file = GenericFile.find(@file.pid)
         file.tag.should be_empty
       end
@@ -106,7 +105,7 @@ describe BatchController do
         file.title = "Original Title"
         file.read_groups.should == []
         file.save
-        post :update, :id=>@batch.pid, "generic_file"=>{"terms_of_service"=>"1", "read_groups_string"=>"group1, group2", "read_users_string"=>"", "tag"=>[""]}, "title"=>{@file2.pid=>"Title Wont Change"}
+        post :update, :id=>@batch.pid, "generic_file"=>{"read_groups_string"=>"group1, group2", "read_users_string"=>"", "tag"=>[""]}, "title"=>{@file2.pid=>"Title Wont Change"}
         file = GenericFile.find(@file2.pid)
         file.title.should == ["Original Title"]
         file.read_groups.should == []

data/spec/controllers/catalog_controller_spec.rb

@@ -16,7 +16,6 @@ require 'spec_helper'
 
 describe CatalogController do
   before do
-    GenericFile.any_instance.stub(:terms_of_service).and_return('1')
     GenericFile.any_instance.stub(:characterize_if_changed).and_yield
     @user = FactoryGirl.find_or_create(:user)
     sign_in @user
@@ -29,10 +28,10 @@ describe CatalogController do
   describe "#index" do
     before (:all) do
       GenericFile.find_each { |f| f.delete }
-      @gf1 =  GenericFile.new(title:'Test Document PDF', filename:'test.pdf', read_groups:['public'], :terms_of_service=>'1')
+      @gf1 =  GenericFile.new(title:'Test Document PDF', filename:'test.pdf', read_groups:['public'])
       @gf1.apply_depositor_metadata('mjg36')
       @gf1.save
-      @gf2 =  GenericFile.new(title:'Test 2 Document', filename:'test2.doc', contributor:'Contrib1', read_groups:['public'], :terms_of_service=>'1')
+      @gf2 =  GenericFile.new(title:'Test 2 Document', filename:'test2.doc', contributor:'Contrib1', read_groups:['public'])
       @gf2.apply_depositor_metadata('mjg36')
       @gf2.save
     end

data/spec/controllers/generic_files_controller_spec.rb

@@ -18,7 +18,6 @@ describe GenericFilesController do
   before do
     controller.stub(:has_access?).and_return(true)
 
-    GenericFile.any_instance.stub(:terms_of_service).and_return('1')
     @user = FactoryGirl.find_or_create(:user)
     sign_in @user
     User.any_instance.stub(:groups).and_return([])
@@ -26,7 +25,6 @@ describe GenericFilesController do
   end
   describe "#create" do
     before do
-      GenericFile.any_instance.stub(:terms_of_service).and_return('1')
       @file_count = GenericFile.count
       @mock = GenericFile.new({:pid => 'test:123'})
       GenericFile.stub(:new).and_return(@mock)
@@ -48,7 +46,7 @@ describe GenericFilesController do
       s2 = stub('one')
       CharacterizeJob.should_receive(:new).with('test:123').and_return(s2)
       Sufia.queue.should_receive(:push).with(s2).once
-      xhr :post, :create, :files=>[file], :Filename=>"The world", :batch_id => "sample:batch_id", :permission=>{"group"=>{"public"=>"read"} }, :terms_of_service=>"1"
+      xhr :post, :create, :files=>[file], :Filename=>"The world", :batch_id => "sample:batch_id", :permission=>{"group"=>{"public"=>"read"} }, :terms_of_service => '1'
     end
 
     it "should expand zip files" do
@@ -65,12 +63,12 @@ describe GenericFilesController do
       UnzipJob.should_receive(:new).with('test:123').and_return(s3)
       Sufia.queue.should_receive(:push).with(s3).once
 
-      xhr :post, :create, :files=>[file], :Filename=>"The world", :batch_id => "sample:batch_id", :permission=>{"group"=>{"public"=>"read"} }, :terms_of_service=>"1"
+      xhr :post, :create, :files=>[file], :Filename=>"The world", :batch_id => "sample:batch_id", :permission=>{"group"=>{"public"=>"read"} }, :terms_of_service => '1'
     end
 
     it "should create and save a file asset from the given params" do
       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"
+      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
       GenericFile.count.should == @file_count + 1
 
@@ -188,7 +186,7 @@ describe GenericFilesController do
 
   describe "destroy" do
     before(:each) do
-      @generic_file = GenericFile.new(:terms_of_service => '1')
+      @generic_file = GenericFile.new
       @generic_file.apply_depositor_metadata(@user.user_key)
       @generic_file.save
       @user = FactoryGirl.find_or_create(:user)
@@ -213,7 +211,7 @@ describe GenericFilesController do
   describe "update" do
     before do
       #controller.should_receive(:virus_check).and_return(0)      
-      @generic_file = GenericFile.new(:terms_of_service=>'1')
+      @generic_file = GenericFile.new
       @generic_file.apply_depositor_metadata(@user.user_key)
       @generic_file.save
     end
@@ -227,7 +225,7 @@ describe GenericFilesController do
       Sufia.queue.should_receive(:push).with(s1).once
       @user = FactoryGirl.find_or_create(:user)
       sign_in @user
-      post :update, :id=>@generic_file.pid, :generic_file=>{:terms_of_service=>"1", :title=>'new_title', :tag=>[''], :permissions=>{:new_user_name=>{'archivist1'=>'edit'}}}
+      post :update, :id=>@generic_file.pid, :generic_file=>{:title=>'new_title', :tag=>[''], :permissions=>{:new_user_name=>{'archivist1'=>'edit'}}}
       @user.delete      
     end
 
@@ -242,7 +240,7 @@ describe GenericFilesController do
       sign_in @user
 
       file = fixture_file_upload('/world.png','image/png')
-      post :update, :id=>@generic_file.pid, :filedata=>file, :Filename=>"The world", :generic_file=>{:terms_of_service=>"1", :tag=>[''],  :permissions=>{:new_user_name=>{'archivist1'=>'edit'}}}
+      post :update, :id=>@generic_file.pid, :filedata=>file, :Filename=>"The world", :generic_file=>{:tag=>[''],  :permissions=>{:new_user_name=>{'archivist1'=>'edit'}}}
       @user.delete
     end
 
@@ -251,7 +249,7 @@ describe GenericFilesController do
       sign_in @user
 
       file = fixture_file_upload('/world.png','image/png')
-      post :update, :id=>@generic_file.pid, :filedata=>file, :Filename=>"The world", :generic_file=>{:terms_of_service=>"1", :tag=>[''],  :permissions=>{:new_user_name=>{'archivist1@example.com'=>'edit'}}}
+      post :update, :id=>@generic_file.pid, :filedata=>file, :Filename=>"The world", :generic_file=>{:tag=>[''],  :permissions=>{:new_user_name=>{'archivist1@example.com'=>'edit'}}}
 
       posted_file = GenericFile.find(@generic_file.pid)
       version1 = posted_file.content.latest_version
@@ -272,7 +270,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=>{:terms_of_service=>"1", :tag=>[''] }
+      post :update, :id=>@generic_file.pid, :filedata=>file, :Filename=>"The world", :generic_file=>{:tag=>[''] }
 
       edited_file = GenericFile.find(@generic_file.pid)
       version2 = edited_file.content.latest_version
@@ -290,7 +288,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=>{:terms_of_service=>"1", :tag=>['']}
+      post :update, :id=>@generic_file.pid, :revision=>'content.0', :generic_file=>{:tag=>['']}
 
       restored_file = GenericFile.find(@generic_file.pid)
       version3 = restored_file.content.latest_version
@@ -301,7 +299,7 @@ describe GenericFilesController do
     end
 
     it "should add a new groups and users" do
-      post :update, :id=>@generic_file.pid, :generic_file=>{:terms_of_service=>"1", :tag=>[''], :permissions=>{:new_group_name=>{'group1'=>'read'}, :new_user_name=>{'user1'=>'edit'}}}
+      post :update, :id=>@generic_file.pid, :generic_file=>{:tag=>[''], :permissions=>{:new_group_name=>{'group1'=>'read'}, :new_user_name=>{'user1'=>'edit'}}}
 
       assigns[:generic_file].read_groups.should == ["group1"]
       assigns[:generic_file].edit_users.should include("user1", @user.user_key)
@@ -309,7 +307,7 @@ describe GenericFilesController do
     it "should update existing groups and users" do
       @generic_file.read_groups = ['group3']
       @generic_file.save
-      post :update, :id=>@generic_file.pid, :generic_file=>{:terms_of_service=>"1", :tag=>[''], :permissions=>{:new_group_name=>'', :new_group_permission=>'', :new_user_name=>'', :new_user_permission=>'', :group=>{'group3' =>'read'}}}
+      post :update, :id=>@generic_file.pid, :generic_file=>{:tag=>[''], :permissions=>{:new_group_name=>'', :new_group_permission=>'', :new_user_name=>'', :new_user_permission=>'', :group=>{'group3' =>'read'}}}
 
       assigns[:generic_file].read_groups.should == ["group3"]
     end
@@ -327,14 +325,14 @@ describe GenericFilesController do
       @user = FactoryGirl.find_or_create(:user)
       sign_in @user
       file = fixture_file_upload('/world.png','image/png')
-      post :update, :id=>@generic_file.pid, :filedata=>file, :Filename=>"The world", :generic_file=>{:terms_of_service=>"1", :tag=>[''],  :permissions=>{:new_user_name=>{'archivist1'=>'edit'}}}
+      post :update, :id=>@generic_file.pid, :filedata=>file, :Filename=>"The world", :generic_file=>{:tag=>[''],  :permissions=>{:new_user_name=>{'archivist1'=>'edit'}}}
     end
 
   end
 
   describe "someone elses files" do
     before do
-      f = GenericFile.new(:pid => 'sufia:test5', :terms_of_service=> '1')
+      f = GenericFile.new(:pid => 'sufia:test5')
       f.apply_depositor_metadata('archivist1@example.com')
       f.set_title_and_label('world.png')
       f.add_file_datastream(File.new(fixture_path +  '/world.png'))

data/spec/controllers/single_use_link_controller_spec.rb

@@ -4,7 +4,6 @@ describe SingleUseLinkController do
   before(:all) do
     User.any_instance.stub(:groups).and_return([])
 
-    GenericFile.any_instance.stub(:terms_of_service).and_return('1')
     @user = FactoryGirl.find_or_create(:user)
     @file = GenericFile.new
     @file.set_title_and_label('world.png')

data/spec/models/batch_update_job_spec.rb

@@ -17,7 +17,6 @@ require 'spec_helper'
 
 describe BatchUpdateJob do
   before do
-    GenericFile.any_instance.stub(:terms_of_service).and_return('1')
     @user = FactoryGirl.find_or_create(:user)
     @batch = Batch.new
     @batch.save
@@ -37,7 +36,7 @@ describe BatchUpdateJob do
     it "should check permissions for each file before updating" do
       BatchUpdateJob.any_instance.stub(:get_permissions_solr_response_for_doc_id).and_return(["","mock solr permissions"])       
       User.any_instance.should_receive(:can?).with(:edit, "mock solr permissions").exactly(2).times
-       params = {'generic_file' => {'terms_of_service' => '1', 'read_groups_string' => '', 'read_users_string' => 'archivist1, archivist2', 'tag' => ['']}, 'id' => @batch.pid, 'controller' => 'batch', 'action' => 'update'}.with_indifferent_access
+       params = {'generic_file' => {'read_groups_string' => '', 'read_users_string' => 'archivist1, archivist2', 'tag' => ['']}, 'id' => @batch.pid, 'controller' => 'batch', 'action' => 'update'}.with_indifferent_access
       BatchUpdateJob.new(@user.user_key, params).run
       @user.mailbox.inbox[0].messages[0].subject.should == "Batch upload permission denied"
       @user.mailbox.inbox[0].messages[0].move_to_trash @user
@@ -54,7 +53,7 @@ describe BatchUpdateJob do
       s2 = stub('two')
       ContentUpdateEventJob.should_receive(:new).with(@file2.pid, @user.user_key).and_return(s2)
       Sufia.queue.should_receive(:push).with(s2).once
-      params = {'generic_file' => {'terms_of_service' => '1', 'read_groups_string' => '', 'read_users_string' => 'archivist1, archivist2', 'tag' => ['']}, 'id' => @batch.pid, 'controller' => 'batch', 'action' => 'update'}.with_indifferent_access
+      params = {'generic_file' => {'read_groups_string' => '', 'read_users_string' => 'archivist1, archivist2', 'tag' => ['']}, 'id' => @batch.pid, 'controller' => 'batch', 'action' => 'update'}.with_indifferent_access
       BatchUpdateJob.new(@user.user_key, params).run
       @user.mailbox.inbox[0].messages[0].subject.should == "Batch upload complete"
       @user.mailbox.inbox[0].messages[0].move_to_trash @user

data/spec/models/checksum_audit_log_spec.rb

@@ -16,7 +16,7 @@ require 'spec_helper'
 
 describe ChecksumAuditLog do
   before(:all) do
-    @f = GenericFile.new(:terms_of_service => '1')
+    @f = GenericFile.new
     @f.add_file_datastream(File.new(fixture_path + '/world.png'), :dsid=>'content')
     @f.apply_depositor_metadata('mjg36')
     @f.save!
@@ -29,7 +29,6 @@ describe ChecksumAuditLog do
     ChecksumAuditLog.all.each(&:delete)
   end
   before(:each) do
-    GenericFile.any_instance.stub(:terms_of_service).and_return('1')
     GenericFile.any_instance.stub(:characterize).and_return(true) # stub out characterization so it does not get audited
   end
   it "should return a list of logs for this datastream sorted by date descending" do

data/spec/models/file_content_datastream_spec.rb

@@ -16,17 +16,14 @@ require 'spec_helper'
 
 describe FileContentDatastream do
   before do
-    GenericFile.any_instance.stub(:terms_of_service).and_return('1')
     @subject = FileContentDatastream.new(nil, 'content')
     @subject.stub(:pid=>'my_pid')
     @subject.stub(:dsVersionID=>'content.7')
   end
   describe "version control" do
     before(:all) do
-      GenericFile.any_instance.stub(:terms_of_service).and_return('1')
       f = GenericFile.new
       f.add_file_datastream(File.new(fixture_path + '/world.png'), :dsid=>'content')
-      f.should_receive(:characterize_if_changed).and_yield
       f.apply_depositor_metadata('mjg36')
       f.save
       @file = GenericFile.find(f.pid)
@@ -52,7 +49,6 @@ describe FileContentDatastream do
     describe "add a version" do
       before(:all) do
         @file.add_file_datastream(File.new(fixture_path + '/world.png'), :dsid=>'content')
-        @file.should_receive(:characterize_if_changed).and_yield
         @file.save
       end
       it "should return two versions" do
@@ -68,8 +64,7 @@ describe FileContentDatastream do
   end
   describe "extract_metadata" do
     it "should have the path" do
-      @subject.fits_path.should_not be_nil
-      @subject.fits_path.should_not == ''
+      @subject.send(:fits_path).should be_present
     end
     it "should return an xml document" do
       repo = mock("repo")

data/spec/models/generic_file_spec.rb

@@ -16,7 +16,6 @@ require 'spec_helper'
 
 describe GenericFile do
   before(:each) do
-    GenericFile.any_instance.stub(:terms_of_service).and_return('1')
     @file = GenericFile.new
     @file.apply_depositor_metadata('jcoyne')
   end
@@ -250,7 +249,7 @@ describe GenericFile do
   describe "audit" do
     before(:each) do
       u = FactoryGirl.create(:user)
-      f = GenericFile.new(:terms_of_service=>'1')
+      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)
@@ -301,7 +300,7 @@ describe GenericFile do
 
   describe "run_audit" do
     before do
-      @f = GenericFile.new(:terms_of_service => '1')
+      @f = GenericFile.new
       @f.add_file_datastream(File.new(fixture_path + '/world.png'), :dsid=>'content')
       @f.apply_depositor_metadata('mjg36')
       @f.save!
@@ -419,7 +418,6 @@ describe GenericFile do
   end
   describe "noid integration" do
     before(:all) do
-      GenericFile.any_instance.stub(:terms_of_service).and_return('1')
       GenericFile.any_instance.should_receive(:characterize_if_changed).and_yield
       @new_file = GenericFile.new(:pid => 'ns:123')
       @new_file.apply_depositor_metadata('mjg36')
@@ -458,7 +456,6 @@ describe GenericFile do
     end
     describe "after job runs" do
       before(:all) do
-        GenericFile.any_instance.stub(:terms_of_service).and_return('1')
         myfile = GenericFile.new
         myfile.add_file_datastream(File.new(fixture_path + '/sufia/sufia_test4.pdf'), :dsid=>'content')
         myfile.label = 'label123'
@@ -542,7 +539,6 @@ describe GenericFile do
   describe "permissions validation" do
     context "depositor must have edit access" do
       before(:each) do
-        GenericFile.any_instance.stub(:terms_of_service).and_return('1')
         @file = GenericFile.new
         @file.apply_depositor_metadata('mjg36')
         @rightsmd = @file.rightsMetadata
@@ -642,7 +638,6 @@ describe GenericFile do
     end
     context "public must not have edit access" do
       before(:each) do
-        GenericFile.any_instance.stub(:terms_of_service).and_return('1')
         @file = GenericFile.new
         @file.apply_depositor_metadata('mjg36')
         @file.read_groups = ['public']
@@ -743,7 +738,6 @@ describe GenericFile do
     end
     context "registered must not have edit access" do
       before(:each) do
-        GenericFile.any_instance.stub(:terms_of_service).and_return('1')
         @file = GenericFile.new
         @file.apply_depositor_metadata('mjg36')
         @file.read_groups = ['registered']
@@ -844,7 +838,6 @@ describe GenericFile do
     end
     context "everything is copacetic" do
       before(:each) do
-        GenericFile.any_instance.stub(:terms_of_service).and_return('1')
         @file = GenericFile.new
         @file.apply_depositor_metadata('mjg36')
         @file.read_groups = ['public']