sufia 3.7.2 → 4.0.0.beta1

data/spec/models/audit_job_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe AuditJob do
   before do
-    @user = FactoryGirl.find_or_create(:user)
+    @user = FactoryGirl.find_or_create(:jill)
     @inbox = @user.mailbox.inbox
     GenericFile.any_instance.should_receive(:characterize_if_changed).and_yield
     GenericFile.any_instance.stub(:terms_of_service).and_return('1')

data/spec/models/batch_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe Batch do
   before(:all) do
-    @user = FactoryGirl.find_or_create(:user)
+    @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

data/spec/models/batch_update_job_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe BatchUpdateJob do
   before do
-    @user = FactoryGirl.find_or_create(:user)
+    @user = FactoryGirl.find_or_create(:jill)
     @batch = Batch.new
     @batch.save
     @file = GenericFile.new(:batch=>@batch)

data/spec/models/event_jobs_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe 'event jobs' do
   before(:each) do
-    @user = FactoryGirl.find_or_create(:user)
+    @user = FactoryGirl.find_or_create(:jill)
     @another_user = FactoryGirl.find_or_create(:archivist)
     @third_user = FactoryGirl.find_or_create(:curator)
     GenericFile.any_instance.stub(:terms_of_service).and_return('1')

data/spec/models/featured_work_list_spec.rb

@@ -0,0 +1,23 @@
+require 'spec_helper'
+
+describe FeaturedWorkList do
+  let(:file1) { FactoryGirl.create(:generic_file) }
+  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
+
+  after { GenericFile.destroy_all }
+
+  describe 'featured_works' do
+    it 'should be a list of the featured work objects, each with the generic_file\'s solr_doc' do
+      expect(subject.featured_works.size).to eq 2
+      solr_doc = subject.featured_works.first.generic_file_solr_document
+      expect(solr_doc).to be_kind_of SolrDocument
+      expect(solr_doc.noid).to eq file1.noid 
+    end 
+  end
+end

data/spec/models/featured_work_spec.rb

@@ -0,0 +1,42 @@
+require 'spec_helper'
+
+describe FeaturedWork do
+  let(:feature) { FeaturedWork.create(generic_file_id:"99") }
+
+  it "should have a file" do
+    expect(feature.generic_file_id).to eq "99"
+  end
+
+  it "should not allow six features" do
+    5.times do |n|
+      expect(FeaturedWork.create(generic_file_id:n.to_s)).to_not be_new_record 
+    end
+    FeaturedWork.create(generic_file_id:"6").tap do |sixth|
+      expect(sixth).to be_new_record 
+      expect(sixth.errors.full_messages).to eq ["Limited to 5 featured works."]
+    end
+    expect(FeaturedWork.count).to eq 5
+  end
+
+  describe "can_create_another?" do
+    subject { FeaturedWork }
+    context "when none exist" do
+      its(:can_create_another?) { should be_true }
+    end
+    context "when five exist" do
+      before do
+        5.times do |n|
+          FeaturedWork.create(generic_file_id:n.to_s)
+        end
+      end
+      its(:can_create_another?) { should be_false }
+    end
+  end
+
+  describe "#order" do
+    subject { FeaturedWork.new(order: 5) }
+    its(:order) {should eq 5 }
+  end
+end
+
+

data/spec/models/fits_datastream_spec.rb

@@ -72,8 +72,8 @@ describe FitsDatastream, :unless => $in_travis do
       @file.duration.should == ["4.97 s"]
     end
     it "should have a frame_rate" do
-      @file.frame_rate.should == ["30"]
+      @file.frame_rate.count.should == 1
+      @file.frame_rate[0].to_f.should == 30.0
     end
   end
 end
-

data/spec/models/generic_file/reload_on_save_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe Sufia::GenericFile::ReloadOnSave do
-  let(:user) { FactoryGirl.find_or_create(:user) }
+  let(:user) { FactoryGirl.find_or_create(:jill) }
   let(:file) { GenericFile.new.tap { |f| f.apply_depositor_metadata(user); f.save! } }
 
   it 'defaults to not call reload' do

