sufia 4.0.0.beta2 → 4.0.0.beta3

data/spec/controllers/homepage_controller_spec.rb

@@ -0,0 +1,57 @@
+require 'spec_helper'
+
+describe HomepageController do
+  routes { Rails.application.class.routes }
+
+  describe "#index" do
+    before :all do
+      GenericFile.delete_all
+      @gf1 = GenericFile.new(title:'Test Document PDF', filename:'test.pdf', tag:'rocks', read_groups:['public'])
+      @gf1.apply_depositor_metadata('mjg36')
+      @gf1.save
+      @gf2 = GenericFile.new(title:'Test 2 Document', filename:'test2.doc', tag:'clouds', contributor:'Contrib1', read_groups:['public'])
+      @gf2.apply_depositor_metadata('mjg36')
+      @gf2.save
+    end
+
+    after :all do
+      @gf1.delete
+      @gf2.delete
+    end
+
+    let(:user) { FactoryGirl.find_or_create(:jill) }
+    before do
+      sign_in user
+    end
+
+    it "should set featured researcher" do
+      get :index
+      expect(response).to be_success
+      assigns(:featured_researcher).tap do |researcher|
+        expect(researcher).to be_kind_of ContentBlock
+        expect(researcher.name).to eq 'featured_researcher'
+      end
+    end
+
+    it "should set marketing text" do
+      get :index
+      expect(response).to be_success
+      assigns(:marketing_text).tap do |marketing|
+        expect(marketing).to be_kind_of ContentBlock
+        expect(marketing.name).to eq 'marketing_text'
+      end
+    end
+
+    context "with featured works" do
+      before do
+        FeaturedWork.create!(generic_file_id: @gf1.id)
+      end
+
+      it "should set featured works" do
+        get :index
+        expect(response).to be_success
+        expect(assigns(:featured_work_list)).to be_kind_of FeaturedWorkList
+      end
+    end
+  end
+end

data/spec/controllers/mailbox_controller_spec.rb

@@ -21,14 +21,14 @@ describe MailboxController do
       response.should be_success
       assigns[:messages].first.last_message.body.should == 'Test Message'
       assigns[:messages].first.last_message.subject.should == 'Test Subject'
-      @user.mailbox.inbox(:unread => true).count.should == 0
+      @user.mailbox.inbox(unread: true).count.should == 0
     end
   end
   describe "#delete" do
     it "should delete message" do
       rec = @another_user.send_message(@user, 'message 2', 'subject 2')
       expect {
-        delete :destroy, :id=> rec.conversation.id
+        delete :destroy, id: rec.conversation.id
         response.should redirect_to(@routes.url_helpers.notifications_path)
       }.to change {@user.mailbox.inbox.count}.by(-1)
     end
@@ -36,7 +36,7 @@ describe MailboxController do
       @curator = FactoryGirl.find_or_create(:curator)
       rec = @another_user.send_message(@curator, 'message 3', 'subject 3')
       expect {
-        delete :destroy, :id=> rec.conversation.id
+        delete :destroy, id: rec.conversation.id
         response.should redirect_to(@routes.url_helpers.notifications_path)
       }.to_not change { @curator.mailbox.inbox.count}
     end

data/spec/controllers/single_use_links_viewer_controller_spec.rb

@@ -24,11 +24,11 @@ describe SingleUseLinksViewerController do
   
   describe "retrieval links" do
     let :show_link do
-      SingleUseLink.create itemId: @file.pid, path: Sufia::Engine.routes.url_helpers.generic_file_path(:id => @file)
+      SingleUseLink.create itemId: @file.pid, path: Sufia::Engine.routes.url_helpers.generic_file_path(id: @file)
     end
 
     let :download_link do
-      SingleUseLink.create itemId: @file.pid, path: Sufia::Engine.routes.url_helpers.download_path(:id => @file)
+      SingleUseLink.create itemId: @file.pid, path: Sufia::Engine.routes.url_helpers.download_path(id: @file)
     end
 
     let :show_link_hash do
