sufia 4.0.1 → 4.1.0

data/spec/models/user_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe User do
+describe User, :type => :model do
   before(:all) do
     @user = FactoryGirl.find_or_create(:jill)
     @another_user = FactoryGirl.find_or_create(:archivist)
@@ -10,31 +10,31 @@ describe User do
     @another_user.delete
   end
   it "should have an email" do
-    @user.user_key.should == "jilluser@example.com"
+    expect(@user.user_key).to eq("jilluser@example.com")
   end
   it "should have activity stream-related methods defined" do
-    @user.should respond_to(:stream)
-    @user.should respond_to(:events)
-    @user.should respond_to(:profile_events)
-    @user.should respond_to(:create_event)
-    @user.should respond_to(:log_event)
-    @user.should respond_to(:log_profile_event)
+    expect(@user).to respond_to(:stream)
+    expect(@user).to respond_to(:events)
+    expect(@user).to respond_to(:profile_events)
+    expect(@user).to respond_to(:create_event)
+    expect(@user).to respond_to(:log_event)
+    expect(@user).to respond_to(:log_profile_event)
   end
   it "should have social attributes" do
-    @user.should respond_to(:twitter_handle)
-    @user.should respond_to(:facebook_handle)
-    @user.should respond_to(:googleplus_handle)
-    @user.should respond_to(:linkedin_handle)
+    expect(@user).to respond_to(:twitter_handle)
+    expect(@user).to respond_to(:facebook_handle)
+    expect(@user).to respond_to(:googleplus_handle)
+    expect(@user).to respond_to(:linkedin_handle)
   end
   it "should redefine to_param to make redis keys more recognizable (and useable within Rails URLs)" do
-    @user.to_param.should == "jilluser@example-dot-com"
+    expect(@user.to_param).to eq("jilluser@example-dot-com")
   end
   it "should have a cancan ability defined" do
-    @user.should respond_to(:can?)
+    expect(@user).to respond_to(:can?)
   end
   it "should not have any followers" do
-    @user.followers_count.should == 0
-    @another_user.follow_count.should == 0
+    expect(@user.followers_count).to eq(0)
+    expect(@another_user.follow_count).to eq(0)
   end
   describe "follow/unfollow" do
     before(:all) do
@@ -60,10 +60,10 @@ describe User do
   end
 
   describe "trophy_files" do
-    let(:user) { @user } 
-    let(:file1) { GenericFile.new.tap { |f| f.apply_depositor_metadata(user); f.save! } } 
-    let(:file2) { GenericFile.new.tap { |f| f.apply_depositor_metadata(user); f.save! } } 
-    let(:file3) { GenericFile.new.tap { |f| f.apply_depositor_metadata(user); f.save! } } 
+    let(:user) { @user }
+    let(:file1) { GenericFile.new.tap { |f| f.apply_depositor_metadata(user); f.save! } }
+    let(:file2) { GenericFile.new.tap { |f| f.apply_depositor_metadata(user); f.save! } }
+    let(:file3) { GenericFile.new.tap { |f| f.apply_depositor_metadata(user); f.save! } }
     let!(:trophy1) { user.trophies.create!(generic_file_id: file1.noid) }
     let!(:trophy2) { user.trophies.create!(generic_file_id: file2.noid) }
     let!(:trophy3) { user.trophies.create!(generic_file_id: file3.noid) }
@@ -97,7 +97,23 @@ describe User do
     it "gathers the user's recent activity within a given timestamp" do
       expect(user.get_all_user_activity(now-60)).to eq(file_activities.concat([activities.first]))
     end
-
   end
-
+  describe "proxy_deposit_rights" do
+    before do
+      @subject = FactoryGirl.create :curator
+      @user1 = FactoryGirl.create :jill
+      @user2 = FactoryGirl.create :archivist
+      @subject.can_receive_deposits_from << @user1
+      @subject.can_make_deposits_for << @user2
+      @subject.save!
+    end
+    it "can_receive_deposits_from" do
+      expect(@subject.can_receive_deposits_from.to_a).to eq [@user1]
+      expect(@user1.can_make_deposits_for.to_a).to eq [@subject]
+    end
+    it "can_make_deposits_for" do
+      expect(@subject.can_make_deposits_for.to_a).to eq [@user2]
+      expect(@user2.can_receive_deposits_from.to_a).to eq [@subject]
+    end
+  end
 end

