sufia 4.0.1 → 4.1.0

data/spec/features/display_dashboard_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe "The Dashboard" do
+describe "The Dashboard", :type => :feature do
 
   before do
     sign_in :user_with_fixtures
@@ -9,28 +9,28 @@ describe "The Dashboard" do
   context "upon sign-in" do
 
     it "should show the user's information" do
-      page.should have_content "My Dashboard"
-      page.should have_content "User Activity"
-      page.should have_content "User Notifications"
-      page.should have_content "Your Statistics"
+      expect(page).to have_content "My Dashboard"
+      expect(page).to have_content "User Activity"
+      expect(page).to have_content "User Notifications"
+      expect(page).to have_content "Your Statistics"
     end
 
     it "should let the user upload files" do
       click_link "Upload"
-      page.should have_content "Upload"
+      expect(page).to have_content "Upload"
     end
 
     it "should let the user create collections" do
       click_link "Create Collection"
-      page.should have_content "Create New Collection"
+      expect(page).to have_content "Create New Collection"
     end
 
     it "should let the user view files" do
       click_link "View Files"
-      page.should have_content "My Files"
-      page.should have_content "My Collections"
-      page.should have_content "My Highlights"
-      page.should have_content "Files Shared with Me"
+      expect(page).to have_content "My Files"
+      expect(page).to have_content "My Collections"
+      expect(page).to have_content "My Highlights"
+      expect(page).to have_content "Files Shared with Me"
     end
 
   end

data/spec/features/ingest_upload_files_spec.rb

@@ -1,24 +1,24 @@
 require 'spec_helper'
 
-describe "Uploading files via web form" do
-
+describe "Uploading files via web form", :type => :feature do
   before do
     sign_in :user
+    click_link "Upload"
   end
 
   it "should have an ingest screen" do
-    click_link "upload"
-    page.should have_content "Select files"
-    page.should have_content "Start upload"
-    page.should have_content "Cancel upload"
-    page.should have_xpath '//input[@type="file"]'
+    expect(page).to have_content "Select files"
+    expect(page).to have_content "Start upload"
+    expect(page).to have_content "Cancel upload"
+    expect(page).to have_xpath '//input[@type="file"]'
   end
 
   it "should require checking the terms of service" do
-    click_link "upload"
     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!"
+    expect(page).to have_css("button#main_upload_start[disabled]")
+    find('#main_upload_start_span').hover do
+      expect(page).to have_content "Please accept Deposit Agreement before you can upload."
+    end
   end
 end

data/spec/features/notifications_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe "Notifications page" do
+describe "Notifications page", :type => :feature do
 
   before do
     sign_in FactoryGirl.create(:user_with_mail)
@@ -8,16 +8,16 @@ describe "Notifications page" do
   end
 
   it "should list notifications with date, subject and message" do
-    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 "These files could not be updated. You do not have sufficient privileges to edit them. "
-    page.should have_content "These files have been saved"
-    page.should have_content "File 1 could not be updated. You do not have sufficient privileges to edit it."
-    page.should have_content "File 1 has been saved"
-    page.should have_content "Batch upload permission denied  "
-    page.should have_content "Batch upload complete"
+    expect(page).to have_content "User Notifications"
+    expect(page.find(:xpath, '//thead/tr')).to have_content "Date"
+    expect(page.find(:xpath, '//thead/tr')).to have_content "Subject"
+    expect(page.find(:xpath, '//thead/tr')).to have_content "Message"
+    expect(page).to have_content "These files could not be updated. You do not have sufficient privileges to edit them. "
+    expect(page).to have_content "These files have been saved"
+    expect(page).to have_content "File 1 could not be updated. You do not have sufficient privileges to edit it."
+    expect(page).to have_content "File 1 has been saved"
+    expect(page).to have_content "Batch upload permission denied  "
+    expect(page).to have_content "Batch upload complete"
   end
 
 

data/spec/features/ownership_transfer_spec.rb

