sufia 3.5.0 → 3.6.0

data/lib/sufia/version.rb

@@ -1,3 +1,3 @@
 module Sufia
-  VERSION = "3.5.0"
+  VERSION = "3.6.0"
 end

data/spec/controllers/batch_edits_controller_spec.rb

@@ -50,8 +50,14 @@ describe BatchEditsController do
     it "should be successful" do
       put :update , update_type:"delete_all"
       response.should be_redirect
-      expect {GenericFIle.find(@one.id)}.to raise_error
-      expect {GenericFIle.find(@two.id)}.to raise_error
+      expect {GenericFile.find(@one.id)}.to raise_error(ActiveFedora::ObjectNotFoundError)
+      expect {GenericFile.find(@two.id)}.to raise_error(ActiveFedora::ObjectNotFoundError)
+    end
+    it "should update the records" do
+      put :update , update_type:"update", "generic_file"=>{"subject"=>["zzz"]}
+      response.should be_redirect
+      GenericFile.find(@one.id).subject.should == ["zzz"]
+      GenericFile.find(@two.id).subject.should == ["zzz"]
     end
   end
 

data/spec/controllers/generic_files_controller_spec.rb

@@ -27,8 +27,6 @@ describe GenericFilesController do
       JSON.parse(response.body).first['error'].should match(/no file for upload/i)
     end
 
-
-
     it "should spawn a content deposit event job" do
       file = fixture_file_upload('/world.png','image/png')
       s1 = double('one')
@@ -50,23 +48,6 @@ describe GenericFilesController do
       flash[:error].should include('A virus was found')
     end
 
-    it "should expand zip files" do
-      file = fixture_file_upload('/icons.zip','application/zip')
-      s1 = double('one')
-      ContentDepositEventJob.should_receive(:new).with('test:123', 'jilluser@example.com').and_return(s1)
-      Sufia.queue.should_receive(:push).with(s1).once
-
-      s2 = double('one')
-      CharacterizeJob.should_receive(:new).with('test:123').and_return(s2)
-      Sufia.queue.should_receive(:push).with(s2).once
-
-      s3 = double('one')
-      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'
-    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)
@@ -127,16 +108,16 @@ describe GenericFilesController do
       saved_file.to_solr.keys.should include('depositor_tesim')
       saved_file.to_solr['depositor_tesim'].should == ['jilluser@example.com']
     end
-    
+
     it "should error out of create and save after on continuos rsolr error" do
-      GenericFile.any_instance.stub(:save).and_raise(RSolr::Error::Http.new({},{}))  
-          
+      GenericFile.any_instance.stub(:save).and_raise(RSolr::Error::Http.new({},{}))
+
       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.body.should include("Error occurred while creating generic file.")
     end
   end
-  
+
   describe "#create with local_file" do
     let (:mock_url) {"http://example.com"}
     before do
@@ -144,7 +125,7 @@ describe GenericFilesController do
       GenericFile.delete_all
       @mock_upload_directory = 'spec/mock_upload_directory'
       # Dir.mkdir @mock_upload_directory unless File.exists? @mock_upload_directory
-      FileUtils.mkdir_p([File.join(@mock_upload_directory, "import/files"),File.join(@mock_upload_directory, "import/metadata")])   
+      FileUtils.mkdir_p([File.join(@mock_upload_directory, "import/files"),File.join(@mock_upload_directory, "import/metadata")])
       FileUtils.copy(File.expand_path('../../fixtures/world.png', __FILE__), @mock_upload_directory)
       FileUtils.copy(File.expand_path('../../fixtures/image.jpg', __FILE__), @mock_upload_directory)
       FileUtils.copy(File.expand_path('../../fixtures/dublin_core_rdf_descMetadata.nt', __FILE__), File.join(@mock_upload_directory, "import/metadata"))
@@ -157,7 +138,7 @@ describe GenericFilesController do
       GenericFile.destroy_all
     end
     context "when User model defines a directory path" do
-      before do 
+      before do
         if $in_travis
           # In order to avoid an invalid derivative creation, just stub out the derivatives.
           GenericFile.any_instance.stub(:create_derivatives)