data/spec/routing/featured_works_route_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe "file routes" do
+describe "file routes", :type => :routing do
   routes { Sufia::Engine.routes }
   it 'should create a featured_work' do
     expect(post: '/files/1/featured_work').to route_to(controller: 'featured_works', action: 'create', id: '1')

data/spec/routing/ownership_transfers_route_spec.rb

@@ -0,0 +1,45 @@
+require 'spec_helper'
+
+describe "proxy deposit and transfers routing", :type => :routing do
+  routes { Sufia::Engine.routes }
+
+  it "lists transfers" do
+    expect(transfers_path).to eq '/dashboard/transfers'
+    expect(get: '/dashboard/transfers').to route_to(controller: 'transfers', action: 'index')
+  end
+
+  it "creates a transfer" do
+    expect(generic_file_transfers_path('7')).to eq '/files/7/transfers'
+    expect(post: '/files/7/transfers').to route_to(controller: 'transfers', action: 'create', id: '7')
+  end
+
+  it "shows a form for a new transfer" do
+    expect(new_generic_file_transfer_path('7')).to eq '/files/7/transfers/new'
+    expect(get: '/files/7/transfers/new').to route_to(controller: 'transfers', action: 'new', id: '7')
+  end
+
+  it "cancels a transfer" do
+    expect(transfer_path('7')).to eq '/dashboard/transfers/7'
+    expect(delete: '/dashboard/transfers/7').to route_to(controller: 'transfers', action: 'destroy', id: '7')
+  end
+
+  it "accepts a transfers" do
+    expect(accept_transfer_path('7')).to eq '/dashboard/transfers/7/accept'
+    expect(put: '/dashboard/transfers/7/accept').to route_to(controller: 'transfers', action: 'accept', id: '7')
+  end
+
+  it "rejects a transfer" do
+    expect(reject_transfer_path('7')).to eq '/dashboard/transfers/7/reject'
+    expect(put: '/dashboard/transfers/7/reject').to route_to(controller: 'transfers', action: 'reject', id: '7')
+  end
+
+  it "adds a proxy depositor" do
+    expect(user_depositors_path('xxx666@example-dot-org')).to eq '/users/xxx666@example-dot-org/depositors'
+    expect(post: '/users/xxx666@example-dot-org/depositors').to route_to(controller: 'depositors', action: 'create', user_id: 'xxx666@example-dot-org')
+  end
+
+  it "removes a proxy depositor" do
+    expect(user_depositor_path('xxx666', '33')).to eq '/users/xxx666/depositors/33'
+    expect(delete: '/users/xxx666/depositors/33').to route_to(controller: 'depositors', action: 'destroy', user_id: 'xxx666', id: '33')
+  end
+end

data/spec/routing/route_spec.rb

@@ -1,146 +1,146 @@
 require 'spec_helper'
 
-describe 'Routes' do
+describe 'Routes', :type => :routing do
   routes { Sufia::Engine.routes }
 
   describe 'Homepage' do
     it 'should route the root url to the homepage controller' do
-      { get: '/' }.should route_to(controller: 'homepage', action: 'index')
+      expect({ get: '/' }).to route_to(controller: 'homepage', action: 'index')
     end
   end
 
   describe 'GenericFile' do
     it 'should route to citation' do
-      { get: '/files/1/citation' }.should route_to(controller: 'generic_files', action: 'citation', id: '1')
+      expect({ get: '/files/1/citation' }).to route_to(controller: 'generic_files', action: 'citation', id: '1')
     end
 
     it 'should route to stats' do
-      { get: '/files/1/stats' }.should route_to(controller: 'generic_files', action: 'stats', id: '1')
+      expect({ get: '/files/1/stats' }).to route_to(controller: 'generic_files', action: 'stats', id: '1')
     end
 
     it 'should route to audit' do
-      { post: '/files/7/audit' }.should route_to(controller: 'generic_files', action: 'audit', id: '7')
+      expect({ post: '/files/7/audit' }).to route_to(controller: 'generic_files', action: 'audit', id: '7')
     end
 
     it 'should route to create' do