data/spec/models/generic_file/web_form_spec.rb

@@ -7,13 +7,13 @@ describe GenericFile do
 
   describe "terms_for_editing" do
     it "should return a list" do
-      subject.terms_for_editing.should == [:resource_type, :title, :creator, :contributor, :description, :tag, 
+      subject.terms_for_editing.should == [:resource_type, :title, :creator, :contributor, :description, :tag,
                     :rights, :publisher, :date_created, :subject, :language, :identifier, :based_near, :related_url]
     end
   end
   describe "terms_for_display" do
     it "should return a list" do
-      expect(subject.terms_for_display).to eq([:resource_type, :title, 
+      expect(subject.terms_for_display).to eq([:resource_type, :title,
         :creator, :contributor, :description, :tag, :rights, :publisher,
         :date_created, :date_uploaded, :date_modified, :subject, :language,
         :identifier, :based_near, :related_url])
@@ -22,8 +22,8 @@ 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, 
-        :tag, :rights, :publisher, :date_created, :date_uploaded, :date_modified, :subject, :language, :identifier, 
+      subject.accessible_attributes.should == [: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]
     end
 

data/spec/models/generic_file_spec.rb

@@ -291,7 +291,7 @@ describe GenericFile do
     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__related_url")].should == ["http://example.org/TheWork/"]
     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"]
@@ -304,7 +304,7 @@ describe GenericFile do
     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[Solrizer.solr_name("mime_type")].should == ["image/jpeg"]
     local["noid_tsi"].should eq('stubbed_pid')
   end
   it "should support multi-valued fields in solr" do
@@ -340,7 +340,7 @@ describe GenericFile do
   end
   describe "trophies" do
     before do
-      u = FactoryGirl.create(:user)
+      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
@@ -357,9 +357,10 @@ describe GenericFile do
       Trophy.where(generic_file_id: @f.pid).count.should == 0
     end
   end
+
   describe "audit" do
-    before(:each) do
-      u = FactoryGirl.create(:user)
+    before do
+      u = FactoryGirl.create(:jill)
       f = GenericFile.new
       f.add_file(File.open(fixture_path + '/world.png'), 'content', 'world.png')
       f.apply_depositor_metadata(u)
@@ -584,19 +585,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", 'jcoyne' => 'edit'}
+      subject.rightsMetadata.users.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", 'jcoyne' => 'edit'}
+      subject.rightsMetadata.users.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", 'jcoyne' => 'edit'}
+      subject.rightsMetadata.users.should == {"person1"=>"read","person2"=>"read", 'jcoyne' => 'edit'}
     end
   end
   describe "permissions validation" do
@@ -637,7 +638,7 @@ describe GenericFile do
       it "should work via permissions=()" do
         @file.permissions = {:user => {'mjg36' => 'read'}}
         lambda { @file.save }.should_not raise_error
-        @file.new_object?.should be_true
+        @file.new_record?.should be_true
         @file.errors.should include(:edit_users)
         @file.errors[:edit_users].should include('Depositor must have edit access')
         @file.valid?.should be_false
@@ -645,7 +646,7 @@ describe GenericFile do
       it "should work via update_attributes" do
         # automatically triggers save
         lambda { @file.update_attributes(:read_users_string => 'mjg36') }.should_not raise_error
-        @file.new_object?.should be_true
+        @file.new_record?.should be_true
         @file.errors.should include(:edit_users)
         @file.errors[:edit_users].should include('Depositor must have edit access')
         @file.valid?.should be_false
@@ -653,7 +654,7 @@ describe GenericFile do
       it "should work via update_indexed_attributes" do
         @rightsmd.update_indexed_attributes([:edit_access, :person] => '')
         lambda { @file.save }.should_not raise_error
-        @file.new_object?.should be_true
+        @file.new_record?.should be_true
         @file.errors.should include(:edit_users)
         @file.errors[:edit_users].should include('Depositor must have edit access')
         @file.valid?.should be_false
@@ -661,7 +662,7 @@ describe GenericFile do
       it "should work via permissions()" do
         @rightsmd.permissions({:person => "mjg36"}, "read")
         lambda { @file.save }.should_not raise_error
-        @file.new_object?.should be_true
+        @file.new_record?.should be_true
         @file.errors.should include(:edit_users)
         @file.errors[:edit_users].should include('Depositor must have edit access')
         @file.valid?.should be_false
@@ -669,7 +670,7 @@ describe GenericFile do
       it "should work via update_permissions()" do
         @rightsmd.update_permissions({"person" => {"mjg36" => "read"}})
         lambda { @file.save }.should_not raise_error
-        @file.new_object?.should be_true
+        @file.new_record?.should be_true
         @file.errors.should include(:edit_users)
         @file.errors[:edit_users].should include('Depositor must have edit access')
         @file.valid?.should be_false
@@ -677,7 +678,7 @@ describe GenericFile do
       it "should work via content=()" do
         @rightsmd.content=(@rights_xml)
         lambda { @file.save }.should_not raise_error
-        @file.new_object?.should be_true
+        @file.new_record?.should be_true
         @file.errors.should include(:edit_users)
         @file.errors[:edit_users].should include('Depositor must have edit access')
         @file.valid?.should be_false
@@ -685,7 +686,7 @@ describe GenericFile do
       it "should work via ng_xml=()" do
         @rightsmd.ng_xml=(Nokogiri::XML::Document.parse(@rights_xml))
         lambda { @file.save }.should_not raise_error
-        @file.new_object?.should be_true
+        @file.new_record?.should be_true
         @file.errors.should include(:edit_users)
         @file.errors[:edit_users].should include('Depositor must have edit access')
         @file.valid?.should be_false
@@ -693,7 +694,7 @@ describe GenericFile do
       it "should work via update_values()" do
         @rightsmd.update_values([:edit_access, :person] => '')
         lambda { @file.save }.should_not raise_error
-        @file.new_object?.should be_true
+        @file.new_record?.should be_true
         @file.errors.should include(:edit_users)
         @file.errors[:edit_users].should include('Depositor must have edit access')
         @file.valid?.should be_false
@@ -737,7 +738,7 @@ describe GenericFile do
       it "should work via permissions=()" do
         @file.permissions = {:group => {'public' => 'edit'}}
         lambda { @file.save }.should_not raise_error
-        @file.new_object?.should be_true
+        @file.new_record?.should be_true
         @file.errors.should include(:edit_groups)
         @file.errors[:edit_groups].should include('Public cannot have edit access')
         @file.valid?.should be_false
@@ -745,7 +746,7 @@ describe GenericFile do
       it "should work via update_attributes" do
         # automatically triggers save
         lambda { @file.update_attributes(:edit_groups_string => 'public') }.should_not raise_error
-        @file.new_object?.should be_true
+        @file.new_record?.should be_true
         @file.errors.should include(:edit_groups)
         @file.errors[:edit_groups].should include('Public cannot have edit access')
         @file.valid?.should be_false
@@ -753,7 +754,7 @@ describe GenericFile do
       it "should work via update_indexed_attributes" do
         @rightsmd.update_indexed_attributes([:edit_access, :group] => 'public')
         lambda { @file.save }.should_not raise_error
-        @file.new_object?.should be_true
+        @file.new_record?.should be_true
         @file.errors.should include(:edit_groups)
         @file.errors[:edit_groups].should include('Public cannot have edit access')
         @file.valid?.should be_false
@@ -761,7 +762,7 @@ describe GenericFile do
       it "should work via permissions()" do
         @rightsmd.permissions({:group => "public"}, "edit")
         lambda { @file.save }.should_not raise_error
-        @file.new_object?.should be_true
+        @file.new_record?.should be_true
         @file.errors.should include(:edit_groups)
         @file.errors[:edit_groups].should include('Public cannot have edit access')
         @file.valid?.should be_false
@@ -769,7 +770,7 @@ describe GenericFile do
       it "should work via update_permissions()" do
         @rightsmd.update_permissions({"group" => {"public" => "edit"}})
         lambda { @file.save }.should_not raise_error
-        @file.new_object?.should be_true
+        @file.new_record?.should be_true
         @file.errors.should include(:edit_groups)
         @file.errors[:edit_groups].should include('Public cannot have edit access')
         @file.valid?.should be_false
@@ -777,7 +778,7 @@ describe GenericFile do
       it "should work via content=()" do
         @rightsmd.content=(@rights_xml)
         lambda { @file.save }.should_not raise_error
-        @file.new_object?.should be_true
+        @file.new_record?.should be_true
         @file.errors.should include(:edit_groups)
         @file.errors[:edit_groups].should include('Public cannot have edit access')
         @file.valid?.should be_false
@@ -785,7 +786,7 @@ describe GenericFile do
       it "should work via ng_xml=()" do
         @rightsmd.ng_xml=(Nokogiri::XML::Document.parse(@rights_xml))
         lambda { @file.save }.should_not raise_error
-        @file.new_object?.should be_true
+        @file.new_record?.should be_true
         @file.errors.should include(:edit_groups)
         @file.errors[:edit_groups].should include('Public cannot have edit access')
         @file.valid?.should be_false
@@ -793,7 +794,7 @@ describe GenericFile do
       it "should work via update_values()" do
         @rightsmd.update_values([:edit_access, :group] => 'public')
         lambda { @file.save }.should_not raise_error
-        @file.new_object?.should be_true
+        @file.new_record?.should be_true
         @file.errors.should include(:edit_groups)
         @file.errors[:edit_groups].should include('Public cannot have edit access')
         @file.valid?.should be_false
@@ -837,7 +838,7 @@ describe GenericFile do
       it "should work via permissions=()" do
         @file.permissions = {:group => {'registered' => 'edit'}}
         lambda { @file.save }.should_not raise_error
-        @file.new_object?.should be_true
+        @file.new_record?.should be_true
         @file.errors.should include(:edit_groups)
         @file.errors[:edit_groups].should include('Registered cannot have edit access')
         @file.valid?.should be_false
@@ -845,7 +846,7 @@ describe GenericFile do
       it "should work via update_attributes" do
         # automatically triggers save
         lambda { @file.update_attributes(:edit_groups_string => 'registered') }.should_not raise_error
-        @file.new_object?.should be_true
+        @file.new_record?.should be_true
         @file.errors.should include(:edit_groups)
         @file.errors[:edit_groups].should include('Registered cannot have edit access')
         @file.valid?.should be_false
@@ -853,7 +854,7 @@ describe GenericFile do
       it "should work via update_indexed_attributes" do
         @rightsmd.update_indexed_attributes([:edit_access, :group] => 'registered')
         lambda { @file.save }.should_not raise_error
-        @file.new_object?.should be_true
+        @file.new_record?.should be_true
         @file.errors.should include(:edit_groups)
         @file.errors[:edit_groups].should include('Registered cannot have edit access')
         @file.valid?.should be_false
@@ -861,7 +862,7 @@ describe GenericFile do
       it "should work via permissions()" do
         @rightsmd.permissions({:group => "registered"}, "edit")
         lambda { @file.save }.should_not raise_error
-        @file.new_object?.should be_true
+        @file.new_record?.should be_true
         @file.errors.should include(:edit_groups)
         @file.errors[:edit_groups].should include('Registered cannot have edit access')
         @file.valid?.should be_false
@@ -869,7 +870,7 @@ describe GenericFile do
       it "should work via update_permissions()" do
         @rightsmd.update_permissions({"group" => {"registered" => "edit"}})
         lambda { @file.save }.should_not raise_error
-        @file.new_object?.should be_true
+        @file.new_record?.should be_true
         @file.errors.should include(:edit_groups)
         @file.errors[:edit_groups].should include('Registered cannot have edit access')
         @file.valid?.should be_false
@@ -877,7 +878,7 @@ describe GenericFile do
       it "should work via content=()" do
         @rightsmd.content=(@rights_xml)
         lambda { @file.save }.should_not raise_error
-        @file.new_object?.should be_true
+        @file.new_record?.should be_true
         @file.errors.should include(:edit_groups)
         @file.errors[:edit_groups].should include('Registered cannot have edit access')
         @file.valid?.should be_false
@@ -885,7 +886,7 @@ describe GenericFile do
       it "should work via ng_xml=()" do
         @rightsmd.ng_xml=(Nokogiri::XML::Document.parse(@rights_xml))
         lambda { @file.save }.should_not raise_error
-        @file.new_object?.should be_true
+        @file.new_record?.should be_true
         @file.errors.should include(:edit_groups)
         @file.errors[:edit_groups].should include('Registered cannot have edit access')
         @file.valid?.should be_false
@@ -893,7 +894,7 @@ describe GenericFile do
       it "should work via update_values()" do
         @rightsmd.update_values([:edit_access, :group] => 'registered')
         lambda { @file.save }.should_not raise_error
-        @file.new_object?.should be_true
+        @file.new_record?.should be_true
         @file.errors.should include(:edit_groups)
         @file.errors[:edit_groups].should include('Registered cannot have edit access')
         @file.valid?.should be_false
@@ -939,56 +940,56 @@ describe GenericFile do
       it "should work via permissions=()" do
         @file.permissions = {:group => {'registered' => 'read'}}
         lambda { @file.save }.should_not raise_error
-        @file.new_object?.should be_false
+        @file.new_record?.should be_false
         @file.errors.should be_empty
         @file.valid?.should be_true
       end
       it "should work via update_attributes" do
         # automatically triggers save
         lambda { @file.update_attributes(:read_groups_string => 'registered') }.should_not raise_error
-        @file.new_object?.should be_false
+        @file.new_record?.should be_false
         @file.errors.should be_empty
         @file.valid?.should be_true
       end
       it "should work via update_indexed_attributes" do
         @rightsmd.update_indexed_attributes([:read_access, :group] => 'registered')
         lambda { @file.save }.should_not raise_error
-        @file.new_object?.should be_false
+        @file.new_record?.should be_false
         @file.errors.should be_empty
         @file.valid?.should be_true
       end
       it "should work via permissions()" do
         @rightsmd.permissions({:group => "registered"}, "read")
         lambda { @file.save }.should_not raise_error
-        @file.new_object?.should be_false
+        @file.new_record?.should be_false
         @file.errors.should be_empty
         @file.valid?.should be_true
       end
       it "should work via update_permissions()" do
         @rightsmd.update_permissions({"group" => {"registered" => "read"}})
         lambda { @file.save }.should_not raise_error
-        @file.new_object?.should be_false
+        @file.new_record?.should be_false
         @file.errors.should be_empty
         @file.valid?.should be_true
       end
       it "should work via content=()" do
         @rightsmd.content=(@rights_xml)
         lambda { @file.save }.should_not raise_error
-        @file.new_object?.should be_false
+        @file.new_record?.should be_false
         @file.errors.should be_empty
         @file.valid?.should be_true
       end
       it "should work via ng_xml=()" do
         @rightsmd.ng_xml=(Nokogiri::XML::Document.parse(@rights_xml))
         lambda { @file.save }.should_not raise_error
-        @file.new_object?.should be_false
+        @file.new_record?.should be_false
         @file.errors.should be_empty
         @file.valid?.should be_true
       end
       it "should work via update_values()" do
         @rightsmd.update_values([:read_access, :group] => 'registered')
         lambda { @file.save }.should_not raise_error
-        @file.new_object?.should be_false
+        @file.new_record?.should be_false
         @file.errors.should be_empty
         @file.valid?.should be_true
       end