sufia 7.1.0 → 7.2.0

data/spec/spec_helper.rb

@@ -4,7 +4,12 @@ Coveralls.wear!
 ENV["RAILS_ENV"] ||= 'test'
 require "bundler/setup"
 
-if ENV['COVERAGE'] || ENV['TRAVIS']
+def coverage_needed?
+  (!ENV['RAILS_VERSION'] || ENV['RAILS_VERSION'].start_with?('5.0')) &&
+    (ENV['COVERAGE'] || ENV['TRAVIS'])
+end
+
+if coverage_needed?
   require 'simplecov'
   SimpleCov.root(File.expand_path('../..', __FILE__))
   SimpleCov.formatter = Coveralls::SimpleCov::Formatter
@@ -23,6 +28,7 @@ EngineCart.load_application!
 require 'devise'
 require 'devise/version'
 require 'mida'
+require 'rails-controller-testing' if Rails::VERSION::MAJOR >= 5
 require 'rspec/rails'
 require 'rspec/its'
 require 'rspec/matchers'
@@ -34,6 +40,7 @@ require 'equivalent-xml'
 require 'equivalent-xml/rspec_matchers'
 require 'database_cleaner'
 require 'support/features'
+require 'support/backport_test_helpers'
 require 'support/rake'
 require 'byebug' unless ENV['TRAVIS']
 
@@ -41,14 +48,14 @@ Capybara.default_driver = :rack_test      # This is a faster driver
 Capybara.javascript_driver = :poltergeist # This is slower
 Capybara.default_max_wait_time = ENV['TRAVIS'] ? 30 : 15
 
+ActiveJob::Base.queue_adapter = :inline
+
 # require 'http_logger'
 # HttpLogger.logger = Logger.new(STDOUT)
 # HttpLogger.ignore = [/localhost:8983\/solr/]
 # HttpLogger.colorize = false
 
-$in_travis = !ENV['TRAVIS'].nil? && ENV['TRAVIS'] == 'true'
-
-if $in_travis
+if ENV['TRAVIS'] == 'true'
   # Monkey-patches the FITS runner to return the PDF FITS fixture
   module Hydra::Works
     class CharacterizationService
@@ -140,6 +147,17 @@ RSpec.configure do |config|
     end
   end
 
+  config.before(:all, type: :feature) do
+    # Assets take a long time to compile. This causes two problems:
+    # 1) the profile will show the first feature test taking much longer than it
+    #    normally would.
+    # 2) The first feature test will trigger rack-timeout
+    #
+    # Precompile the assets to prevent these issues.
+    visit "/assets/application.css"
+    visit "/assets/application.js"
+  end
+
   config.after do
     DatabaseCleaner.clean
   end
@@ -158,6 +176,10 @@ RSpec.configure do |config|
     config.include Devise::TestHelpers, type: :controller
   end
 
+  if Rails::VERSION::MAJOR < 5
+    config.include BackportTestHelpers, type: :controller
+  end
+
   config.include EngineRoutes, type: :controller
   config.include Warden::Test::Helpers, type: :feature
   config.after(:each, type: :feature) { Warden.test_reset! }
@@ -166,4 +188,21 @@ RSpec.configure do |config|
   config.include FactoryGirl::Syntax::Methods
 
   config.infer_spec_type_from_file_location!
+
+  config.expect_with :rspec do |expectations|
+    expectations.include_chain_clauses_in_custom_matcher_descriptions = true
+  end
+
+  config.default_formatter = 'doc' if config.files_to_run.one?
+
+  config.order = :random
+  Kernel.srand config.seed
+
+  config.shared_context_metadata_behavior = :apply_to_host_groups
+
+  config.filter_run_when_matching :focus
+
+  config.example_status_persistence_file_path = 'spec/examples.txt'
+
+  config.profile_examples = 10
 end

data/spec/support/backport_test_helpers.rb