-      { post: '/files' }.should route_to(controller: 'generic_files', action: 'create')
+      expect({ post: '/files' }).to route_to(controller: 'generic_files', action: 'create')
     end
 
     it 'should route to new' do
-      { get: '/files/new' }.should route_to(controller: 'generic_files', action: 'new')
+      expect({ get: '/files/new' }).to route_to(controller: 'generic_files', action: 'new')
     end
 
     it 'should route to edit' do
-      { get: '/files/3/edit' }.should route_to(controller: 'generic_files', action: 'edit', id: '3')
+      expect({ get: '/files/3/edit' }).to route_to(controller: 'generic_files', action: 'edit', id: '3')
     end
 
     it "should route to show" do
-      { get: '/files/4' }.should route_to(controller: 'generic_files', action: 'show', id: '4')
+      expect({ get: '/files/4' }).to route_to(controller: 'generic_files', action: 'show', id: '4')
     end
 
     it "should route to update" do
-      { put: '/files/5' }.should route_to(controller: 'generic_files', action: 'update', id: '5')
+      expect({ put: '/files/5' }).to route_to(controller: 'generic_files', action: 'update', id: '5')
     end
 
     it "should route to destroy" do
-      { delete: '/files/6' }.should route_to(controller: 'generic_files', action: 'destroy', id: '6')
+      expect({ delete: '/files/6' }).to route_to(controller: 'generic_files', action: 'destroy', id: '6')
     end
 
     it "should *not* route to index" do
-      { get: '/files' }.should_not route_to(controller: 'generic_files', action: 'index')
+      expect({ get: '/files' }).not_to route_to(controller: 'generic_files', action: 'index')
     end
   end
 
   describe 'Batch' do
     it "should route to edit" do
-      { get: '/batches/1/edit' }.should route_to(controller: 'batch', action: 'edit', id: '1')
+      expect({ get: '/batches/1/edit' }).to route_to(controller: 'batch', action: 'edit', id: '1')
     end
 
     it "should route to update" do
-      { post: '/batches/2' }.should route_to(controller: 'batch', action: 'update', id: '2')
+      expect({ post: '/batches/2' }).to route_to(controller: 'batch', action: 'update', id: '2')
     end
   end
 
   describe 'Download' do
     it "should route to show" do
-      { get: '/downloads/9' }.should route_to(controller: 'downloads', action: 'show', id: '9')
+      expect({ get: '/downloads/9' }).to route_to(controller: 'downloads', action: 'show', id: '9')
     end
   end
 
   describe 'Dashboard' do
     it "should route to dashboard" do
-      { get: '/dashboard' }.should route_to(controller: 'dashboard', action: 'index')
+      expect({ get: '/dashboard' }).to route_to(controller: 'dashboard', action: 'index')
     end
 
       it "should route to dashboard activity" do
-      { get: '/dashboard/activity' }.should route_to(controller: 'dashboard', action: 'activity')
+      expect({ get: '/dashboard/activity' }).to route_to(controller: 'dashboard', action: 'activity')
     end
 
     it "should route to my files tab" do
-      { get: '/dashboard/files' }.should route_to(controller: 'my/files', action: 'index')
+      expect({ get: '/dashboard/files' }).to route_to(controller: 'my/files', action: 'index')
     end
 
     it "should route to my collections tab" do
-      { get: '/dashboard/collections' }.should route_to(controller: 'my/collections', action: 'index')
+      expect({ get: '/dashboard/collections' }).to route_to(controller: 'my/collections', action: 'index')
     end
 
     it "should route to my highlighted tab" do
-      { get: '/dashboard/highlights' }.should route_to(controller: 'my/highlights', action: 'index')
+      expect({ get: '/dashboard/highlights' }).to route_to(controller: 'my/highlights', action: 'index')
     end
 
     it "should route to my shared tab" do
-      { get: '/dashboard/shares' }.should route_to(controller: 'my/shares', action: 'index')
+      expect({ get: '/dashboard/shares' }).to route_to(controller: 'my/shares', action: 'index')
     end
   end
 
   describe 'Advanced Search' do
     it "should route to search" do