@@ -46,7 +46,7 @@ describe SingleUseLinksViewerController do
       it "and_return http success" do
         controller.stub(:render)
         expected_content = ActiveFedora::Base.find(@file.pid, cast: true).content.content
-        controller.should_receive(:send_file_headers!).with({:filename => 'world.png', :disposition => 'inline', :type => 'image/png' })
+        controller.should_receive(:send_file_headers!).with({filename: 'world.png', disposition: 'inline', type: 'image/png' })
         get :download, id:download_link_hash 
         response.body.should == expected_content
         response.should be_success

data/spec/factories/generic_files.rb

@@ -7,6 +7,10 @@ FactoryGirl.define do
       gf.apply_depositor_metadata evaluator.depositor
     end
 
+    factory :public_file do
+      read_groups ["public"]
+    end
+
     factory :fixture do
       factory :public_pdf do
         ignore do

data/spec/factories/users.rb

@@ -12,7 +12,6 @@ FactoryGirl.define do
     end
 
     factory :user_with_mail do
-      email 'archivist2@example.com'
       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.")

data/spec/features/browse_dashboard_files_spec.rb

@@ -4,11 +4,12 @@ describe "Browse Dashboard files" do
 
   before do
     @fixtures = find_or_create_file_fixtures
-    sign_in :user_with_fixtures
+    sign_in FactoryGirl.create :user_with_fixtures
   end
 
   it "should show me some files (from the fixtures)" do
     click_link "dashboard"
+    click_link "Files"
     page.should have_content "Edit File"
     page.should have_content "Download File"
     fill_in "dashboard_search", with: "PDF"
@@ -17,8 +18,10 @@ describe "Browse Dashboard files" do
   end
 
   it "should allow you to browse facets" do
+    pending "need to fix the 'more' link on facets with more than 5 items"
     # TODO: fix more facets link!
     click_link "dashboard"
+    click_link "Files"
     click_link "more Subjects"
     click_link "consectetur"
     within("#document_#{@fixtures[1].noid}") do
@@ -29,6 +32,7 @@ describe "Browse Dashboard files" do
 
   it "should allow me to edit files (from the fixtures)" do
     click_link "dashboard"
+    click_link "Files"
     fill_in "dashboard_search", with: "Wav"
     click_button "dashboard_submit"
     click_link "Edit File"

data/spec/features/collection_spec.rb