@@ -0,0 +1,19 @@
+# Backport the Rails 5 controller test methods to Rails 4
+module BackportTestHelpers
+  [:delete, :get, :post, :put, :patch].each do |http_action|
+    define_method(http_action) do |*args|
+      (action, rest) = *args
+      rest ||= {}
+      if rest[:xhr]
+        @request.env['HTTP_X_REQUESTED_WITH'] = 'XMLHttpRequest'
+        @request.env['HTTP_ACCEPT'] ||= [Mime::JS, Mime::HTML, Mime::XML, 'text/xml', Mime::ALL].join(', ')
+      end
+
+      if rest[:body]
+        super(action, rest[:body], rest.except(:params).merge(rest.fetch(:params, {})))
+      else
+        super(action, rest.except(:params).merge(rest.fetch(:params, {})))
+      end
+    end
+  end
+end

data/spec/support/selectors.rb

@@ -1,23 +1,4 @@
 module Selectors
-  module Header
-    def nav_toggle(section, link)
-      within '#masthead' do
-        click_on section
-        click_on link
-      end
-    end
-
-    def user_notifications_link
-      nav_toggle('Dashboard', 'Notifications')
-    end
-
-    def user_utility_toggle
-      within '#user_utility_links' do
-        find '.dropdown-toggle.btn.btn-default'
-      end
-    end
-  end
-
   module Dashboard
     def db_item_actions_toggle(item)
       within "#document_#{item.id}" do

data/spec/test_app_templates/Gemfile.extra

@@ -1,4 +1,5 @@
 # Use this file to reference specific commits of gems.
+gem 'flipflop', git: 'https://github.com/jcoyne/flipflop.git', branch: 'hydra'
 
 group :development do
   gem 'better_errors'

data/spec/test_app_templates/lib/generators/test_app_generator.rb

@@ -42,8 +42,6 @@ class TestAppGenerator < Rails::Generators::Base
   end
 
   def enable_i18n_translation_errors
-    say_status("info", "Adding i18n_translation_errors = true to dev and test", :blue)
-
     gsub_file "config/environments/development.rb",
               "# config.action_view.raise_on_missing_translations = true", "config.action_view.raise_on_missing_translations = true"
     gsub_file "config/environments/test.rb",

data/spec/views/_toolbar.html.erb_spec.rb

@@ -21,21 +21,21 @@ describe '/_toolbar.html.erb', type: :view do
 
   context 'with an admin user' do
     before do
-      allow(view).to receive(:can?).with(:manage, :all).and_return(true)
+      allow(view).to receive(:can?).with(:read, :admin_dashboard).and_return(true)
     end
 
     it 'shows the admin menu' do
       render
-      expect(rendered).to have_link 'Admin', sufia.admin_stats_path
+      expect(rendered).to have_link 'Admin', href: sufia.admin_path
     end
   end
 
   it 'has dashboard links' do
     render
-    expect(rendered).to have_link 'My Dashboard', sufia.dashboard_index_path
-    expect(rendered).to have_link 'Transfers', sufia.transfers_path
-    expect(rendered).to have_link 'Highlights', sufia.dashboard_highlights_path
-    expect(rendered).to have_link 'Shares', sufia.dashboard_shares_path
+    expect(rendered).to have_link 'My Dashboard', href: sufia.dashboard_index_path
+    expect(rendered).to have_link 'Transfers', href: sufia.transfers_path
+    expect(rendered).to have_link 'Highlights', href: sufia.dashboard_highlights_path
+    expect(rendered).to have_link 'Shares', href: sufia.dashboard_shares_path
   end
 
   describe "New Work button" do

data/spec/views/catalog/_index_list_default.html.erb_spec.rb

@@ -6,7 +6,10 @@ describe 'catalog/_index_list_default', type: :view do
       'proxy_depositor_ssim' => [''],
       'description_tesim'    => [''],
       'date_uploaded_dtsi'   => 'a date',
-      'rights_tesim'         => [''] }
+      'date_modified_dtsi'   => 'a date',
+      'rights_tesim'         => [''],
+      'embargo_release_date_dtsi' => 'a date',
+      'lease_expiration_date_dtsi' => 'a date' }
   end
   let(:document) { SolrDocument.new(attributes) }
   let(:blacklight_configuration_context) do