-      { get: '/search' }.should route_to(controller: 'advanced', action: 'index')
+      expect({ get: '/search' }).to route_to(controller: 'advanced', action: 'index')
     end
   end
 
   describe 'Authorities' do
     it "should route to query" do
-      { get: '/authorities/subject/bio' }.should route_to(controller: 'authorities', action: 'query', model: 'subject', term: 'bio')
+      expect({ get: '/authorities/subject/bio' }).to route_to(controller: 'authorities', action: 'query', model: 'subject', term: 'bio')
     end
   end
 
   describe 'Users' do
     it 'should route to user trophies' do
-      { post: '/users/bob135/trophy' }.should route_to(controller: 'users', action: 'toggle_trophy', id: 'bob135')
+      expect({ post: '/users/bob135/trophy' }).to route_to(controller: 'users', action: 'toggle_trophy', id: 'bob135')
     end
     it 'should route to user profile' do
-      { get: '/users/bob135' }.should route_to(controller: 'users', action: 'show', id: 'bob135')
+      expect({ get: '/users/bob135' }).to route_to(controller: 'users', action: 'show', id: 'bob135')
     end
 
     it "should route to edit profile" do
-      { get: '/users/bob135/edit' }.should route_to(controller: 'users', action: 'edit', id: 'bob135')
+      expect({ get: '/users/bob135/edit' }).to route_to(controller: 'users', action: 'edit', id: 'bob135')
     end
 
     it "should route to update profile" do
-      { put: '/users/bob135' }.should route_to(controller: 'users', action: 'update', id: 'bob135')
+      expect({ put: '/users/bob135' }).to route_to(controller: 'users', action: 'update', id: 'bob135')
     end
 
     it "should route to user follow" do
-      { post: '/users/bob135/follow' }.should route_to(controller: 'users', action: 'follow', id: 'bob135')
+      expect({ post: '/users/bob135/follow' }).to route_to(controller: 'users', action: 'follow', id: 'bob135')
     end
 
     it "should route to user unfollow" do
-      { post: '/users/bob135/unfollow' }.should route_to(controller: 'users', action: 'unfollow', id: 'bob135')
+      expect({ post: '/users/bob135/unfollow' }).to route_to(controller: 'users', action: 'unfollow', id: 'bob135')
     end
   end
 
   describe "Directory" do
     it "should route to user" do
-      { get: '/directory/user/xxx666' }.should route_to(controller: 'directory', action: 'user', uid: 'xxx666')
+      expect({ get: '/directory/user/xxx666' }).to route_to(controller: 'directory', action: 'user', uid: 'xxx666')
     end
 
     it "should route to user attribute" do
-      { get: '/directory/user/zzz777/email' }.should route_to(controller: 'directory', action: 'user_attribute', uid: 'zzz777', attribute: 'email')
+      expect({ get: '/directory/user/zzz777/email' }).to route_to(controller: 'directory', action: 'user_attribute', uid: 'zzz777', attribute: 'email')
     end
 
     it "should route to group and allow periods" do
-      { get: '/directory/group/all.staff' }.should route_to(controller: 'directory', action: 'group', cn: 'all.staff')
+      expect({ get: '/directory/group/all.staff' }).to route_to(controller: 'directory', action: 'group', cn: 'all.staff')
     end
   end
 
@@ -161,50 +161,50 @@ describe 'Routes' do
 
   describe "Contact Form" do
     it "should route to new" do
-      { get: '/contact' }.should route_to(controller: 'contact_form', action: 'new')
+      expect({ get: '/contact' }).to route_to(controller: 'contact_form', action: 'new')
     end
 
     it "should route to create" do
-      { post: '/contact' }.should route_to(controller: 'contact_form', action: 'create')
+      expect({ post: '/contact' }).to route_to(controller: 'contact_form', action: 'create')
     end
   end
 
   describe "Dynamically edited pages" do
     it "should route to about" do
-      { get: '/about' }.should route_to(controller: 'pages', action: 'show', id: 'about_page')
+      expect({ get: '/about' }).to route_to(controller: 'pages', action: 'show', id: 'about_page')
     end
   end
 
   describe "Static Pages" do
     it "should route to help" do