@@ -0,0 +1,111 @@
+require 'spec_helper'
+
+include Selectors::Header
+include Selectors::Dashboard
+include Selectors::NewTransfers
+include Selectors::Transfers
+
+describe 'Transferring file ownership:', :type => :feature do
+  let(:original_owner) { FactoryGirl.create(:archivist, display_name: 'Original Owner') }
+  let(:new_owner) { FactoryGirl.create(:jill, display_name: 'New Owner') }
+  let!(:file) do
+    GenericFile.new.tap do |f|
+      f.title = ['little_file.txt']
+      f.creator = ['little_file.txt_creator']
+      f.resource_type = ["stuff" ]
+      f.read_groups = ['public']
+      f.apply_depositor_metadata(original_owner.user_key)
+      f.save!
+    end
+  end
+
+  before do
+    sign_in original_owner
+    go_to_dashboard_files
+  end
+
+  after do
+    ActiveFedora::Base.destroy_all
+  end
+
+  describe 'When I request a file transfer:' do
+    context 'For a file I do not own' do
+      pending 'The transfer option is not available' do
+        fail
+      end
+    end
+
+    context 'To myself' do
+      before { transfer_ownership_of_file file, original_owner }
+      it 'Displays an appropriate error message' do
+        expect(page).to have_content 'Sending user must specify another user to receive the file'
+      end
+    end
+
+    context 'To someone else' do
+      before { transfer_ownership_of_file file, new_owner }
+      it 'Creates a transfer request' do
+        expect(page).to have_content 'Transfer request created'
+      end
+      context 'If the new owner accepts it' do
+        before do
+          new_owner.proxy_deposit_requests.last.transfer!
+          user_utility_toggle.click
+          click_link 'transfer requests'
+        end
+        specify 'I should see it was accepted' do
+          expect(page.find('#outgoing-transfers')).to have_content 'Accepted'
+        end
+      end
+      context 'If I cancel it' do
+        before do
+          user_utility_toggle.click
+          click_link 'transfer requests'
+          first_sent_cancel_button.click
+        end
+        specify 'I should see it was cancelled' do
+          expect(page).to have_content 'Transfer canceled'
+        end
+      end
+    end
+  end
+
+  describe 'When someone requests a file transfer to me' do
+    before do
+      # As the original_owner, transfer a file to the new_owner
+      transfer_ownership_of_file file, new_owner
+      # Become the new_owner so we can manage transfers sent to us
+      sign_in new_owner
+      visit '/dashboard'
+      user_utility_toggle.click
+      within '#user_utility_links' do
+        click_link 'transfer requests'
+      end
+      expect(page).to have_content 'Transfer of Ownership'
+    end
+    specify 'I should receive a notification' do
+      user_notifications_link.click
+      expect(page).to have_content "#{original_owner.name} wants to transfer a file to you"
+    end
+    specify 'I should be able to accept it' do
+      first_received_accept_dropdown.click
+      click_link 'Allow depositor to retain edit access'
+      expect(page).to have_content 'Transfer complete'
+    end
+    specify 'I should be able to reject it' do
+      first_received_reject_button.click
+      expect(page).to have_content 'Transfer rejected'
+    end
+  end
+
+  def transfer_ownership_of_file(file, new_owner)
+    db_item_actions_toggle(file).click
+    click_link 'Transfer Ownership of File'
+    expect(page).to have_content "Select a user to transfer #{file.title.first} to, add optional comments and then press transfer."
+    new_owner_dropdown.click
+    new_owner_search_field.set new_owner.user_key
+    new_owner_search_result.click
+    fill_in 'proxy_deposit_request[sender_comment]', with: 'File transfer comments'
+    submit_button.click
+  end
+end

data/spec/features/proxy_spec.rb

