sufia 6.0.0.beta1 → 6.0.0.rc1

data/spec/features/collection_spec.rb

@@ -18,27 +18,29 @@ describe 'collection', :type => :feature do
   let(:title2) {"Test Collection 2"}
   let(:description2) {"Description for collection 2 we are testing."}
 
-  let(:user) { FactoryGirl.find_or_create(:archivist) }
+  let(:user) { FactoryGirl.create(:user) }
 
-  before do
-    @gfs = []
-    (0..1).each do |x|
-      @gfs[x] =  GenericFile.new(title: ["title #{x}"]).tap do |f|
+  let(:gfs) do
+    (0..1).map do |x|
+      GenericFile.create(title: ["title #{x}"]) do |f|
         f.apply_depositor_metadata(user.user_key)
-        f.save!
       end
     end
-    @gf1 = @gfs[0]
-    @gf2 = @gfs[1]
   end
 
+  let(:gf1) { gfs[0] }
+  let(:gf2) { gfs[1] }
+
   describe 'create collection' do
+    let!(:gf1) { gfs[0] }
+    let!(:gf2) { gfs[1] }
+
     before do
       sign_in user
+      create_collection(title2, description2)
     end
 
     it "should create collection from the dashboard and include files", js: true do
-      create_collection(title2, description2)
       visit '/dashboard/files'
       first('input#check_all').click
       click_button "Add to Collection" # opens the modal
@@ -47,109 +49,111 @@ describe 'collection', :type => :feature do
       expect(page).to have_content "Items in this Collection"
       # There are two rows in the table per document (one for the general info, one for the details)
       # Make sure we have at least 2 documents
-      expect(page).to have_selector "table.table-zebra-striped tr#document_#{@gf1.id}"
-      expect(page).to have_selector "table.table-zebra-striped tr#document_#{@gf2.id}"
+      expect(page).to have_selector "table.table-zebra-striped tr#document_#{gf1.id}"
+      expect(page).to have_selector "table.table-zebra-striped tr#document_#{gf2.id}"
     end
   end
 
   describe 'delete collection' do
+    let!(:collection) do
+      Collection.create( title: 'collection title', description: 'collection description') do |c|
+        c.apply_depositor_metadata(user.user_key)
+      end
+    end
     before do
-      @collection = Collection.new title:'collection title'
-      @collection.description = 'collection description'
-      @collection.apply_depositor_metadata(user.user_key)
-      @collection.save
       sign_in user
       visit '/dashboard/collections'
     end
 
     it "should delete a collection" do
-      expect(page).to have_content(@collection.title)
-      within('#document_'+@collection.noid) do
+      expect(page).to have_content(collection.title)
+      within('#document_'+collection.noid) do
         first('button.dropdown-toggle').click
         first(".itemtrash").click
       end
-      expect(page).not_to have_content(@collection.title)
+      expect(page).not_to have_content(collection.title)
     end
   end
 
   describe 'show collection' do
+    let!(:collection) do
+      Collection.create( title: 'collection title', description: 'collection description',
+                        members: [gf1, gf2]) do |c|
+        c.apply_depositor_metadata(user.user_key)
+      end
+    end
     before do
-      @collection = Collection.new title: 'collection title'
-      @collection.description = 'collection description'
-      @collection.apply_depositor_metadata(user.user_key)
-      @collection.members = [@gf1,@gf2]
-      @collection.save
       sign_in user
       visit '/dashboard/collections'
     end
 
     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
+      expect(page).to have_content(collection.title)
+      within('#document_'+collection.noid) do
         click_link("Display all details of collection title")
       end
-      expect(page).to have_content(@collection.title)
-      expect(page).to have_content(@collection.description)
+      expect(page).to have_content(collection.title)
+      expect(page).to have_content(collection.description)
       # Should not show title and description a second time
