sufia 6.0.0.rc2 → 6.0.0.rc3

data/spec/factories/generic_files.rb

@@ -14,7 +14,7 @@ FactoryGirl.define do
     factory :fixture do
       factory :public_pdf do
         transient do
-          id "fixture-pdf"
+          id "fixturepdf"
         end
         initialize_with { new(id: id) }
         read_groups ["public"]
@@ -22,12 +22,12 @@ FactoryGirl.define do
         subject %w"lorem ipsum dolor sit amet"
         title ["fake_document.pdf"]
         before(:create) do |gf|
-          gf.title = ["Fake Document Title"]
+          gf.title = ["Fake PDF Title"]
         end
       end
       factory :public_mp3 do
         transient do
-          id "fixture-mp3"
+          id "fixturemp3"
         end
         initialize_with { new(id: id) }
         subject %w"consectetur adipisicing elit"
@@ -36,7 +36,7 @@ FactoryGirl.define do
       end
       factory :public_wav do
         transient do
-          id "fixture-wav"
+          id "fixturewav"
         end
         initialize_with { new(id: id) }
         resource_type ["Audio", "Dataset"]

data/spec/factories/users.rb

@@ -14,7 +14,7 @@ FactoryGirl.define do
     factory :user_with_mail do
       after(:create) do |user|
         # TODO: what is this class for?
-        # <span class="batchid ui-helper-hidden">fake_batch_noid</span>
+        # <span class="batchid ui-helper-hidden">fake_batch_id</span>
         message = BatchMessage.new
 
         # Create examples of single file successes and failures
@@ -42,9 +42,8 @@ FactoryGirl.define do
 end
 
 class MockFile
-  attr_accessor :noid, :to_s, :id
+  attr_accessor :to_s, :id
   def initialize id, string
-    self.noid = id
     self.id = id
     self.to_s = string
   end

data/spec/features/browse_dashboard_files_spec.rb

@@ -1,10 +1,10 @@
 require 'spec_helper'
 
-describe "Browse Dashboard", :type => :feature do
-
+describe "Browse Dashboard", type: :feature do
   let(:user) { FactoryGirl.create(:user) }
+  let!(:fixtures) { create_file_fixtures(user.user_key) }
+
   before do
-    @fixtures = create_file_fixtures(user.user_key)
     sign_in user
   end
 
@@ -12,7 +12,7 @@ describe "Browse Dashboard", :type => :feature do
     visit "/dashboard"
     fill_in "q", with: "PDF"
     click_button "search-submit-header"
-    expect(page).to have_content("Fake Document Title")
+    expect(page).to have_content("Fake PDF Title")
   end
 
   context "within my files page" do
@@ -23,7 +23,7 @@ describe "Browse Dashboard", :type => :feature do
 
     it "should display all the necessary information" do
       # TODO this would make a good view test.
-      within("#document_#{@fixtures.first.noid}") do
+      within("#document_#{fixtures.first.id}") do
         click_button("Select an action")
       end
       expect(page).to have_content("Edit File")
@@ -39,7 +39,7 @@ describe "Browse Dashboard", :type => :feature do
     it "should allow you to search your own files and remove constraints" do
       fill_in "q", with: "PDF"
       click_button "search-submit-header"
-      expect(page).to have_content("Fake Document Title")
+      expect(page).to have_content("Fake PDF Title")
       within(".constraints-container") do
         expect(page).to have_content("You searched for:")
         expect(page).to have_css("span.glyphicon-remove")
@@ -52,7 +52,7 @@ describe "Browse Dashboard", :type => :feature do
       click_link "Subject"
       click_link "more Subjects"
       click_link "consectetur"
-      within("#document_#{@fixtures[1].noid}") do
+      within("#document_#{fixtures[1].id}") do
         click_link "Display all details of Test Document MP3.mp3"
       end
       expect(page).to have_content("File Details")
@@ -70,7 +70,7 @@ describe "Browse Dashboard", :type => :feature do
     it "should refresh the page of files" do
       # TODO this would make a good view test.
       click_button "Refresh"