@@ -0,0 +1,232 @@
+require 'spec_helper'
+
+describe 'collection' do
+  def create_collection(title, description)
+    first('#hydra-collection-add').click
+    expect(page).to have_content 'Create New Collection'
+    fill_in('Title', with: title)
+    fill_in('Description', with: description)
+    click_button("Create Collection")
+    expect(page).to have_content 'Items in this Collection'
+    expect(page).to have_content title
+    expect(page).to have_content description
+  end
+
+  let(:title1) {"Test Collection 1"}
+  let(:description1) {"Description for collection 1 we are testing."}
+  let(:title2) {"Test Collection 2"}
+  let(:description2) {"Description for collection 2 we are testing."}
+
+  let(:user) { FactoryGirl.create(:user, email: 'user1@example.com') }
+  let(:user_key) { user.user_key }
+
+  before(:all) do
+    @old_resque_inline_value = Resque.inline
+    Resque.inline = true
+
+    @gfs = []
+    (0..12).each do |x|
+      @gfs[x] =  GenericFile.new.tap do |f|
+        f.title = "title #{x}"
+        f.apply_depositor_metadata('user1@example.com')
+        f.save!
+      end
+    end
+    @gf1 = @gfs[0]
+    @gf2 = @gfs[1]
+  end
+
+  after(:all) do
+    Resque.inline = @old_resque_inline_value
+    Batch.destroy_all
+    GenericFile.destroy_all
+    Collection.destroy_all
+  end
+
+
+  describe 'create collection' do
+    before do
+      sign_in user
+      visit '/dashboard/collections'
+    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
+      # since there is only one collection, it's not necessary to choose a radio button
+      click_button "Update Collection"
+      expect(page).to have_content "Items in this Collection"
+      expect(page).to have_selector "ol.catalog li:nth-child(9)" # at least 9 files in this collection
+    end
+  end
+
+  describe 'delete collection' do
+    before (:each) do
+      @collection = Collection.new title:'collection title'
+      @collection.description = 'collection description'
+      @collection.apply_depositor_metadata(user_key)
+      @collection.save
+      sign_in user
+      visit '/dashboard/collections'
+    end
+
+    it "should delete a collection" do
+      page.should have_content(@collection.title)
+      within('#document_'+@collection.noid) do
+        first('button.dropdown-toggle').click
+        first(".itemtrash").click
+      end
+      page.should_not have_content(@collection.title)
+      page.should have_content("Dashboard")
+    end
+  end
+
+  describe 'show collection' do
+    before do
+      @collection = Collection.new title: 'collection title'
+      @collection.description = 'collection description'
+      @collection.apply_depositor_metadata(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
+      page.should have_content(@collection.title)
+      within('#document_'+@collection.noid) do
+        click_link("collection title")
+      end
+      page.should have_content(@collection.title)
+      page.should have_content(@collection.description)
+      # Should not have Collection Descriptive metadata table
+      page.should have_content("Descriptions")
+      # Should have search results / contents listing
+      page.should have_content(@gf1.title.first)
+      page.should have_content(@gf2.title.first)
+      page.should_not have_css(".pager")
+
+      click_link "Gallery"
+      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
+      page.should have_content(@collection.title)
+      within("#document_#{@collection.noid}") do
+        click_link("collection title")
+      end
+      page.should have_content(@collection.title)
+      page.should have_content(@collection.description)
+      page.should have_content(@gf1.title.first)
+      page.should have_content(@gf2.title.first)
+      fill_in('collection_search', with: @gf1.title.first)
+      click_button('collection_submit')
+      # Should not have Collection Descriptive metadata table
+      page.should_not have_content("Descriptions")
+      page.should have_content(@collection.title)
+      page.should have_content(@collection.description)
+      # Should have search results / contents listing
+      page.should have_content(@gf1.title.first)
+      page.should_not have_content(@gf2.title.first)
+      # Should not have Dashboard content in contents listing
+      page.should_not have_content("Visibility")
+    end
+  end
+
+  describe 'edit collection' do
+    before (:each) do
+      @collection = Collection.new(title: 'collection title')
+      @collection.description = 'collection description'
+      @collection.apply_depositor_metadata(user_key)
+      @collection.members = [@gf1, @gf2]
+      @collection.save
+      sign_in user
+      visit '/dashboard/collections'
+    end
+
+    it "should edit and update collection metadata" do
+      page.should have_content(@collection.title)
+      within("#document_#{@collection.noid}") do
+        find('button.dropdown-toggle').click
+        click_link('Edit Collection')
+      end
+      page.should have_field('collection_title', with: @collection.title)
+      page.should have_field('collection_description', with: @collection.description)
+      new_title = "Altered Title"
+      new_description = "Completely new Description text."
+      creators = ["Dorje Trollo", "Vajrayogini"]
+      fill_in('Title', with: new_title)
+      fill_in('Description', with: new_description)
+      fill_in('Creator', with: creators.first)
+      within('.form-actions') do
+        click_button('Update Collection')
+      end
+      page.should_not have_content(@collection.title)
+      page.should_not have_content(@collection.description)
+      page.should have_content(new_title)
+      page.should have_content(new_description)
+      page.should have_content(creators.first)
+    end
+
+    it "should remove a file from a collection" do
+      page.should have_content(@collection.title)
+      within("#document_#{@collection.noid}") do
+        first('button.dropdown-toggle').click
+        click_link('Edit Collection')
+      end
+      page.should have_field('collection_title', with: @collection.title)
+      page.should have_field('collection_description', with: @collection.description)
+      page.should have_content(@gf1.title.first)
+      page.should have_content(@gf2.title.first)
+      within("#document_#{@gf1.noid}") do
+        first('button.dropdown-toggle').click
+        click_button('Remove from Collection')
+      end
+      page.should have_content(@collection.title)
+      page.should have_content(@collection.description)
+      page.should_not have_content(@gf1.title.first)
+      page.should have_content(@gf2.title.first)
+    end
+
+    it "should remove all files from a collection", js: true do
+      page.should have_content(@collection.title)
+      within('#document_'+@collection.noid) do
+        first('button.dropdown-toggle').click
+        click_link('Edit Collection')
+      end
+      page.should have_field('collection_title', with: @collection.title)
+      page.should have_field('collection_description', with: @collection.description)
+      page.should have_content(@gf1.title.first)
+      page.should have_content(@gf2.title.first)
+      first('input#check_all').click
+      click_button('Remove From Collection')
+      page.should have_content(@collection.title)
+      page.should have_content(@collection.description)
+      page.should_not have_content(@gf1.title.first)
+      page.should_not have_content(@gf2.title.first)
+    end
+  end
+
+  describe 'show pages of a collection' do
+    before (:each) do
+      @collection = Collection.new title:'collection title'
+      @collection.description = 'collection description'
+      @collection.apply_depositor_metadata(user_key)
+      @collection.members = @gfs
+      @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
+      page.should have_content(@collection.title)
+      within('#document_'+@collection.noid) do
+        click_link("collection title")
+      end
+      page.should have_css(".pager")
+    end
+  end
+end

data/spec/features/display_dashboard_spec.rb

@@ -8,6 +8,7 @@ describe "Display Dashboard files" do
 
   it "should display the dashboard and have search" do
     click_link 'dashboard'
+    click_link 'Files'
     fill_in "dashboard_search", with: "dash search"
     click_button "dashboard_submit"
     page.should have_content "Dashboard"

data/spec/features/notifications_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe "Notifications page" do
 
   before do
-    sign_in :user_with_mail
+    sign_in FactoryGirl.create(:user_with_mail)
   end
 
   it "should list notifications with date, subject and message" do

data/spec/features/search_spec.rb

@@ -0,0 +1,22 @@
+require 'spec_helper'
+
+describe 'searching' do
+  before { GenericFile.destroy_all }
+  let!(:file) { FactoryGirl.create(:public_file, title: "Toothbrush") }
+  it "should find the file and have a gallery" do
+    visit '/'
+    fill_in "search-field-header", with: "Toothbrush"
+    click_button "search-submit-header"
+    expect(page).to have_content "1 entry found"
+    within "#search-results" do
+      expect(page).to have_content "Toothbrush"
+    end
+    
+    click_link "Gallery"
+    expect(page).to have_content "You searched for: Toothbrush"
+    within "#documents" do
+      expect(page).to have_content "Toothbrush"
+    end
+  end
+end
+

data/spec/features/single_use_links_spec.rb

@@ -17,7 +17,7 @@ describe "Create and use single-use links" do
   end
 
   it "should generate a single-use link to show the record" do
-    visit generate_show_single_use_link_path(:id => @file)
+    visit generate_show_single_use_link_path(id: @file)
     
     expect(page).to have_css '.single-use-link a'
     find('.single-use-link a').click
@@ -27,7 +27,7 @@ describe "Create and use single-use links" do
 
   it "should download the file contents" do
 
-    visit generate_download_single_use_link_path(:id => @file)
+    visit generate_download_single_use_link_path(id: @file)
 
     expect(page).to have_css '.download-link'
     find('.download-link').click