@@ -271,7 +252,7 @@ describe GenericFilesController do
       @user = FactoryGirl.find_or_create(:user)
       sign_in @user
       post :update, :id=>@generic_file.pid, :generic_file=>{:title=>'new_title', :tag=>[''], :permissions=>{:new_user_name=>{'archivist1'=>'edit'}}}
-      @user.delete      
+      @user.delete
     end
 
     it "should spawn a content new version event job" do
@@ -319,7 +300,6 @@ describe GenericFilesController do
       @user.delete
     end
 
-
     it "should record what user added a new version" do
       @user = FactoryGirl.find_or_create(:user)
       sign_in @user
@@ -407,7 +387,7 @@ describe GenericFilesController do
     it "should go back to edit on an error" do
       GenericFile.any_instance.should_receive(:valid?).and_return(false)
       post :update, :id=>@generic_file.pid, :generic_file=>{:tag=>['']}
-      response.should be_successful 
+      response.should be_successful
       response.should render_template('edit')
       assigns[:generic_file].should == @generic_file
     end

data/spec/controllers/single_use_links_controller_spec.rb

@@ -21,9 +21,8 @@ describe SingleUseLinksController do
     controller.stub(:has_access?).and_return(true)
     controller.stub(:clear_session_user) ## Don't clear out the authenticated session
   end
-  describe "logged in user" do
+  describe "logged in user with edit permission" do
     before do
-      @user = FactoryGirl.find_or_create(:user)
       sign_in @user
       @now = DateTime.now
       DateTime.stub(:now).and_return(@now)
@@ -50,6 +49,31 @@ describe SingleUseLinksController do
     end   
   end
 
+  describe "logged in user without edit permission" do
+    before do
+      @other_user = FactoryGirl.find_or_create(:archivist)
+      @file.read_users << @other_user
+      @file.save
+      sign_in @other_user
+    end
+
+    describe "GET 'download'" do
+      it "and_return http success" do
+        get 'new_download', id:@file.pid
+        response.should_not be_success
+      end
+
+    end
+
+    describe "GET 'show'" do
+      it "and_return http success" do
+        get 'new_show', id:@file.pid
+        response.should_not be_success
+      end
+
+    end
+  end
+
   describe "unkown user" do
     describe "GET 'download'" do
       it "and_return http failure" do

data/spec/factories/generic_files.rb

@@ -0,0 +1,46 @@
+FactoryGirl.define do
+
+  factory :fixture, :class => GenericFile do
+    factory :public_pdf do
+      ignore do
+        pid "sufia:fixture-pdf"
+      end
+      initialize_with { new(pid: pid) }
+      read_groups ["public"]
+      resource_type "Dissertation"
+      subject %w"lorem ipsum dolor sit amet"
+      before(:create) do |gf|
+        gf.apply_depositor_metadata "archivist1@example.com"
+        gf.title = "Fake Document Title"
+        gf.label = "fake_document.pdf"
+      end
+    end
+    factory :public_mp3 do
+      ignore do
+        pid "sufia:fixture-mp3"
+      end
+      initialize_with { new(pid: pid) }
+      subject %w"consectetur adipisicing elit"
+      before(:create) do |gf|
+        gf.apply_depositor_metadata "archivist1@example.com"
+        gf.inner_object.pid = "sufia:fixture-mp3"
+        gf.label = "Test Document MP3.mp3"
+      end
+      read_groups ["public"]
+    end
+    factory :public_wav do
+      ignore do
+        pid "sufia:fixture-wav"
+      end
+      initialize_with { new(pid: pid) }
+      resource_type ["Audio", "Dataset"]
+      read_groups ["public"]
+      subject %w"sed do eiusmod tempor incididunt ut labore"
+      before(:create) do |gf|
+        gf.apply_depositor_metadata "archivist1@example.com"
+        gf.label = "Fake Wav File.wav"
+      end
+    end
+  end
+
+end

data/spec/factories/users.rb

@@ -4,14 +4,18 @@ FactoryGirl.define do
     password 'password'
   end
 