@@ -0,0 +1,52 @@
+require 'spec_helper'
+
+describe 'proxy', :type => :feature do
+  let(:user) { FactoryGirl.find_or_create(:archivist) }
+  let(:second_user) { FactoryGirl.find_or_create(:jill) }
+
+  describe 'add proxy in profile' do
+    it "creates a proxy" do
+      sign_in user
+      visit "/"
+      go_to_user_profile
+      click_link "Edit Your Profile"
+      expect(first("td.depositor-name")).to be_nil
+      create_proxy_using_partial(second_user)
+      expect(page).to have_css('td.depositor-name', text: second_user.user_key)
+    end
+  end
+
+  describe 'use a proxy' do
+    before do
+      ProxyDepositRights.create!(grantor: second_user, grantee: user)
+    end
+
+    # TODO: Finish this spec
+    xit "allows on-behalf-of deposit" do
+      sign_in user
+      visit '/'
+      first('a.dropdown-toggle').click
+      click_link('upload')
+      within('#fileupload') do
+        expect(page).to have_content('I have read')
+        check("terms_of_service")
+      end
+      select(second_user.user_key, from: 'on_behalf_of')
+      test_file_path = File.expand_path('../../fixtures/small_file.txt', __FILE__)
+      page.execute_script(%Q{$("input[type=file]").first().css("opacity", "1").css("-moz-transform", "none");$("input[type=file]").first().attr('id',"fileselect");})
+      attach_file("fileselect", test_file_path)
+      redirect_url = find("#redirect-loc", visible: false).text
+      click_button('Start upload')
+      expect(page).to have_content('Apply Metadata')
+      fill_in('generic_file_title', with: 'MY Title for the World')
+      fill_in('generic_file_tag', with: 'test')
+      fill_in('generic_file_creator', with: 'me')
+      click_button('upload_submit')
+      click_link('Files Shared with Me')
+      expect(page).to have_content "MY Title for the World"
+      first('i.glyphicon-chevron-right').click
+      # TODO: need to remove all files prior to this test. Fedora it stil retaining leftovers
+      first('.expanded-details').click_link(second_user.email)
+    end
+  end
+end

data/spec/features/search_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe 'searching' do
+describe 'searching', :type => :feature do
   before { GenericFile.destroy_all }
   let!(:file) { FactoryGirl.create(:public_file, title: "Toothbrush") }
 

data/spec/features/single_use_links_spec.rb

@@ -1,37 +1,47 @@
 require 'spec_helper'
 
-describe "Create and use single-use links" do
+describe "Create and use single-use links", :type => :feature do
   include Warden::Test::Helpers
   Warden.test_mode!
   include Sufia::Engine.routes.url_helpers
 
+  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')
+      f.apply_depositor_metadata(user)
+      f.save
+    end
+  end
+
   before do
-    user = FactoryGirl.find_or_create(:jill)
-    
-    login_as(user)
-    
-    @file = GenericFile.new
-    @file.add_file(File.open(fixture_path + '/world.png'), 'content', 'world.png')
-    @file.apply_depositor_metadata(user)
-    @file.save
+    login_as user
   end
 
-  it "should generate a single-use link to show the record" do
-    visit generate_show_single_use_link_path(id: @file)
-    
+  it "generates a single-use link to show the record" do
+    visit generate_show_single_use_link_path(id: file)
     expect(page).to have_css '.single-use-link a'
     find('.single-use-link a').click
     expect(page).to have_content 'world.png'
     expect(page).to have_content "Download (can only be used once)"
   end
 
-  it "should download the file contents" do
+  describe "download link" do
+    before do
+      @old_driver = Capybara.current_driver
+      Capybara.current_driver = :rack_test
+    end
 
-    visit generate_download_single_use_link_path(id: @file)
+    after do
+      Capybara.current_driver = @old_driver
+    end
 
-    expect(page).to have_css '.download-link'
-    find('.download-link').click
-    expected_content = ActiveFedora::Base.find(@file.pid, cast: true).content.content
-    expect(page.body).to eq expected_content
+    it "downloads the file contents" do
+      visit generate_download_single_use_link_path(id: file)
+      expect(page).to have_css '.download-link'
+      find('.download-link').click
+      expected_content = ActiveFedora::Base.find(file.pid, cast: true).content.content
+      expect(page.source).to eq expected_content
+    end
   end
 end