-      within("#document_#{@fixtures.first.noid}") do
+      within("#document_#{fixtures.first.id}") do
         click_button("Select an action")
         expect(page).to have_content("Edit File")
         expect(page).to have_content("Download File")

data/spec/features/collection_spec.rb

@@ -5,6 +5,13 @@ describe 'collection', :type => :feature do
     visit '/dashboard'
     first('#hydra-collection-add').click
     expect(page).to have_content 'Create New Collection'
+
+    # Creator is a multi-value field, so it should have button to add more fields
+    expect(page).to have_selector "div.collection_creator .input-append button.add"
+
+    # Title is a single-value field, so it should not have the adder button
+    expect(page).to_not have_selector "div.collection_title .input-append button.add"
+
     fill_in('Title', with: title)
     fill_in('Abstract or Summary', with: description)
     click_button("Create Collection")
@@ -67,7 +74,7 @@ describe 'collection', :type => :feature do
 
     it "should delete a collection" do
       expect(page).to have_content(collection.title)
-      within('#document_'+collection.noid) do
+      within('#document_'+collection.id) do
         first('button.dropdown-toggle').click
         first(".itemtrash").click
       end
@@ -89,7 +96,7 @@ describe 'collection', :type => :feature do
 
     it "should show a collection with a listing of Descriptive Metadata and catalog-style search results" do
       expect(page).to have_content(collection.title)
-      within('#document_'+collection.noid) do
+      within('#document_'+collection.id) do
         click_link("Display all details of collection title")
       end
       expect(page).to have_content(collection.title)
@@ -112,7 +119,7 @@ describe 'collection', :type => :feature do
     it "should hide collection descriptive metadata when searching a collection" do
       # URL: /dashboard/collections
       expect(page).to have_content(collection.title)
-      within("#document_#{collection.noid}") do
+      within("#document_#{collection.id}") do
         click_link("Display all details of collection title")
       end
       # URL: /collections/collection-id
@@ -147,7 +154,7 @@ describe 'collection', :type => :feature do
     it "should edit and update collection metadata" do
       # URL: /dashboard/collections
       expect(page).to have_content(collection.title)
-      within("#document_#{collection.noid}") do
+      within("#document_#{collection.id}") do
         find('button.dropdown-toggle').click
         click_link('Edit Collection')
       end
@@ -174,7 +181,7 @@ describe 'collection', :type => :feature do
 
     it "should remove a file from a collection" do
       expect(page).to have_content(collection.title)
-      within("#document_#{collection.noid}") do
+      within("#document_#{collection.id}") do
         first('button.dropdown-toggle').click
         click_link('Edit Collection')
       end
@@ -182,7 +189,7 @@ describe 'collection', :type => :feature do
       expect(page).to have_field('collection_description', with: collection.description)
       expect(page).to have_content(gf1.title.first)
       expect(page).to have_content(gf2.title.first)
-      within("#document_#{gf1.noid}") do
+      within("#document_#{gf1.id}") do
         first('button.dropdown-toggle').click
         click_button('Remove from Collection')
       end
@@ -194,7 +201,7 @@ describe 'collection', :type => :feature do
 
     it "should remove all files from a collection", js: true do
       expect(page).to have_content(collection.title)
-      within('#document_'+collection.noid) do
+      within('#document_'+collection.id) do
         first('button.dropdown-toggle').click
         click_link('Edit Collection')
       end
@@ -230,7 +237,7 @@ describe 'collection', :type => :feature do
     it "should show a collection with a listing of Descriptive Metadata and catalog-style search results" do
       visit '/dashboard/collections'
       expect(page).to have_content(collection.title)
-      within('#document_'+collection.noid) do
+      within('#document_'+collection.id) do
         click_link("Display all details of collection title")
       end
       expect(page).to have_css(".pager")

data/spec/features/edit_file_spec.rb

