sufia 2.0.1 → 3.0.0

data/spec/models/checksum_audit_log_spec.rb

@@ -1,18 +1,4 @@
-# Copyright © 2012 The Pennsylvania State University
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-require 'spec_helper'
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
 describe ChecksumAuditLog do
   before(:all) do

data/spec/models/event_jobs_spec.rb

@@ -1,18 +1,4 @@
-# Copyright © 2012 The Pennsylvania State University
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-require 'spec_helper'
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
 describe 'event jobs' do
   before(:each) do

data/spec/models/file_content_datastream_spec.rb

@@ -1,18 +1,4 @@
-# Copyright © 2012 The Pennsylvania State University
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-require 'spec_helper'
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
 describe FileContentDatastream do
   before do
@@ -72,10 +58,10 @@ describe FileContentDatastream do
       @subject.send(:fits_path).should be_present
     end
     it "should return an xml document", :unless => $in_travis do
-      repo = mock("repo")
+      repo = double("repo")
       repo.stub(:config=>{})
       f = File.new(fixture_path + '/world.png')
-      content = mock("file")
+      content = double("file")
       content.stub(:read=>f.read)
       content.stub(:rewind=>f.rewind)
       @subject.should_receive(:content).exactly(5).times.and_return(f)
@@ -84,11 +70,11 @@ describe FileContentDatastream do
       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
-      repo = mock("repo")
+      repo = double("repo")
       repo.stub(:config=>{})
       f = ActionDispatch::Http::UploadedFile.new(:tempfile => File.new(fixture_path + '/world.png'),
                                                  :filename => 'world.png')
-      content = mock("file")
+      content = double("file")
       content.stub(:read=>f.read)
       content.stub(:rewind=>f.rewind)
       @subject.should_receive(:content).exactly(5).times.and_return(f)

data/spec/models/fits_datastream_spec.rb

@@ -1,18 +1,4 @@
-# Copyright © 2012 The Pennsylvania State University
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-require 'spec_helper'
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
 describe FitsDatastream, :unless => $in_travis do
   before(:all) do

data/spec/models/generic_file/web_form_spec.rb

@@ -0,0 +1,34 @@
+require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
+
+describe GenericFile do
+  before do
+    subject.apply_depositor_metadata('jcoyne')
+  end
+
+  describe "terms_for_editing" do
+    it "should return a list" do
+      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
+      subject.terms_for_display.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]
+    end
+  end
+
+  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, 
+        :based_near, :related_url, :permissions]
+    end
+
+    it "should sanitize them" do
+      subject.sanitize_attributes({'part_of' => 'A book', 'something_crazy' => "get's thrown out"}).should ==
+        {'part_of' => 'A book'}
+    end
+  end
+end

data/spec/models/generic_file_spec.rb

@@ -1,18 +1,4 @@
-# Copyright © 2012 The Pennsylvania State University
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-require 'spec_helper'
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
 describe GenericFile do
   before do
@@ -39,20 +25,6 @@ describe GenericFile do
     end
   end
 
-  describe "terms_for_editing" do
-    it "should return a list" do
-      @file.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
-      @file.terms_for_display.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]
-    end
-  end
-
   describe "mime type recognition" do
     describe "image?" do
       it "should be true for jpeg2000" do