@@ -29,11 +32,17 @@ describe 'catalog/_index_list_default', type: :view do
     expect(rendered).to include 'Test description_tesim'
     expect(rendered).to include '<span class="attribute-label h4">Date Uploaded:</span>'
     expect(rendered).to include 'Test date_uploaded_dtsi'
+    expect(rendered).to include '<span class="attribute-label h4">Date Modified:</span>'
+    expect(rendered).to include 'Test date_modified_dtsi'
     expect(rendered).to include '<span class="attribute-label h4">Depositor:</span>'
     expect(rendered).to include 'Test proxy_depositor_ssim'
     expect(rendered).to include '<span class="attribute-label h4">Owner:</span>'
     expect(rendered).to include 'Test depositor_tesim'
     expect(rendered).to include '<span class="attribute-label h4">Rights:</span>'
     expect(rendered).to include 'Test rights_tesim'
+    expect(rendered).to include '<span class="attribute-label h4">Embargo release date:</span>'
+    expect(rendered).to include 'Test embargo_release_date_dtsi'
+    expect(rendered).to include '<span class="attribute-label h4">Lease expiration date:</span>'
+    expect(rendered).to include 'Test lease_expiration_date_dtsi'
   end
 end

data/spec/views/catalog/_thumbnail_list_collection.html.erb_spec.rb

@@ -0,0 +1,10 @@
+describe 'catalog/_thumbnail_list_collection.html.erb', type: :view do
+  before do
+    stub_template 'catalog/_thumbnail_list_collection.html.erb' => '<div class="col-sm-3"><span class="fa fa-cubes collection-icon-search"></span></div>'
+    render
+  end
+
+  it 'displays the collection icon in the search results' do
+    expect(rendered).to match '<div class="col-sm-3"><span class="fa fa-cubes collection-icon-search"></span></div>'
+  end
+end

data/spec/views/citations/work.html.erb_spec.rb

@@ -3,7 +3,7 @@ describe 'citations/work.html.erb', type: :view do
   let(:object_profile) { ["{\"id\":\"999\"}"] }
   let(:contributor) { ['Gandalf Grey'] }
   let(:creator)     { ['Bilbo Baggins', 'Baggins, Frodo'] }
-  let(:solr_document) {
+  let(:solr_document) do
     SolrDocument.new(
       id: '999',
       object_profile_ssm: object_profile,
@@ -16,7 +16,7 @@ describe 'citations/work.html.erb', type: :view do
       based_near_tesim: ['London'],
       date_created_tesim: ['1969']
     )
-  }
+  end
   let(:ability) { nil }
   let(:presenter) do
     Sufia::WorkShowPresenter.new(solr_document, ability)

data/spec/views/collections/_form_for_select_collection.html.erb_spec.rb

@@ -1,19 +1,19 @@
 describe 'collections/_form_for_select_collection.html.erb', type: :view do
-  let(:collections) {
+  let(:collections) do
     [
       build(:collection, id: '1234', create_date: Time.zone.parse('Thu, 13 Aug 2015 14:20:22 +0100')),
       build(:collection, id: '1235', create_date: Time.zone.parse('Thu, 13 Aug 2015 14:18:22 +0100')),
       build(:collection, id: '1236', create_date: Time.zone.parse('Thu, 13 Aug 2015 14:16:22 +0100')),
       build(:collection, id: '1237', create_date: Time.zone.parse('Thu, 13 Aug 2015 14:29:22 +0100'))
     ]
-  }
-  let(:solr_collections) {
+  end
+  let(:solr_collections) do
     collections.map do |c|
       SolrDocument.new(c.to_solr).tap do |sd|
         sd['system_create_dtsi'] = c.create_date.to_s
       end
     end
-  }
+  end
 
   let(:doc) { Nokogiri::HTML(rendered) }
 
@@ -23,6 +23,8 @@ describe 'collections/_form_for_select_collection.html.erb', type: :view do
     render
     collection_ids = doc.xpath("//input[@class='collection-selector']/@id").map(&:to_s)
     expect(collection_ids).to eql(["id_1237", "id_1234", "id_1235", "id_1236"])