@@ -0,0 +1,26 @@
+require 'spec_helper'
+
+describe "Editing a file:", :type => :feature do
+  let(:user) { FactoryGirl.create(:user) }
+  let(:file_title) { 'Some kind of title' }
+  let(:file) { GenericFile.new.tap do |f|
+                 f.title = [file_title]
+                 f.apply_depositor_metadata(user.user_key)
+                 f.save!
+               end
+  }
+
+  before { sign_in user }
+
+  context 'when the user tries to update file content, but forgets to select a file:' do
+
+    it 'displays an error' do
+      visit sufia.edit_generic_file_path(file)
+      click_link 'Versions'
+      click_button 'Upload New Version'
+      expect(page).to have_content "Edit #{file_title}"
+      expect(page).to have_content 'Please select a file'
+    end
+
+  end
+end

data/spec/features/single_use_links_spec.rb

@@ -7,10 +7,10 @@ describe "Create and use single-use links", :type => :feature do
 
   let(:user) { FactoryGirl.find_or_create(:jill) }
   let(:file) do
-    GenericFile.new.tap do |f|
-      f.add_file(File.open(fixture_path + '/world.png'), 'content', 'world.png')
+    GenericFile.create do |f|
+      f.add_file(File.open(fixture_path + '/world.png'), path: 'content', original_name: 'world.png')
+      f.label = 'world.png'
       f.apply_depositor_metadata(user)
-      f.save
     end
   end
 

data/spec/forms/generic_file_edit_form_spec.rb

@@ -8,6 +8,11 @@ describe Sufia::Forms::GenericFileEditForm do
       expect(subject.terms).to eq([:resource_type, :title, :creator, :contributor, :description, :tag,
                     :rights, :publisher, :date_created, :subject, :language, :identifier, :based_near, :related_url])
     end
+
+    it "doesn't contain fields that users shouldn't be allowed to edit" do
+      # date_uploaded is reserved for the original creation date of the record.
+      expect(subject.terms).not_to include(:date_uploaded)
+    end
   end
 
   it "should initialize multivalued fields" do
@@ -15,12 +20,14 @@ describe Sufia::Forms::GenericFileEditForm do
   end
 
   describe ".model_attributes" do
-    let(:params) { ActionController::Parameters.new(title: ['foo'], description: [''])}
+    let(:params) { ActionController::Parameters.new(title: ['foo'], description: [''], "permissions_attributes"=>{"2"=>{"access"=>"edit", "_destroy"=>"true", "id"=>"a987551e-b87f-427a-8721-3e5942273125"}})}
     subject { described_class.model_attributes(params) }
 
     it "should only change title" do
       expect(subject['title']).to eq ["foo"]
       expect(subject['description']).to be_empty
+      expect(subject['permissions_attributes']).to eq("2" => {"access"=>"edit", "id"=>"a987551e-b87f-427a-8721-3e5942273125", "_destroy"=>"true"})
     end
   end
+
 end

data/spec/helpers/content_block_helper_spec.rb

@@ -11,11 +11,21 @@ describe ContentBlockHelper, :type => :helper do
         expect(helper).to receive(:can?).with(:update, content_block).and_return(true)
       end
       let(:node) { Capybara::Node::Simple.new(subject) }
+
       it "should show the preview and the form" do
         expect(node).to have_selector "button[data-target='#edit_content_block_1'][data-behavior='reveal-editor']"
         expect(node).to have_selector "form#edit_content_block_1[action='#{sufia.content_block_path(content_block)}']"
         expect(subject).to be_html_safe
       end
+
+      context "with option to create new:" do
+        subject { helper.editable_content_block(content_block, true) }
+
+        it "shows the button & form for a new content block" do
+          expect(node).to have_selector "button[data-target='#new_content_block'][data-behavior='reveal-editor']"
+          expect(node).to have_selector "form#new_content_block[action='#{sufia.content_blocks_path}']"
+        end
+      end
     end
   end
 

data/spec/helpers/dashboard_helper_spec.rb