-      { get: '/help' }.should route_to(controller: 'static', action: 'help')
+      expect({ get: '/help' }).to route_to(controller: 'static', action: 'help')
     end
 
     it "should route to terms" do
-      { get: '/terms' }.should route_to(controller: 'static', action: 'terms')
+      expect({ get: '/terms' }).to route_to(controller: 'static', action: 'terms')
     end
 
     it "should route to zotero" do
-      { get: '/zotero' }.should route_to(controller: 'static', action: 'zotero')
+      expect({ get: '/zotero' }).to route_to(controller: 'static', action: 'zotero')
     end
 
     it "should route to mendeley" do
-      { get: '/mendeley' }.should route_to(controller: 'static', action: 'mendeley')
+      expect({ get: '/mendeley' }).to route_to(controller: 'static', action: 'mendeley')
     end
 
     it "should route to versions" do
-      { get: '/versions' }.should route_to(controller: 'static', action: 'versions')
+      expect({ get: '/versions' }).to route_to(controller: 'static', action: 'versions')
     end
 
     it "should *not* route a bogus static page" do
-      { get: '/awesome' }.should_not route_to(controller: 'static', action: 'awesome')
+      expect({ get: '/awesome' }).not_to route_to(controller: 'static', action: 'awesome')
     end
   end
 
   describe "Catch-all" do
     it "should route non-existent routes to errors" do
       pending "The default route is turned off in testing, so that errors are raised"
-      { get: '/awesome' }.should route_to(controller: 'errors', action: 'routing', error: 'awesome')
+      expect({ get: '/awesome' }).to route_to(controller: 'errors', action: 'routing', error: 'awesome')
     end
   end
 end

data/spec/services/noid_spec.rb

@@ -6,11 +6,11 @@ describe Sufia::Noid do
 
     context "when the passed in pid doesn't have a namespace" do
       let(:id) { 'abc123' }
-      it { should eq 'sufia:abc123' }
+      it { is_expected.to eq 'sufia:abc123' }
     end
     context "when the passed in pid has a namespace" do
       let(:id) { 'ksl:abc123' }
-      it { should eq 'ksl:abc123' }
+      it { is_expected.to eq 'ksl:abc123' }
     end
   end
 end

data/spec/spec_helper.rb

@@ -6,17 +6,16 @@ EngineCart.load_application!
 require 'mida'
 require 'rspec/rails'
 require 'rspec/its'
+require 'rspec/matchers'
 require 'rspec/active_model/mocks'
 require 'factory_girl_rails'
 require 'capybara/poltergeist'
-Capybara.javascript_driver = :poltergeist
-Capybara.default_wait_time = ENV['TRAVIS'] ? 30 : 15
 require 'capybara/rspec'
 require 'capybara/rails'
+require 'equivalent-xml'
 require 'equivalent-xml/rspec_matchers'
 require 'database_cleaner'
-
-require File.expand_path('../support/features', __FILE__)
+require 'support/features'
 
 if ENV['COVERAGE']
   require 'simplecov'
@@ -24,6 +23,9 @@ if ENV['COVERAGE']
   SimpleCov.command_name "spec"
 end
 
+Capybara.javascript_driver = :poltergeist
+Capybara.default_wait_time = ENV['TRAVIS'] ? 30 : 15
+
 $in_travis = !ENV['TRAVIS'].nil? && ENV['TRAVIS'] == 'true'
 
 if $in_travis
@@ -71,6 +73,10 @@ module EngineRoutes
 end
 
 RSpec.configure do |config|
+  config.expect_with :rspec do |c|
+    c.syntax = :expect
+  end
+
   # Remove this line if you're not using ActiveRecord or ActiveRecord fixtures
   config.fixture_path = File.expand_path("../fixtures", __FILE__)
 
@@ -96,7 +102,6 @@ RSpec.configure do |config|
 
   config.include Devise::TestHelpers, type: :controller
   config.include EngineRoutes, type: :controller
-  config.include EquivalentXml::RSpecMatchers
 
   config.include Warden::Test::Helpers, type: :feature
   config.after(:each, type: :feature) { Warden.test_reset! }