+    expect(rendered).to have_selector("label", text: collections.first.title.first)
+    expect(rendered).not_to have_selector("label", text: "[\"#{collections.first.title.first}\"]")
   end
 
   it "selects the right collection when instructed to do so" do

data/spec/views/collections/_show_document_list.html.erb_spec.rb

@@ -27,6 +27,7 @@ describe 'collections/_show_document_list.html.erb', type: :view do
     it "renders collection" do
       render(partial: 'collections/show_document_list.html.erb', locals: { documents: documents })
       expect(rendered).to have_content 'One Hundred Years of Solitude'
+      expect(rendered).not_to have_content 'Action'
     end
   end
 end

data/spec/views/collections/_show_document_list_menu.html.erb_spec.rb

@@ -1,19 +1,30 @@
 
 describe 'collections/_show_document_list_menu.html.erb', type: :view do
-  context 'when user logged in displaying the collections of current user' do
+  context 'when user is viewing a collection' do
     let(:user) { create :user }
+    let(:ability) { instance_double("Ability") }
     let(:document) { SolrDocument.new(id: '1234') }
     before do
       allow(document).to receive(:to_model).and_return(stub_model(GenericWork))
+      allow(controller).to receive(:current_ability).and_return(ability)
     end
 
-    it "displays the action list in individual work drop down" do
+    it "displays the action list in a drop down for an individual work the user can edit" do
+      allow(ability).to receive(:can?).with(:edit, document).and_return(true)
       render('collections/show_document_list_menu.html.erb', document: document, current_user: user)
       expect(rendered).to have_content 'Select an action'
-      expect(rendered).not_to have_content 'Single-Use Link to File'
       expect(rendered).to have_content 'Edit'
       expect(rendered).not_to have_content 'Download File'
       expect(rendered).to have_content 'Highlight Work on Profile'
     end
+
+    it "displays the action list in a drop down for an individual work the user cannot edit" do
+      allow(ability).to receive(:can?).with(:edit, document).and_return(false)
+      render('collections/show_document_list_menu.html.erb', document: document, current_user: user)
+      expect(rendered).to have_content 'Select an action'
+      expect(rendered).not_to have_content 'Edit'
+      expect(rendered).not_to have_content 'Download File'
+      expect(rendered).to have_content 'Highlight Work on Profile'
+    end
   end
 end

data/spec/views/collections/show.html.erb_spec.rb

@@ -1,6 +1,9 @@
 describe 'collections/show.html.erb', type: :view do
-  let(:document) { SolrDocument.new(id: 'xyz123z4',
-                                    'title_tesim' => ['Make Collections Great Again']) }
+  let(:document) do
+    SolrDocument.new(id: 'xyz123z4',
+                     'title_tesim' => ['Make Collections Great Again'],
+                     'rights_tesim' => ["http://creativecommons.org/licenses/by-sa/3.0/us/"])
+  end
   let(:ability) { double }
   let(:presenter) { Sufia::CollectionPresenter.new(document, ability) }
   let(:blacklight_config) { CatalogController.blacklight_config }
@@ -20,6 +23,7 @@ describe 'collections/show.html.erb', type: :view do
     stub_template 'collections/_sort_and_per_page.html.erb' => 'sort and per page'
     stub_template 'collections/_document_list.html.erb' => 'document list'
     stub_template 'collections/_paginate.html.erb' => 'paginate'
+    stub_template 'collections/_media_display.html.erb' => '<span class="fa fa-cubes collection-icon-search"></span>'
     render
   end
 
@@ -28,5 +32,6 @@ describe 'collections/show.html.erb', type: :view do
     expect(rendered).to have_link 'Edit'
     expect(rendered).to have_link 'Delete'
     expect(rendered).to have_link 'Add works'
+    expect(rendered).to match '<span class="fa fa-cubes collection-icon-search"></span>'
   end
 end

data/spec/views/curation_concerns/base/_attribute_rows.html.erb_spec.rb