@@ -49,4 +49,46 @@ describe DashboardHelper, :type => :helper do
     end
   end
 
+
+  describe "#number_of_files" do
+    let(:conn) { ActiveFedora::SolrService.instance.conn }
+    let(:user1) { User.new(email: "abc@test") }
+    let(:user2) { User.new(email: "abc@test.123") }
+    before do
+      create_models("GenericFile", user1, user2)
+    end
+
+    it "finds only 3 files" do
+      expect(helper.number_of_files(user1)).to eq(3)
+    end
+
+  end
+
+  describe "#number_of_collections" do
+    let(:conn) { ActiveFedora::SolrService.instance.conn }
+    let(:user1) { User.new(email: "abc@test") }
+    let(:user2) { User.new(email: "abc@test.123") }
+    before do
+      create_models("Collection", user1, user2)
+    end
+
+    it "finds only 3 files" do
+      expect(helper.number_of_collections(user1)).to eq(3)
+    end
+
+  end
+
+  def create_models (model, user1, user2)
+    # deposited by the first user
+    3.times do |t|
+      conn.add  id: "199#{t}", Solrizer.solr_name('depositor', :stored_searchable) => user1.user_key, "has_model_ssim"=>[model],
+          Solrizer.solr_name('depositor', :symbol) => user1.user_key
+    end
+
+    # deposited by the second user, but editable by the first
+    conn.add  id: "1994", Solrizer.solr_name('depositor', :stored_searchable) => user2.user_key, "has_model_ssim"=>[model],
+        Solrizer.solr_name('depositor', :symbol) => user2.user_key, "edit_access_person_ssim" =>user1.user_key
+    conn.commit
+  end
+
 end

data/spec/helpers/sufia_helper_spec.rb

@@ -42,25 +42,25 @@ describe SufiaHelper, :type => :helper do
 
   describe "sufia_thumbnail_tag" do
     context "for an image object" do
-      let(:document) { SolrDocument.new( mime_type_tesim: 'image/jpeg', noid_tsi: '1234') }
+      let(:document) { SolrDocument.new( mime_type_tesim: 'image/jpeg', id: '1234' ) }
       it "should show the audio thumbnail" do
         rendered = helper.sufia_thumbnail_tag(document, { width: 90 })
-        expect(rendered).to match /src="\/downloads\/1234\?datastream_id=thumbnail"/
+        expect(rendered).to match /src="\/downloads\/1234\?file=thumbnail"/
         expect(rendered).to match /width="90"/
       end
     end
     context "for an audio object" do
-      let(:document) { SolrDocument.new( mime_type_tesim: 'audio/x-wave') }
+      let(:document) { SolrDocument.new( mime_type_tesim: 'audio/x-wave', id: '1234') }
       it "should show the audio thumbnail" do
         rendered = helper.sufia_thumbnail_tag(document, {})
         expect(rendered).to match /src="\/assets\/audio.png"/
       end
     end
     context "for an document object" do
-      let(:document) { SolrDocument.new( mime_type_tesim: 'application/vnd.openxmlformats-officedocument.wordprocessingml.document', noid_tsi: '1234') }
+      let(:document) { SolrDocument.new( mime_type_tesim: 'application/vnd.openxmlformats-officedocument.wordprocessingml.document', id: '1234') }
       it "should show the default thumbnail" do
         rendered = helper.sufia_thumbnail_tag(document, { width: 90 })
-        expect(rendered).to match /src="\/downloads\/1234\?datastream_id=thumbnail"/
+        expect(rendered).to match /src="\/downloads\/1234\?file=thumbnail"/
         expect(rendered).to match /width="90"/
       end
     end
@@ -72,7 +72,7 @@ describe SufiaHelper, :type => :helper do
       @user = mock_model(User)
       allow(@user).to receive(:telephone).and_return('867-5309')
     end
-    
+
     context "when @user is set" do
       it "should return a link to the user's telephone" do
         expect(helper.link_to_telephone).to eq("<a href=\"wtai://wp/mc;867-5309\">867-5309</a>")