-      expect(page).to_not have_css('.metadata-collections', text: @collection.title)
-      expect(page).to_not have_css('.metadata-collections', text: @collection.description)
+      expect(page).to_not have_css('.metadata-collections', text: collection.title)
+      expect(page).to_not have_css('.metadata-collections', text: collection.description)
       # Should not have Collection Descriptive metadata table
       expect(page).to have_content("Descriptions")
       # Should have search results / contents listing
-      expect(page).to have_content(@gf1.title.first)
-      expect(page).to have_content(@gf2.title.first)
+      expect(page).to have_content(gf1.title.first)
+      expect(page).to have_content(gf2.title.first)
       expect(page).to_not have_css(".pager")
 
       click_link "Gallery"
-      expect(page).to have_content(@gf1.title.first)
-      expect(page).to have_content(@gf2.title.first)
+      expect(page).to have_content(gf1.title.first)
+      expect(page).to have_content(gf2.title.first)
     end
 
     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
+      expect(page).to have_content(collection.title)
+      within("#document_#{collection.noid}") do
         click_link("Display all details of collection title")
       end
       # URL: /collections/collection-id
-      expect(page).to have_content(@collection.title)
-      expect(page).to have_content(@collection.description)
-      expect(page).to have_content(@gf1.title.first)
-      expect(page).to have_content(@gf2.title.first)
-      fill_in('collection_search', with: @gf1.title.first)
+      expect(page).to have_content(collection.title)
+      expect(page).to have_content(collection.description)
+      expect(page).to have_content(gf1.title.first)
+      expect(page).to have_content(gf2.title.first)
+      fill_in('collection_search', with: gf1.title.first)
       click_button('collection_submit')
       # Should not have Collection metadata table (only title and description)
       expect(page).to_not have_content("Total Items")
-      expect(page).to have_content(@collection.title)
-      expect(page).to have_content(@collection.description)
+      expect(page).to have_content(collection.title)
+      expect(page).to have_content(collection.description)
       # Should have search results / contents listing
       expect(page).to have_content("Search Results")
-      expect(page).to have_content(@gf1.title.first)
-      expect(page).to_not have_content(@gf2.title.first)
+      expect(page).to have_content(gf1.title.first)
+      expect(page).to_not have_content(gf2.title.first)
     end
   end
 
   describe 'edit collection' do
+    let!(:collection) do
+      Collection.create(title: 'collection title', description: 'collection description',
+                     members: [gf1, gf2]) { |c| c.apply_depositor_metadata(user.user_key) }
+    end
+
     before do
-      @collection = Collection.new(title: 'collection title')
-      @collection.description = 'collection description'
-      @collection.apply_depositor_metadata(user.user_key)
-      @collection.members = [@gf1, @gf2]
-      @collection.save
       sign_in user
       visit '/dashboard/collections'
     end
 
     it "should edit and update collection metadata" do
       # URL: /dashboard/collections
-      expect(page).to have_content(@collection.title)
-      within("#document_#{@collection.noid}") do
+      expect(page).to have_content(collection.title)
+      within("#document_#{collection.noid}") do
         find('button.dropdown-toggle').click
         click_link('Edit Collection')
       end
       # URL: /collections/collection-id/edit
-      expect(page).to have_field('collection_title', with: @collection.title)
-      expect(page).to have_field('collection_description', with: @collection.description)
+      expect(page).to have_field('collection_title', with: collection.title)
+      expect(page).to have_field('collection_description', with: collection.description)
       new_title = "Altered Title"
       new_description = "Completely new Description text."
       creators = ["Dorje Trollo", "Vajrayogini"]
@@ -161,71 +165,72 @@ describe 'collection', :type => :feature do
       end
       # URL: /collections/collection-id
       header = find('header')
-      expect(header).to_not have_content(@collection.title)
-      expect(header).to_not have_content(@collection.description)
+      expect(header).to_not have_content(collection.title)
+      expect(header).to_not have_content(collection.description)
       expect(header).to have_content(new_title)
       expect(header).to have_content(new_description)
       expect(page).to have_content(creators.first)
     end
 
     it "should remove a file from a collection" do