@@ -0,0 +1,19 @@
+require 'spec_helper'
+
+describe 'curation_concerns/base/_attribute_rows.html.erb', type: :view do
+  let(:url) { "http://example.com" }
+  let(:ability) { double }
+  let(:work) { stub_model(GenericWork, related_url: [url]) }
+  let(:solr_document) { SolrDocument.new(work.to_solr) }
+  let(:presenter) { Sufia::WorkShowPresenter.new(solr_document, ability) }
+
+  let(:page) do
+    render 'curation_concerns/base/attribute_rows', presenter: presenter
+    Capybara::Node::Simple.new(rendered)
+  end
+
+  it 'shows external link with icon for related url field' do
+    expect(page).to have_selector '.glyphicon-new-window'
+    expect(page).to have_link(url)
+  end
+end

data/spec/views/curation_concerns/base/_citations.html.erb_spec.rb

@@ -5,7 +5,7 @@ describe 'curation_concerns/base/_citations.html.erb', type: :view do
   let(:object_profile) { ["{\"id\":\"999\"}"] }
   let(:contributor) { ['Frodo'] }
   let(:creator)     { ['Bilbo'] }
-  let(:solr_document) {
+  let(:solr_document) do
     SolrDocument.new(
       id: '999',
       object_profile_ssm: object_profile,
@@ -15,7 +15,7 @@ describe 'curation_concerns/base/_citations.html.erb', type: :view do
       creator_tesim: creator,
       rights_tesim: ['http://creativecommons.org/licenses/by/3.0/us/']
     )
-  }
+  end
   let(:ability) { Ability.new(user) }
   let(:presenter) do
     Sufia::WorkShowPresenter.new(solr_document, ability)

data/spec/views/curation_concerns/base/_form.html.erb_spec.rb

@@ -16,6 +16,8 @@ describe 'curation_concerns/base/_form.html.erb', type: :view do
     assign(:form, form)
     allow(controller).to receive(:controller_name).and_return('batch_uploads')
     allow(controller).to receive(:action_name).and_return('new')
+    allow(controller).to receive(:repository).and_return(CurationConcerns::GenericWorksController.new.repository)
+    allow(controller).to receive(:blacklight_config).and_return(CurationConcerns::GenericWorksController.new.blacklight_config)
   end
 
   let(:page) do

data/spec/views/curation_concerns/base/_form_relationships.html.erb_spec.rb

@@ -0,0 +1,48 @@
+describe 'curation_concerns/base/_form_relationships.html.erb', type: :view do
+  let(:ability) { double }
+  let(:work) { GenericWork.new }
+  let(:form) do
+    CurationConcerns::GenericWorkForm.new(work, ability)
+  end
+  let(:service) { instance_double CurationConcerns::AdminSetService, select_options: [] }
+
+  before do
+    allow(view).to receive(:available_collections).and_return([])
+    allow(view).to receive(:action_name).and_return('new')
+    allow(CurationConcerns::AdminSetService).to receive(:new).with(controller).and_return(service)
+  end
+
+  let(:form_template) do
+    %(
+      <%= simple_form_for [main_app, @form] do |f| %>
+        <%= render "curation_concerns/base/form_relationships", f: f %>
+      <% end %>
+    )
+  end
+
+  let(:page) do
+    assign(:form, form)
+    render inline: form_template
+    Capybara::Node::Simple.new(rendered)
+  end
+
+  context 'with assign_admin_set turned on' do
+    before do
+      allow(Flipflop).to receive(:assign_admin_set?).and_return(true)
+    end
+
+    it "draws the page" do
+      expect(page).to have_content('Add as member of administrative set')
+      expect(page).to have_selector('select#generic_work_admin_set_id')
+    end
+  end
+
+  context 'with assign_admin_set disabled' do
+    before do
+      allow(Flipflop).to receive(:assign_admin_set?).and_return(false)
+    end
+    it 'draws the page, but not the admin set widget' do
+      expect(page).not_to have_content('administrative set')
+    end
+  end
+end