-  factory :archivist, :class => User do |u|
+  factory :archivist, aliases: [:user_with_fixtures], :class => User do |u|
     email 'archivist1@example.com'
     password 'password'
   end
 
-  factory :user_with_fixtures, :class => User do |u|
+  factory :user_with_mail, :class => User do |u|
     email 'archivist2@example.com'
     password 'password'
+    after(:create) do |user|
+      message = '<span class="batchid ui-helper-hidden">fake_batch_noid</span>You\'ve got mail.'
+      User.batchuser().send_message(user, message, "Sample notification.")
+    end
   end
 
   factory :curator, :class => User do |u|

data/spec/features/browse_dashboard_files_spec.rb

@@ -0,0 +1,39 @@
+require 'spec_helper'
+
+describe "Browse Dashboard files" do
+
+  before do
+    find_or_create_file_fixtures
+    sign_in :user_with_fixtures
+  end
+
+  it "should show me some files (from the fixtures)" do
+    click_link "dashboard"
+    page.should have_content "Edit File"
+    page.should have_content "Download File"
+    fill_in "dashboard_search", with: "PDF"
+    click_button "dashboard_submit"
+    page.should have_content "Fake Document Title"
+  end
+
+  it "should allow you to browse facets" do
+    # TODO: fix more facets link!
+    pending "Until more facets link is fixed..."
+    visit '/'
+    click_link "more Subjects"
+    click_link "consectetur"
+    #page.should have_content "1 - 5 of 5"
+    click_link "Test Document MP3.mp3"
+    page.should have_content "Download"
+    page.should_not have_content "Edit"
+  end
+
+  it "should allow me to edit files (from the fixtures)" do
+    click_link "dashboard"
+    fill_in "dashboard_search", with: "Wav"
+    click_button "dashboard_submit"
+    click_link "Edit File"
+    page.should have_content "Edit Fake Wav File.wav"
+  end
+
+end

data/spec/features/browse_files_spec.rb

@@ -0,0 +1,30 @@
+require 'spec_helper'
+
+describe "Browse files" do
+
+  before(:all) do
+    find_or_create_file_fixtures
+  end
+
+  describe "when not logged in" do
+    it "should let us browse some of the fixtures" do
+      visit '/'
+      #click_link "more Keywords"
+      #click_link "test"
+      #page.should have_content "1 - 5 of 5"
+      click_link "Fake Document Title"
+      page.should have_content "Download"
+      page.should_not have_content "Edit"
+    end
+    it "should allow you to browse facets" do
+      # TODO: fix more facets link!
+      pending "Until more facets link is fixed..."
+      visit '/'
+      click_link "more Subjects"
+      click_link "consectetur"
+      click_link "Test Document MP3.mp3"
+      page.should have_content "Download"
+      page.should_not have_content "Edit"
+    end
+  end
+end

data/spec/features/{contact_form.rb → contact_form_spec.rb}

@@ -94,6 +94,6 @@ describe "Sending an email via the contact form" do
     fill_in "contact_form_message", with: "I am contacting you regarding ScholarSphere."
     select "Depositing content", from: "contact_form_category"
     click_button "Send"
-    page.should have_content "Sorry, this message was not delivered"
+    page.should have_content "Sorry, this message was not sent successfully"
   end
 end

data/spec/features/{display_dashboard.rb → display_dashboard_spec.rb}

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe "Display Dashboard files" do
 
   before do
-    sign_in :user
+    sign_in :user_with_fixtures
   end
 
   it "should display the dashboard and have search" do
@@ -21,12 +21,6 @@ describe "Display Dashboard files" do
     page.should have_content "Upload"
   end
 
-  it "should display the dashboard and want to upload files" do
-    click_link 'dashboard'
-    click_link 'Upload File(s)'
-    page.should have_content "Upload"
-  end
-
   it "should display the dashboard and want to search the whole system" do
     fill_in "search-field-header", with: "system search"
     click_button "search-submit-header"

data/spec/features/{ingest_upload_files.rb → ingest_upload_files_spec.rb}

@@ -16,8 +16,8 @@ describe "Uploading files via web form" do
 
   it "should require checking the terms of service" do
     click_link "upload"