@@ -84,7 +84,7 @@ describe SufiaHelper, :type => :helper do
         expect(helper.link_to_telephone(@user)).to eq("<a href=\"wtai://wp/mc;867-5309\">867-5309</a>")
       end
     end
-  
+
   end
 
   describe "#current_search_parameters" do
@@ -164,4 +164,31 @@ describe SufiaHelper, :type => :helper do
 
   end
 
+  describe "#number_of_deposits" do
+    let(:conn) { ActiveFedora::SolrService.instance.conn }
+    let(:user1) { User.new(email: "abc@test") }
+    let(:user2) { User.new(email: "abc@test.123") }
+    before do
+      create_models("Collection", user1, user2)
+    end
+
+    it "finds only 3 files" do
+      expect(helper.number_of_deposits(user1)).to eq(3)
+    end
+
+    def create_models (model, user1, user2)
+      # deposited by the first user
+      3.times do |t|
+        conn.add  id: "199#{t}", Solrizer.solr_name('depositor', :stored_searchable) => user1.user_key, "has_model_ssim"=>[model],
+            Solrizer.solr_name('depositor', :symbol) => user1.user_key
+      end
+
+      # deposited by the second user, but editable by the first
+      conn.add  id: "1994", Solrizer.solr_name('depositor', :stored_searchable) => user2.user_key, "has_model_ssim"=>[model],
+          Solrizer.solr_name('depositor', :symbol) => user2.user_key, "edit_access_person_ssim" =>user1.user_key
+      conn.commit
+    end
+
+  end
+
 end

data/spec/helpers/trophy_helper_spec.rb

@@ -3,14 +3,14 @@ require 'spec_helper'
 describe TrophyHelper, :type => :helper do
   describe "#display_trophy_link" do
     let(:user) { FactoryGirl.create(:user) }
-    let(:noid) { '9999' }
+    let(:id) { '9999' }
 
     let(:text_attributes) { '[data-add-text="Highlight File on Profile"][data-remove-text="Unhighlight File"]' }
-    let(:url_attribute) { "[data-url=\"/users/#{user.to_param}/trophy?file_id=9999\"]" }
+    let(:url_attribute) { "[data-url=\"/users/#{user.to_param}/trophy?file_id=#{id}\"]" }
 
     context "when there is no trophy" do
       it "should have a link for highlighting" do
-        out = helper.display_trophy_link(user, noid) { |text| "foo #{text} bar" } 
+        out = helper.display_trophy_link(user, id) { |text| "foo #{text} bar" }
         node = Capybara::Node::Simple.new(out)
         expect(node).to have_selector("a.trophy-class.trophy-off#{text_attributes}#{url_attribute}")
         expect(node).to have_link 'foo Highlight File on Profile bar', href: '#'
@@ -19,18 +19,18 @@ describe TrophyHelper, :type => :helper do
 
     context "when there is a trophy" do
       before do
-        user.trophies.create(generic_file_id: noid)
+        user.trophies.create(generic_file_id: id)
       end
 
       it "should have a link for highlighting" do
-        out = helper.display_trophy_link(user, noid) { |text| "foo #{text} bar" } 
+        out = helper.display_trophy_link(user, id) { |text| "foo #{text} bar" }
         node = Capybara::Node::Simple.new(out)
         expect(node).to have_selector("a.trophy-class.trophy-on#{text_attributes}#{url_attribute}")
         expect(node).to have_link 'foo Unhighlight File bar', href: '#'
       end
 
       it "should allow removerow to be passed" do
-        out = helper.display_trophy_link(user, noid, data: {removerow: true}) { |text| "foo #{text} bar" } 
+        out = helper.display_trophy_link(user, id, data: {removerow: true}) { |text| "foo #{text} bar" }
         node = Capybara::Node::Simple.new(out)
         expect(node).to have_selector("a.trophy-class.trophy-on[data-removerow=\"true\"]#{text_attributes}#{url_attribute}")
       end