@@ -355,7 +327,7 @@ describe GenericFile do
         @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 = double("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)
@@ -398,31 +370,31 @@ describe GenericFile do
       @f = f.reload
     end
     it "should schedule a audit job for each datastream" do
-      s1 = stub('one')
+      s1 = double('one')
       AuditJob.should_receive(:new).with(@f.pid, 'DC', "DC1.0").and_return(s1)
       Sufia.queue.should_receive(:push).with(s1)
-      s2 = stub('two')
+      s2 = double('two')
       AuditJob.should_receive(:new).with(@f.pid, 'RELS-EXT', "RELS-EXT.0").and_return(s2)
       Sufia.queue.should_receive(:push).with(s2)
-      s3 = stub('three')
+      s3 = double('three')
       AuditJob.should_receive(:new).with(@f.pid, 'rightsMetadata', "rightsMetadata.0").and_return(s3)
       Sufia.queue.should_receive(:push).with(s3)
-      s4 = stub('four')
+      s4 = double('four')
       AuditJob.should_receive(:new).with(@f.pid, 'properties', "properties.0").and_return(s4)
       Sufia.queue.should_receive(:push).with(s4)
-      s5 = stub('five')
+      s5 = double('five')
       AuditJob.should_receive(:new).with(@f.pid, 'content', "content.0").and_return(s5)
       Sufia.queue.should_receive(:push).with(s5)
       @f.audit!
     end
     it "should log a failing audit" do
       @f.datastreams.each { |ds| ds.stub(:dsChecksumValid).and_return(false) }
-      GenericFile.stub(:run_audit).and_return(stub(: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(stub(: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
@@ -516,7 +488,7 @@ describe GenericFile do
       @f2.add_relationship("isPartOf", "info:fedora/#{@batch_id}")
       @f1.save
       @f2.save
-      mock_batch = mock("batch")
+      mock_batch = double("batch")
       mock_batch.stub(:generic_files => [@f1, @f2])
       @f1.should_receive(:batch).and_return(mock_batch)
       @f1.related_files.should == [@f2]
@@ -544,7 +516,7 @@ describe GenericFile do
       @f2.add_relationship("isPartOf", "info:fedora/#{@batch_id}")
       @f1.save
       @f2.save
-      mock_batch = mock("batch")
+      mock_batch = double("batch")
       mock_batch.stub(:generic_files).and_raise(NoMethodError)
       @f1.should_receive(:batch).twice
       lambda { @f1.related_files }.should_not raise_error

data/spec/models/local_authority_spec.rb

@@ -1,19 +1,7 @@
-# Copyright © 2012 The Pennsylvania State University
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-require 'spec_helper'
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
+# Don't run the tests if activerecord-import isn't installed.
+# The 0.3.1 version doesn't work with rails 4, so suppress these tests
 describe LocalAuthority do
   before(:all) do
     @tsv = [fixture_path + '/cities15000.tsv']

data/spec/models/properties_datastream_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
 describe PropertiesDatastream do
 

data/spec/models/single_use_link_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
 describe SingleUseLink do
   before (:all) do

data/spec/models/solr_document_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
 describe SolrDocument do
   describe "when mime-type is 'application/mxf'" do

data/spec/models/transcode_audio_job_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
 describe TranscodeAudioJob, :if => Sufia.config.enable_ffmpeg do
   before do

data/spec/models/transcode_video_job_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
 describe TranscodeVideoJob, :if => Sufia.config.enable_ffmpeg do
   before do

data/spec/models/trophy_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
 describe Trophy do
    before(:all) do

data/spec/models/unzip_job_spec.rb

@@ -1,18 +1,4 @@
-# Copyright © 2012 The Pennsylvania State University
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-require 'spec_helper'
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
 describe UnzipJob do
   before do

data/spec/models/user_spec.rb

@@ -1,18 +1,4 @@
-# Copyright © 2012 The Pennsylvania State University
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-require 'spec_helper'
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
 describe User do
   before(:all) do

data/spec/rake/sufia_fixtures_spec.rb

@@ -1,20 +1,6 @@
-# Copyright © 2012 The Pennsylvania State University
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
 # Used to test the sufia-fixtures rake task
-#
-require "spec_helper"
 require "rake"
 
 describe "sufia:fixtures" do
@@ -56,8 +42,8 @@ describe "sufia:fixtures" do
   before(:each) do
     @rake = Rake::Application.new 
     Rake.application = @rake
-    Rake.application.rake_require("tasks/sufia-fixtures", ["."], loaded_files_excluding_current_rake_file)
-    Rake.application.rake_require("lib/tasks/fixtures", ["."], loaded_files_excluding_current_rake_file)
+    Rake.application.rake_require("sufia-fixtures", ["#{Sufia::Engine.root}/tasks/"], loaded_files_excluding_current_rake_file)
+    Rake.application.rake_require("fixtures", ["#{Sufia::Engine.root}/lib/tasks/"], loaded_files_excluding_current_rake_file)
     Rake.application.rake_require("lib/tasks/active_fedora", [activefedora_path], loaded_files_excluding_current_rake_file)      
     Rake::Task.define_task(:environment)
   end

data/spec/routing/route_spec.rb

@@ -1,18 +1,4 @@
-# Copyright © 2012 The Pennsylvania State University
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-require 'spec_helper'
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
 describe 'Routes' do
   before(:each) do
@@ -116,26 +102,26 @@ describe 'Routes' do
 
   describe 'Users' do
     it 'should route to user trophies' do
-      { post: '/users/bob135/trophy' }.should route_to(controller: 'users', action: 'toggle_trophy', uid: 'bob135')
+      { post: '/users/bob135/trophy' }.should route_to(controller: 'users', action: 'toggle_trophy', id: 'bob135')
     end
     it 'should route to user profile' do
-      { get: '/users/bob135' }.should route_to(controller: 'users', action: 'show', uid: 'bob135')
+      { get: '/users/bob135' }.should route_to(controller: 'users', action: 'show', id: 'bob135')
     end
 
     it "should route to edit profile" do
-      { get: '/users/bob135/edit' }.should route_to(controller: 'users', action: 'edit', uid: 'bob135')
+      { get: '/users/bob135/edit' }.should route_to(controller: 'users', action: 'edit', id: 'bob135')
     end
 
     it "should route to update profile" do
-      { put: '/users/bob135/update' }.should route_to(controller: 'users', action: 'update', uid: 'bob135')
+      { put: '/users/bob135' }.should route_to(controller: 'users', action: 'update', id: 'bob135')
     end
 
     it "should route to user follow" do
-      { post: '/users/bob135/follow' }.should route_to(controller: 'users', action: 'follow', uid: 'bob135')
+      { post: '/users/bob135/follow' }.should route_to(controller: 'users', action: 'follow', id: 'bob135')
     end
 
     it "should route to user unfollow" do
-      { post: '/users/bob135/unfollow' }.should route_to(controller: 'users', action: 'unfollow', uid: 'bob135')
+      { post: '/users/bob135/unfollow' }.should route_to(controller: 'users', action: 'unfollow', id: 'bob135')
     end
   end