data/spec/features/users_spec.rb

@@ -1,7 +1,6 @@
 require 'spec_helper'
 
-
-describe "User Profile" do
+describe "User Profile", :type => :feature do
 
   before do
     sign_in FactoryGirl.create(:curator)
@@ -30,7 +29,8 @@ describe "User Profile" do
       fill_in 'user_twitter_handle', with: 'curatorOfData'
       click_button 'Save Profile'
       expect(page).to have_content 'Your profile has been updated'
-      expect(page).to have_content 'curatorOfData'
+      click_link 'Profile'
+      expect(page).to have_content 'http://twitter.com/curatorOfData'
     end
   end
 

data/spec/helpers/batch_edits_helper_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe BatchEditsHelper do
+describe BatchEditsHelper, :type => :helper do
 
   describe "#render_check_all" do
 

data/spec/helpers/content_block_helper_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe ContentBlockHelper do
+describe ContentBlockHelper, :type => :helper do
   let(:content_block) { FactoryGirl.create(:content_block, value: "<p>foo bar</p>") }
 
   subject { helper.editable_content_block(content_block) }

data/spec/helpers/dashboard_helper_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe DashboardHelper do
+describe DashboardHelper, :type => :helper do
   
   describe "#render_recent_activity" do
     context "when there is no activity" do

data/spec/helpers/generic_file_helper_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe GenericFileHelper do
+describe GenericFileHelper, :type => :helper do
 
   describe "#render_collection_list" do
 

data/spec/helpers/records_helper_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe RecordsHelper do
+describe RecordsHelper, :type => :helper do
   let(:adder) {
     "<button class=\"adder btn\" id=\"additional_test_submit\" name=\"additional_test\"><span aria-hidden=\"true\"><i class=\"glyphicon glyphicon-plus\"></i></span><span class=\"sr-only\">add another test</span></button>"
   }

data/spec/helpers/sufia_helper_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe SufiaHelper do
+describe SufiaHelper, :type => :helper do
 
   describe "#link_to_facet_list" do
     before do
@@ -31,12 +31,12 @@ describe SufiaHelper do
     subject { helper }
     context "when cq is set" do
       before { allow(helper).to receive(:params).and_return({ cq: 'foo'}) }
-      it { should have_collection_search_parameters }
+      it { is_expected.to have_collection_search_parameters }
     end
 
     context "when cq is not set" do
       before { allow(helper).to receive(:params).and_return({ cq: ''}) }
-      it { should_not have_collection_search_parameters }
+      it { is_expected.not_to have_collection_search_parameters }
     end
   end
 
@@ -45,23 +45,23 @@ describe SufiaHelper do
       let(:document) { SolrDocument.new( mime_type_tesim: 'image/jpeg', noid_tsi: '1234') }
       it "should show the audio thumbnail" do
         rendered = helper.sufia_thumbnail_tag(document, { width: 90 })
-        rendered.should match /src="\/downloads\/1234\?datastream_id=thumbnail"/
-        rendered.should match /width="90"/
+        expect(rendered).to match /src="\/downloads\/1234\?datastream_id=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') }
       it "should show the audio thumbnail" do
         rendered = helper.sufia_thumbnail_tag(document, {})
-        rendered.should match /src="\/assets\/audio.png"/
+        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') }
       it "should show the default thumbnail" do
         rendered = helper.sufia_thumbnail_tag(document, { width: 90 })
-        rendered.should match /src="\/downloads\/1234\?datastream_id=thumbnail"/
-        rendered.should match /width="90"/
+        expect(rendered).to match /src="\/downloads\/1234\?datastream_id=thumbnail"/
+        expect(rendered).to match /width="90"/
       end
     end
   end