-    attach_file("files[]", "spec/fixtures/image.jp2")
-    attach_file("files[]", "spec/fixtures/jp2_fits.xml")
+    attach_file("files[]", File.dirname(__FILE__)+"/../../spec/fixtures/image.jp2")
+    attach_file("files[]", File.dirname(__FILE__)+"/../../spec/fixtures/jp2_fits.xml")
     click_button 'Start upload'
     page.should have_content "You must accept the terms of service!"
   end

data/spec/features/notifications_spec.rb

@@ -0,0 +1,20 @@
+require 'spec_helper'
+
+describe "Notifications page" do
+
+  before do
+    sign_in :user_with_mail
+  end
+
+  it "should list notifications with date, subject and message" do
+    visit "/notifications"
+    page.should have_content "User Notifications"
+    page.find(:xpath, '//thead/tr').should have_content "Date"
+    page.find(:xpath, '//thead/tr').should have_content "Subject"
+    page.find(:xpath, '//thead/tr').should have_content "Message"
+    page.should have_content "Sample notification."
+    page.should have_content "less than a minute ago"
+    page.should have_content "You've got mail."
+  end
+
+end

data/spec/features/users_spec.rb

@@ -25,4 +25,16 @@ describe "User Profile" do
     click_link "View Users"
     page.should have_xpath("//td/a[@href='/users/curator1@example-dot-com']")
   end
+
+  it "should be searchable" do
+    @archivist = FactoryGirl.find_or_create(:archivist)
+    click_link "curator1@example.com"
+    click_link "View Users"
+    page.should have_xpath("//td/a[@href='/users/curator1@example-dot-com']")
+    page.should have_xpath("//td/a[@href='/users/archivist1@example-dot-com']")
+    fill_in 'user_search', with: 'archivist1@example.com'
+    click_button "user_submit"
+    page.should_not have_xpath("//td/a[@href='/users/curator1@example-dot-com']")
+    page.should have_xpath("//td/a[@href='/users/archivist1@example-dot-com']")
+  end
 end

data/spec/helpers/sufia_helper_spec.rb

@@ -10,6 +10,29 @@ describe SufiaHelper do
     end
   end
 
+  describe "number_of_deposits" do
+    let(:conn) { ActiveFedora::SolrService.instance.conn }
+    before do
+      # More than 10 times, because the pagination threshold is 10
+      12.times do |t|
+        conn.add  :id => "199#{t}", Solrizer.solr_name('depositor', :stored_searchable) => user.user_key
+      end
+      conn.commit
+    end
+    after do
+      12.times do |t|
+        conn.delete_by_id "199#{t}"
+      end
+      conn.commit
+    end
+
+    let(:user) { double(user_key: 'justin') }
+
+    it "should return the correct number" do
+      expect(number_of_deposits(user)).to eq 12
+    end
+  end
+
   describe "selected facet" do
     let(:blacklight_config) { Blacklight::Configuration.new }
 

data/spec/lib/sufia/id_service_spec.rb

@@ -11,44 +11,6 @@ describe Sufia::IdService do
     it "should not mint the same id twice in a row" do
       other_id = Sufia::IdService.mint
       other_id.should_not == @id
-    end  
-    it "should create many unique ids" do
-      a = []
-      threads = (1..10).map do
-        Thread.new do
-          100.times do
-            a <<  Sufia::IdService.mint
-          end
-        end
-      end
-      threads.each(&:join)     
-      a.uniq.count.should == a.count
-    end
-    it "should create many unique ids when hit by multiple processes " do
-      rd, wr = IO.pipe
-      2.times do
-        pid = fork do 
-          rd.close
-          threads = (1..10).map do
-            Thread.new do
-              20.times do
-                wr.write Sufia::IdService.mint
-                wr.write " "
-              end
-            end
-          end
-          threads.each(&:join)        
-          wr.close
-        end
-      end
-      wr.close
-      2.times do
-        Process.wait
-      end
-      s = rd.read
-      rd.close
-      a = s.split(" ")
-      a.uniq.count.should == a.count
     end
   end
 end