-      expect(page).to have_content(@collection.title)
-      within("#document_#{@collection.noid}") do
+      expect(page).to have_content(collection.title)
+      within("#document_#{collection.noid}") do
         first('button.dropdown-toggle').click
         click_link('Edit Collection')
       end
-      expect(page).to have_field('collection_title', with: @collection.title)
-      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
+      expect(page).to have_field('collection_title', with: collection.title)
+      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
         first('button.dropdown-toggle').click
         click_button('Remove from Collection')
       end
-      expect(page).to have_content(@collection.title)
-      expect(page).to have_content(@collection.description)
-      expect(page).not_to have_content(@gf1.title.first)
-      expect(page).to have_content(@gf2.title.first)
+      expect(page).to have_content(collection.title)
+      expect(page).to have_content(collection.description)
+      expect(page).not_to have_content(gf1.title.first)
+      expect(page).to have_content(gf2.title.first)
     end
 
     it "should remove all files from a collection", js: true do
-      expect(page).to have_content(@collection.title)
-      within('#document_'+@collection.noid) do
+      expect(page).to have_content(collection.title)
+      within('#document_'+collection.noid) do
         first('button.dropdown-toggle').click
         click_link('Edit Collection')
       end
-      expect(page).to have_field('collection_title', with: @collection.title)
-      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)
+      expect(page).to have_field('collection_title', with: collection.title)
+      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)
       first('input#check_all').click
       click_button('Remove From Collection')
-      expect(page).to have_content(@collection.title)
-      expect(page).to have_content(@collection.description)
-      expect(page).not_to have_content(@gf1.title.first)
-      expect(page).not_to have_content(@gf2.title.first)
+      expect(page).to have_content(collection.title)
+      expect(page).to have_content(collection.description)
+      expect(page).not_to have_content(gf1.title.first)
+      expect(page).not_to have_content(gf2.title.first)
     end
   end
 
   describe 'show pages of a collection' do
-    before do
-      (2..12).each do |x|
-        @gfs[x] =  GenericFile.new(title: ["title #{x}"]).tap do |f|
+    let(:gfs) do
+      (0..12).map do |x|
+        GenericFile.create(title: ["title #{x}"]) do |f|
           f.apply_depositor_metadata(user.user_key)
-          f.save!
         end
       end
-      @collection = Collection.new title: 'collection title', description: 'collection description'
-      @collection.apply_depositor_metadata(user.user_key)
-      @collection.members = @gfs
-      @collection.save!
-      sign_in user
-      visit '/dashboard/collections'
+    end
+
+    before { sign_in user }
+
+    let!(:collection) do
+      Collection.create(title: 'collection title', description: 'collection description',
+                     members: gfs) { |c| c.apply_depositor_metadata(user.user_key) }
     end
 
     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
+      visit '/dashboard/collections'
+      expect(page).to have_content(collection.title)
+      within('#document_'+collection.noid) do
         click_link("Display all details of collection title")
       end
       expect(page).to have_css(".pager")

data/spec/features/users_spec.rb

@@ -30,7 +30,7 @@ describe "User Profile", :type => :feature do
       click_button 'Save Profile'
       expect(page).to have_content 'Your profile has been updated'
       click_link 'Profile'
-      expect(page).to have_content 'http://twitter.com/curatorOfData'
+      expect(page).to have_link('curatorOfData', href: 'http://twitter.com/curatorOfData')
     end
   end
 

data/spec/forms/collection_edit_form_spec.rb

@@ -0,0 +1,20 @@
+require 'spec_helper'
+
+describe Sufia::Forms::CollectionEditForm do
+  let(:collection) { Collection.new }
+  let(:form) { described_class.new(collection) }
+
+  describe "#terms" do
+    subject { form.terms}
+    it { is_expected.to eq [:resource_type, :title, :creator, :contributor, :description,
+                            :tag, :rights, :publisher, :date_created, :subject, :language,
+                            :identifier, :based_near, :related_url] }
+  end
+
+  describe "unique?" do
+    context "with :title" do
+      subject { Sufia::Forms::CollectionEditForm.unique?(:title) }
+      it { is_expected.to be true }
+    end
+  end
+end

data/spec/forms/generic_file_edit_form_spec.rb

@@ -0,0 +1,26 @@
+require 'spec_helper'
+
+describe Sufia::Forms::GenericFileEditForm do
+  subject { described_class.new(GenericFile.new) }
+
+  describe "#terms" do
+    it "should return a list" 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
+  end
+
+  it "should initialize multivalued fields" do
+    expect(subject.title).to eq ['']
+  end
+
+  describe ".model_attributes" do
+    let(:params) { ActionController::Parameters.new(title: ['foo'], description: [''])}
+    subject { described_class.model_attributes(params) }
+
+    it "should only change title" do
+      expect(subject['title']).to eq ["foo"]
+      expect(subject['description']).to be_empty
+    end
+  end
+end

data/spec/helpers/generic_file_helper_spec.rb

@@ -1,16 +1,15 @@
 require 'spec_helper'
 
-describe GenericFileHelper, :type => :helper do
+describe GenericFileHelper do
 
   describe "#render_collection_list" do
-
     context "using a file that is part of a collection" do
 
       let(:collection) do
         mock_model(Collection, title: "Foo Collection")
       end
 
-      let(:gf) do 
+      let(:gf) do
         mock_model(GenericFile, { collections: [collection, collection] })
       end
 
@@ -21,21 +20,48 @@ describe GenericFileHelper, :type => :helper do
       it "should display a comma-delimited list of collections" do
         expect(helper.render_collection_list(gf)).to eq("Is part of: " + [link,link].join(", "))
       end
-
     end
 
     context "using a file that is not part of a collection" do
-      
-      let(:gf) do 
+      let(:gf) do
         mock_model(GenericFile, { collections: [] })
       end
 
       it "should render nothing" do
         expect(helper.render_collection_list(gf)).to be_nil
       end
+    end
+  end
+
+  describe "download links" do
+    let(:file) { GenericFile.new(id: "fake-1") }
+    let(:link_text) { helper.render_download_link("Download Fake") }
+    let(:icon_text) { helper.render_download_icon("Download the full-sized Fake") }
+
+    before { assign :generic_file, file }
+
+    describe "#render_download_link" do
+      it "has default text" do
+        expect(helper.render_download_link).to have_selector("#file_download")
+        expect(helper.render_download_link).to have_content("Download")
+      end
 
+      it "includes user-supplied link text" do
+        expect(link_text).to have_selector("#file_download")
+        expect(link_text).to have_content("Download Fake")
+      end
     end
 
-  end
+    describe "#render_download_icon" do
+      it "has default text" do
+        expect(helper.render_download_icon).to have_selector("#file_download")
+        expect(helper.render_download_icon).to match("Download the document")
+      end
 
+      it "includes user-supplied icon text" do
+        expect(icon_text).to have_selector("#file_download")
+        expect(icon_text).to match("Download the full-sized Fake")
+      end
+    end
+  end
 end

data/spec/helpers/permissions_helper_spec.rb

@@ -0,0 +1,21 @@
+require 'spec_helper'
+
+describe Sufia::PermissionsHelper do
+  describe "#visibility_help" do
+    subject { helper.visibility_help }
+
+    it "draws help_icon" do
+      expect(subject).to match /data-content="<p>This setting will determine who can view your file/
+      expect(subject).to have_selector 'a i.help-icon'
+    end
+  end
+
+  describe "#share_with_help" do
+    subject { helper.share_with_help }
+
+    it "draws help_icon" do
+      expect(subject).to match /data-content="<p>You may grant &quot;View\/Download/
+      expect(subject).to have_selector 'a i.help-icon'
+    end
+  end
+end