From 1bc4e5dfec7161108dc0dc0d5f724aa3f70c1472 Mon Sep 17 00:00:00 2001 From: Justin Coyne Date: Tue, 28 Nov 2017 22:19:46 -0800 Subject: [PATCH] Update rubocop to 0.51.0 --- .rubocop.yml | 11 ++- .rubocop_fixme.yml | 14 +++- .../hyrax/actors/attach_members_actor.rb | 4 +- .../actors/create_with_remote_files_actor.rb | 2 +- app/helpers/hyrax/trophy_helper.rb | 1 - app/models/admin_set.rb | 2 + .../concerns/hyrax/solr_document_behavior.rb | 2 - app/models/concerns/hyrax/user.rb | 14 ++-- app/models/hyrax/uploaded_file.rb | 5 +- .../hyrax/fixity_status_presenter.rb | 4 +- .../renderers/license_attribute_renderer.rb | 2 +- .../rights_statement_attribute_renderer.rb | 2 +- .../hyrax/file_set_fixity_check_service.rb | 2 +- hyrax.gemspec | 84 +++++++++---------- lib/generators/hyrax/assets_generator.rb | 6 +- lib/generators/hyrax/clamav_generator.rb | 2 - lib/generators/hyrax/config_generator.rb | 2 - lib/hyrax/configuration.rb | 4 +- lib/hyrax/engine.rb | 2 +- lib/tasks/default_admin_set.rake | 2 +- spec/actors/hyrax/actors/model_actor_spec.rb | 2 - spec/controllers/catalog_controller_spec.rb | 2 +- .../hyrax/fixity_checks_controller_spec.rb | 2 +- spec/factories/permission_templates.rb | 2 +- spec/features/admin_admin_set_spec.rb | 2 +- spec/features/admin_spec.rb | 2 +- spec/features/batch_create_spec.rb | 2 +- spec/features/browse_catalog_spec.rb | 2 - spec/features/create_child_work_spec.rb | 2 +- spec/features/create_work_spec.rb | 2 +- spec/features/dashboard/all_works.rb | 2 +- spec/features/delete_work_spec.rb | 2 +- spec/features/edit_file_spec.rb | 2 +- spec/features/edit_work_spec.rb | 2 +- spec/features/embargo_spec.rb | 2 +- spec/features/homepage_spec.rb | 6 +- spec/features/lease_spec.rb | 2 +- spec/features/notifications_spec.rb | 2 +- spec/features/ownership_transfer_spec.rb | 2 +- spec/features/proxy_spec.rb | 2 +- spec/features/search_spec.rb | 2 +- spec/features/static_pages_spec.rb | 2 +- spec/features/users_spec.rb | 2 +- spec/features/work_generator_spec.rb | 2 +- spec/features/work_show_spec.rb | 2 +- spec/features/workflow_roles_spec.rb | 2 +- spec/features/workflow_state_changes_spec.rb | 2 +- .../hyrax/generic_work_indexer_spec.rb | 4 +- spec/models/user_mailbox_spec.rb | 2 - spec/views/_flash_msg.html.erb_spec.rb | 2 - spec/views/_user_util_links.html.erb_spec.rb | 2 - 51 files changed, 118 insertions(+), 117 deletions(-) diff --git a/.rubocop.yml b/.rubocop.yml index db5391fd0e..56e43e9d3f 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -49,6 +49,10 @@ Metrics/BlockLength: Metrics/MethodLength: Max: 13 +Naming/FileName: # https://github.com/bbatsov/rubocop/issues/2973 + Exclude: + - 'Gemfile' + Style/AsciiComments: Enabled: false @@ -60,10 +64,6 @@ Style/CollectionMethods: detect: 'find' find_all: 'select' -Style/FileName: # https://github.com/bbatsov/rubocop/issues/2973 - Exclude: - - 'Gemfile' - Style/MethodMissing: Exclude: - 'app/models/concerns/hyrax/file_set/characterization.rb' @@ -140,6 +140,9 @@ RSpec/DescribeClass: - 'spec/tasks/rake_spec.rb' - 'spec/views/**/*' +RSpec/ContextWording: + Enabled: false + # By default RSpec/MessageSpies has the following: # Prefer have_received for setting message expectations. Setup form as a spy using allow or instance_spy. # The default assumes EnforcedStyle is 'have_received'. Most of our specs are 'receive' diff --git a/.rubocop_fixme.yml b/.rubocop_fixme.yml index c081d82484..fab8150f08 100644 --- a/.rubocop_fixme.yml +++ b/.rubocop_fixme.yml @@ -42,14 +42,24 @@ Metrics/MethodLength: - 'lib/hyrax/rails/routes.rb' - 'spec/support/**/*' + +Naming/PredicateName: + Exclude: + - 'app/helpers/hyrax/collections_helper.rb' + + # TODO: remove when https://github.com/bbatsov/rubocop/issues/4539 is fixed Style/FormatStringToken: Exclude: - 'config/routes.rb' -Style/PredicateName: +Style/DateTime: + Enabled: false + +# TODO: remove when https://github.com/bbatsov/rubocop/issues/5161 is fixed +Style/CommentedKeyword: Exclude: - - 'app/helpers/hyrax/collections_helper.rb' + - 'app/models/vocab/fedora_resource_status.rb' Rails/Output: Exclude: diff --git a/app/actors/hyrax/actors/attach_members_actor.rb b/app/actors/hyrax/actors/attach_members_actor.rb index 5aba91386f..3cfd2bcb6b 100644 --- a/app/actors/hyrax/actors/attach_members_actor.rb +++ b/app/actors/hyrax/actors/attach_members_actor.rb @@ -56,11 +56,11 @@ def remove(curation_concern, id) end # Determines if a hash contains a truthy _destroy key. - # rubocop:disable Style/PredicateName + # rubocop:disable Naming/PredicateName def has_destroy_flag?(hash) ActiveFedora::Type::Boolean.new.cast(hash['_destroy']) end - # rubocop:enable Style/PredicateName + # rubocop:enable Naming/PredicateName end end end diff --git a/app/actors/hyrax/actors/create_with_remote_files_actor.rb b/app/actors/hyrax/actors/create_with_remote_files_actor.rb index 4e51ca3466..00519855ab 100644 --- a/app/actors/hyrax/actors/create_with_remote_files_actor.rb +++ b/app/actors/hyrax/actors/create_with_remote_files_actor.rb @@ -32,7 +32,7 @@ def whitelisted_ingest_dirs # @param uri [URI] the uri fo the resource to import def validate_remote_url(uri) if uri.scheme == 'file' - path = File.absolute_path(URI.decode(uri.path)) + path = File.absolute_path(CGI.unescape(uri.path)) whitelisted_ingest_dirs.any? do |dir| path.start_with?(dir) && path.length > dir.length end diff --git a/app/helpers/hyrax/trophy_helper.rb b/app/helpers/hyrax/trophy_helper.rb index c19a48f93c..9b14bf2ee6 100644 --- a/app/helpers/hyrax/trophy_helper.rb +++ b/app/helpers/hyrax/trophy_helper.rb @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- module Hyrax module TrophyHelper # rubocop:disable Metrics/MethodLength diff --git a/app/models/admin_set.rb b/app/models/admin_set.rb index 61d1947c53..0f0c4ce577 100644 --- a/app/models/admin_set.rb +++ b/app/models/admin_set.rb @@ -39,9 +39,11 @@ class AdminSet < ActiveFedora::Base index.as :symbol end + # rubocop:disable Rails/HasManyOrHasOneDependent has_many :members, predicate: Hyrax.config.admin_set_predicate, class_name: 'ActiveFedora::Base' + # rubocop:enable Rails/HasManyOrHasOneDependent before_destroy :check_if_not_default_set, :check_if_empty after_destroy :destroy_permission_template diff --git a/app/models/concerns/hyrax/solr_document_behavior.rb b/app/models/concerns/hyrax/solr_document_behavior.rb index 7111c7544e..08e272959b 100644 --- a/app/models/concerns/hyrax/solr_document_behavior.rb +++ b/app/models/concerns/hyrax/solr_document_behavior.rb @@ -1,5 +1,3 @@ -# -*- encoding : utf-8 -*- - module Hyrax module SolrDocumentBehavior extend ActiveSupport::Concern diff --git a/app/models/concerns/hyrax/user.rb b/app/models/concerns/hyrax/user.rb index ba91cc2798..50f78781cd 100644 --- a/app/models/concerns/hyrax/user.rb +++ b/app/models/concerns/hyrax/user.rb @@ -16,13 +16,17 @@ module Hyrax::User acts_as_messageable # Set up proxy-related relationships - has_many :proxy_deposit_requests, foreign_key: 'receiving_user_id' + has_many :proxy_deposit_requests, + foreign_key: 'receiving_user_id', + dependent: :destroy has_many :deposit_rights_given, foreign_key: 'grantor_id', class_name: 'ProxyDepositRights', dependent: :destroy has_many :can_receive_deposits_from, through: :deposit_rights_given, source: :grantee has_many :deposit_rights_received, foreign_key: 'grantee_id', class_name: 'ProxyDepositRights', dependent: :destroy has_many :can_make_deposits_for, through: :deposit_rights_received, source: :grantor - has_many :job_io_wrappers, inverse_of: 'user' + has_many :job_io_wrappers, + inverse_of: 'user', + dependent: :destroy scope :guests, ->() { where(guest: true) } scope :registered, ->() { where(guest: false) } @@ -39,7 +43,8 @@ module Hyrax::User # Add token to authenticate Arkivo API calls after_initialize :set_arkivo_token, unless: :persisted? if Hyrax.config.arkivo_api? - has_many :trophies + has_many :trophies, + dependent: :destroy has_one :sipity_agent, as: :proxy_for, dependent: :destroy, class_name: 'Sipity::Agent' end @@ -108,8 +113,7 @@ def as_json(_opts = nil) end def name - display_name.titleize || raise - rescue + return display_name.titleize if display_name user_key end diff --git a/app/models/hyrax/uploaded_file.rb b/app/models/hyrax/uploaded_file.rb index b7bc631ae5..c30ada793f 100644 --- a/app/models/hyrax/uploaded_file.rb +++ b/app/models/hyrax/uploaded_file.rb @@ -5,7 +5,10 @@ class UploadedFile < ActiveRecord::Base self.table_name = 'uploaded_files' mount_uploader :file, UploadedFileUploader alias uploader file - has_many :job_io_wrappers, inverse_of: 'uploaded_file', class_name: 'JobIoWrapper' + has_many :job_io_wrappers, + inverse_of: 'uploaded_file', + class_name: 'JobIoWrapper', + dependent: :destroy belongs_to :user, class_name: '::User' before_destroy :remove_file! diff --git a/app/presenters/hyrax/fixity_status_presenter.rb b/app/presenters/hyrax/fixity_status_presenter.rb index 8b2c2e5a6e..52e861d7bc 100644 --- a/app/presenters/hyrax/fixity_status_presenter.rb +++ b/app/presenters/hyrax/fixity_status_presenter.rb @@ -10,7 +10,7 @@ class FixityStatusPresenter include ActionView::Helpers::TextHelper include ActionView::Helpers::OutputSafetyHelper - attr_reader :file_set_id, :relevant_log_records + attr_reader :file_set_id # Note this takes a file_set_id NOT a FileSet, easy use from either solr # or AF object. def initialize(file_set_id) @@ -75,7 +75,7 @@ def render_date_range # Should be all _latest_ ChecksumAuditLog about different files/versions # currently existing in specified FileSet. def relevant_log_records - @relevant_log_records = ChecksumAuditLog.latest_for_file_set_id(file_set_id) + @relevant_log_records ||= ChecksumAuditLog.latest_for_file_set_id(file_set_id) end def num_checked_files diff --git a/app/renderers/hyrax/renderers/license_attribute_renderer.rb b/app/renderers/hyrax/renderers/license_attribute_renderer.rb index d349d2ad35..fbfe9dd857 100644 --- a/app/renderers/hyrax/renderers/license_attribute_renderer.rb +++ b/app/renderers/hyrax/renderers/license_attribute_renderer.rb @@ -11,7 +11,7 @@ class LicenseAttributeRenderer < AttributeRenderer def attribute_value_to_html(value) begin parsed_uri = URI.parse(value) - rescue + rescue URI::InvalidURIError nil end if parsed_uri.nil? diff --git a/app/renderers/hyrax/renderers/rights_statement_attribute_renderer.rb b/app/renderers/hyrax/renderers/rights_statement_attribute_renderer.rb index 90ff31c447..e25f62fb69 100644 --- a/app/renderers/hyrax/renderers/rights_statement_attribute_renderer.rb +++ b/app/renderers/hyrax/renderers/rights_statement_attribute_renderer.rb @@ -11,7 +11,7 @@ class RightsStatementAttributeRenderer < AttributeRenderer def attribute_value_to_html(value) begin parsed_uri = URI.parse(value) - rescue + rescue URI::InvalidURIError nil end if parsed_uri.nil? diff --git a/app/services/hyrax/file_set_fixity_check_service.rb b/app/services/hyrax/file_set_fixity_check_service.rb index c8feab4137..b25f13027f 100644 --- a/app/services/hyrax/file_set_fixity_check_service.rb +++ b/app/services/hyrax/file_set_fixity_check_service.rb @@ -22,7 +22,7 @@ module Hyrax # `max_days_between_fixity_checks` arg, which defaults to config'd # `Hyrax.config.max_days_between_fixity_checks` class FileSetFixityCheckService - attr_reader :file_set, :id, :latest_version_only, + attr_reader :id, :latest_version_only, :async_jobs, :max_days_between_fixity_checks # @param file_set [ActiveFedora::Base, String] file_set diff --git a/hyrax.gemspec b/hyrax.gemspec index aa97e4c01c..fa4d94d2c6 100644 --- a/hyrax.gemspec +++ b/hyrax.gemspec @@ -1,5 +1,3 @@ -# -*- encoding: utf-8 -*- - lib = File.expand_path('../lib', __FILE__) $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib) require 'hyrax/version' @@ -8,13 +6,13 @@ Gem::Specification.new do |spec| spec.authors = ["Justin Coyne", 'Michael J. Giarlo', "Carolyn Cole", "Matt Zumwalt", 'Jeremy Friesen', 'Trey Pendragon', 'Esmé Cowles'] spec.email = ["jcoyne85@stanford.edu", 'mjgiarlo@stanford.edu', 'cam156@psu.edu', 'matt@databindery.com', "jeremy.n.friesen@gmail.com", 'tpendragon@princeton.edu', 'escowles@ticklefish.org'] spec.description = 'Hyrax is a featureful Samvera front-end based on the latest and greatest Samvera software components.' - spec.summary = <<-EOF + spec.summary = <<-SUMMARY Hyrax is a front-end based on the robust Samvera framework, providing a user interface for common repository features. Hyrax offers the ability to create repository object types on demand, to deposit content via multiple workflows, and to describe content with flexible metadata. Numerous optional features may be turned on in the administrative dashboard or added through plugins. -EOF +SUMMARY spec.homepage = "http://github.com/samvera/hyrax" @@ -31,65 +29,65 @@ EOF # http://guides.rubyonrails.org/maintenance_policy.html spec.add_dependency 'rails', '~> 5.0' - spec.add_dependency 'hydra-head', '>= 10.5.0' - spec.add_dependency 'hydra-editor', '~> 3.3' - spec.add_dependency 'hydra-works', '~> 0.16' - spec.add_dependency 'hydra-derivatives', '~> 3.3' - spec.add_dependency 'browse-everything', '>= 0.10.5' spec.add_dependency 'blacklight', '~> 6.11', '>= 6.11.2' spec.add_dependency 'blacklight-gallery', '~> 0.7' - spec.add_dependency 'tinymce-rails', '~> 4.1' + spec.add_dependency 'browse-everything', '>= 0.10.5' + spec.add_dependency 'carrierwave', '~> 1.0' spec.add_dependency 'font-awesome-rails', '~> 4.2' - spec.add_dependency 'select2-rails', '~> 3.5' + spec.add_dependency 'hydra-derivatives', '~> 3.3' + spec.add_dependency 'hydra-editor', '~> 3.3' + spec.add_dependency 'hydra-head', '>= 10.5.0' + spec.add_dependency 'hydra-works', '~> 0.16' + spec.add_dependency 'jquery-ui-rails', '~> 5.0' spec.add_dependency 'json-schema' # for Arkivo - spec.add_dependency 'nest', '~> 2.0' + spec.add_dependency 'legato', '~> 0.3' spec.add_dependency 'mailboxer', '~> 0.12' - spec.add_dependency 'carrierwave', '~> 1.0' + spec.add_dependency 'nest', '~> 2.0' spec.add_dependency 'oauth' spec.add_dependency 'oauth2', '~> 1.2' - spec.add_dependency 'signet' - spec.add_dependency 'legato', '~> 0.3' spec.add_dependency 'posix-spawn' - spec.add_dependency 'jquery-ui-rails', '~> 5.0' spec.add_dependency 'redis-namespace', '~> 1.5' + spec.add_dependency 'select2-rails', '~> 3.5' + spec.add_dependency 'signet' + spec.add_dependency 'tinymce-rails', '~> 4.1' # Pin more tightly because 0.x gems are potentially unstable - spec.add_dependency 'flot-rails', '~> 0.0.6' + spec.add_dependency 'active_fedora-noid', '~> 2.0', '>= 2.0.2' spec.add_dependency 'almond-rails', '~> 0.1' - spec.add_dependency 'qa', '~> 2.0' # questioning_authority + spec.add_dependency 'awesome_nested_set', '~> 3.1' + spec.add_dependency 'breadcrumbs_on_rails', '~> 3.0' + spec.add_dependency 'clipboard-rails', '~> 1.5' spec.add_dependency 'flipflop', '~> 2.3' + spec.add_dependency 'flot-rails', '~> 0.0.6' spec.add_dependency 'jquery-datatables-rails', '~> 3.4' - spec.add_dependency 'rdf-rdfxml' # controlled vocabulary importer - spec.add_dependency 'clipboard-rails', '~> 1.5' + spec.add_dependency 'qa', '~> 2.0' # questioning_authority spec.add_dependency 'rails_autolink', '~> 1.1' - spec.add_dependency 'active_fedora-noid', '~> 2.0', '>= 2.0.2' - spec.add_dependency 'awesome_nested_set', '~> 3.1' - spec.add_dependency 'breadcrumbs_on_rails', '~> 3.0' + spec.add_dependency 'rdf-rdfxml' # controlled vocabulary importer # Pin more tightly because 0.x gems are potentially unstable - spec.add_dependency 'kaminari_route_prefix', '~> 0.1.1' - spec.add_dependency 'power_converter', '~> 0.1', '>= 0.1.2' - spec.add_dependency 'dry-validation', '~> 0.9' + spec.add_dependency 'active-fedora', '~> 11.5', '>= 11.5.2' spec.add_dependency 'dry-equalizer', '~> 0.2' spec.add_dependency 'dry-struct', '~> 0.1' + spec.add_dependency 'dry-validation', '~> 0.9' + spec.add_dependency 'kaminari_route_prefix', '~> 0.1.1' + spec.add_dependency 'linkeddata' # Required for getting values from geonames + spec.add_dependency 'power_converter', '~> 0.1', '>= 0.1.2' spec.add_dependency 'redlock', '>= 0.1.2' spec.add_dependency 'retriable', '>= 2.9', '< 4.0' - spec.add_dependency 'active-fedora', '~> 11.5', '>= 11.5.2' - spec.add_dependency 'linkeddata' # Required for getting values from geonames - spec.add_development_dependency 'engine_cart', '~> 1.2' - spec.add_development_dependency 'mida', '~> 0.3' - spec.add_development_dependency 'database_cleaner', '~> 1.3' - spec.add_development_dependency 'solr_wrapper', '~> 1.1' - spec.add_development_dependency 'fcrepo_wrapper', '~> 0.5', '>= 0.5.1' - spec.add_development_dependency 'rspec-rails', '~> 3.1' - spec.add_development_dependency 'rspec-its', '~> 1.1' - spec.add_development_dependency 'rspec-activemodel-mocks', '~> 1.0' spec.add_development_dependency "capybara", '~> 2.4' spec.add_development_dependency 'capybara-maleficent', '~> 0.2' spec.add_development_dependency "chromedriver-helper" - spec.add_development_dependency "selenium-webdriver" - spec.add_development_dependency "factory_bot_rails", '~> 4.4' + spec.add_development_dependency 'database_cleaner', '~> 1.3' + spec.add_development_dependency 'engine_cart', '~> 1.2' spec.add_development_dependency "equivalent-xml", '~> 0.5' + spec.add_development_dependency "factory_bot_rails", '~> 4.4' + spec.add_development_dependency 'fcrepo_wrapper', '~> 0.5', '>= 0.5.1' spec.add_development_dependency "jasmine", '~> 2.3' + spec.add_development_dependency 'mida', '~> 0.3' + spec.add_development_dependency 'rspec-activemodel-mocks', '~> 1.0' + spec.add_development_dependency 'rspec-its', '~> 1.1' + spec.add_development_dependency 'rspec-rails', '~> 3.1' + spec.add_development_dependency "selenium-webdriver" + spec.add_development_dependency 'solr_wrapper', '~> 1.1' # Pin rubocop and rubocop-rspec tightly. Minor-level version bumps # in these gems cause Rubocop violations, and those violations cause # continuous integration builds to fail, and those failures prevent @@ -100,11 +98,11 @@ EOF # conventions. This allows us to take a managed approach to code # style -- we choose to update style when we wish, not when a # minor-level version bump in a dependency comes out. - spec.add_development_dependency 'rubocop', '~> 0.49.1' - spec.add_development_dependency 'rubocop-rspec', '~> 1.16.0' - spec.add_development_dependency 'shoulda-matchers', '~> 3.1' - spec.add_development_dependency 'rails-controller-testing', '~> 1' - spec.add_development_dependency 'webmock' spec.add_development_dependency 'i18n-debug' if ENV['I18N_DEBUG'] spec.add_development_dependency 'i18n_yaml_sorter' unless ENV['TRAVIS'] + spec.add_development_dependency 'rails-controller-testing', '~> 1' + spec.add_development_dependency 'rubocop', '~> 0.51.0' + spec.add_development_dependency 'rubocop-rspec', '~> 1.20.1' + spec.add_development_dependency 'shoulda-matchers', '~> 3.1' + spec.add_development_dependency 'webmock' end diff --git a/lib/generators/hyrax/assets_generator.rb b/lib/generators/hyrax/assets_generator.rb index 5cfb3b6d27..9f6d3e2ac1 100644 --- a/lib/generators/hyrax/assets_generator.rb +++ b/lib/generators/hyrax/assets_generator.rb @@ -1,5 +1,3 @@ -# -*- encoding : utf-8 -*- - require 'rails/generators' class Hyrax::AssetsGenerator < Rails::Generators::Base @@ -20,10 +18,10 @@ def inject_css def inject_js return if hyrax_javascript_installed? insert_into_file 'app/assets/javascripts/application.js', after: '//= require_tree .' do - <<-EOF.strip_heredoc + <<-JS.strip_heredoc //= require hyrax - EOF + JS end end diff --git a/lib/generators/hyrax/clamav_generator.rb b/lib/generators/hyrax/clamav_generator.rb index 261e8c4ee8..5de989b2fa 100644 --- a/lib/generators/hyrax/clamav_generator.rb +++ b/lib/generators/hyrax/clamav_generator.rb @@ -1,5 +1,3 @@ -# -*- encoding : utf-8 -*- - require 'rails/generators' class Hyrax::ClamavGenerator < Rails::Generators::Base diff --git a/lib/generators/hyrax/config_generator.rb b/lib/generators/hyrax/config_generator.rb index a7698e4d71..a845f69cdc 100644 --- a/lib/generators/hyrax/config_generator.rb +++ b/lib/generators/hyrax/config_generator.rb @@ -1,5 +1,3 @@ -# -*- encoding : utf-8 -*- - require 'rails/generators' class Hyrax::ConfigGenerator < Rails::Generators::Base diff --git a/lib/hyrax/configuration.rb b/lib/hyrax/configuration.rb index 99abdf4a68..aff708906c 100644 --- a/lib/hyrax/configuration.rb +++ b/lib/hyrax/configuration.rb @@ -79,8 +79,7 @@ def feature_config_path @feature_config_path ||= Rails.root.join('config', 'features.yml') end - attr_accessor :temp_file_base, :enable_local_ingest, - :analytics, :analytic_start_date + attr_accessor :temp_file_base, :enable_local_ingest attr_writer :display_microdata def display_microdata? @@ -266,6 +265,7 @@ def browse_everything? end attr_writer :analytics + attr_reader :analytics def analytics? @analytics ||= false end diff --git a/lib/hyrax/engine.rb b/lib/hyrax/engine.rb index e678fcdf3c..55e5c3e3de 100644 --- a/lib/hyrax/engine.rb +++ b/lib/hyrax/engine.rb @@ -34,7 +34,7 @@ class Engine < ::Rails::Engine begin Hyrax.config.persist_registered_roles! Rails.logger.info("Hyrax::Engine.after_initialize - persisting registered roles!") - rescue + rescue ActiveRecord::StatementInvalid message = "Hyrax::Engine.after_initialize - unable to persist registered roles.\n" message += "It is expected during the application installation - during integration tests, rails install.\n" message += "It is UNEXPECTED if you are booting up a Hyrax powered application via `rails server'" diff --git a/lib/tasks/default_admin_set.rake b/lib/tasks/default_admin_set.rake index bbfa3e5730..cc7d6da8cb 100644 --- a/lib/tasks/default_admin_set.rake +++ b/lib/tasks/default_admin_set.rake @@ -4,7 +4,7 @@ namespace :hyrax do task create: :environment do id = AdminSet.find_or_create_default_admin_set_id unless Hyrax::PermissionTemplate.find_by(admin_set_id: id) - $stderr.puts "ERROR: Default admin set exists but it does not have an " \ + warn "ERROR: Default admin set exists but it does not have an " \ "associated permission template.\n\nThis may happen if you cleared your " \ "database but you did not clear out Fedora and Solr.\n\n" \ "You could manually create the permission template in the rails console" \ diff --git a/spec/actors/hyrax/actors/model_actor_spec.rb b/spec/actors/hyrax/actors/model_actor_spec.rb index 5f9202a78c..31f6cca033 100644 --- a/spec/actors/hyrax/actors/model_actor_spec.rb +++ b/spec/actors/hyrax/actors/model_actor_spec.rb @@ -1,5 +1,3 @@ -# coding: utf-8 - module MusicalWork class Cover < ActiveFedora::Base end diff --git a/spec/controllers/catalog_controller_spec.rb b/spec/controllers/catalog_controller_spec.rb index bf59ba96ad..80d4891ee3 100644 --- a/spec/controllers/catalog_controller_spec.rb +++ b/spec/controllers/catalog_controller_spec.rb @@ -131,5 +131,5 @@ expect(assigns(:document_list).map(&:id)).to contain_exactly(work1[:id]) end end - end # describe "#index" + end end diff --git a/spec/controllers/hyrax/fixity_checks_controller_spec.rb b/spec/controllers/hyrax/fixity_checks_controller_spec.rb index 1d1dd039e6..28b861e8ea 100644 --- a/spec/controllers/hyrax/fixity_checks_controller_spec.rb +++ b/spec/controllers/hyrax/fixity_checks_controller_spec.rb @@ -21,7 +21,7 @@ # { file_id => [{ "checked_uri" => "...4-4d71-83ba-1bc52a5e4300/fcr:versions/version1", "passed" => true }, # { "checked_uri" => ".../version2", "passed" => false }, # ...] } - json_response.each do |_file_id, array_of_checks| + json_response.each_value do |array_of_checks| array_of_checks.each do |check_hash| expect(check_hash.keys).to include("file_set_id", "file_id", "checked_uri", "passed", "expected_result", "created_at") expect(check_hash["passed"]).to be_in([true, false]) diff --git a/spec/factories/permission_templates.rb b/spec/factories/permission_templates.rb index c9820ac39f..e9aa06928a 100644 --- a/spec/factories/permission_templates.rb +++ b/spec/factories/permission_templates.rb @@ -11,7 +11,7 @@ if admin_set_id.present? begin AdminSet.find(admin_set_id) - rescue + rescue ActiveFedora::ObjectNotFoundError create(:admin_set, id: admin_set_id) end else diff --git a/spec/features/admin_admin_set_spec.rb b/spec/features/admin_admin_set_spec.rb index 013b15b324..8f3bc7ac83 100644 --- a/spec/features/admin_admin_set_spec.rb +++ b/spec/features/admin_admin_set_spec.rb @@ -11,7 +11,7 @@ Hyrax::PermissionTemplate.create!(admin_set_id: admin_set.id) end - scenario do + it do login_as(user, scope: :user) visit '/dashboard' click_link "Administrative Sets" diff --git a/spec/features/admin_spec.rb b/spec/features/admin_spec.rb index dec2267496..18502eeb7d 100644 --- a/spec/features/admin_spec.rb +++ b/spec/features/admin_spec.rb @@ -17,7 +17,7 @@ create(:work_with_two_children, title: ["Work C"], admin_set_id: admin_set_2.id, edit_users: [user]) end - scenario do + it do login_as(user, scope: :user) visit '/dashboard' diff --git a/spec/features/batch_create_spec.rb b/spec/features/batch_create_spec.rb index b844156925..81494ba016 100644 --- a/spec/features/batch_create_spec.rb +++ b/spec/features/batch_create_spec.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -RSpec.feature 'Batch creation of works', type: :feature do +RSpec.describe 'Batch creation of works', type: :feature do let(:user) { create(:user) } before do diff --git a/spec/features/browse_catalog_spec.rb b/spec/features/browse_catalog_spec.rb index 88bc85587c..dbdea2ec55 100644 --- a/spec/features/browse_catalog_spec.rb +++ b/spec/features/browse_catalog_spec.rb @@ -1,5 +1,3 @@ -# coding: utf-8 - RSpec.describe "Browse catalog:", type: :feature do let!(:jills_work) do GenericWork.new do |work| diff --git a/spec/features/create_child_work_spec.rb b/spec/features/create_child_work_spec.rb index 23610fc994..f1503f4d37 100644 --- a/spec/features/create_child_work_spec.rb +++ b/spec/features/create_child_work_spec.rb @@ -1,6 +1,6 @@ require 'redlock' -RSpec.feature 'Creating a new child Work', :workflow do +RSpec.describe 'Creating a new child Work', :workflow do let(:user) { create(:user) } let!(:sipity_entity) do create(:sipity_entity, proxy_for_global_id: parent.to_global_id.to_s) diff --git a/spec/features/create_work_spec.rb b/spec/features/create_work_spec.rb index efdee887f6..bce19dabea 100644 --- a/spec/features/create_work_spec.rb +++ b/spec/features/create_work_spec.rb @@ -1,4 +1,4 @@ -RSpec.feature 'Creating a new Work', :js, :workflow do +RSpec.describe 'Creating a new Work', :js, :workflow do let(:user) { create(:user) } let(:file1) { File.open(fixture_path + '/world.png') } let(:file2) { File.open(fixture_path + '/image.jp2') } diff --git a/spec/features/dashboard/all_works.rb b/spec/features/dashboard/all_works.rb index 7ddf75080c..d246ad2e30 100644 --- a/spec/features/dashboard/all_works.rb +++ b/spec/features/dashboard/all_works.rb @@ -5,7 +5,7 @@ before do sign_in create(:admin) end - scenario do + it do visit '/dashboard/works' expect(page).to have_content 'Works' expect(page).to have_content 'Testing #1' diff --git a/spec/features/delete_work_spec.rb b/spec/features/delete_work_spec.rb index ac941ac511..c1ca2c2af3 100644 --- a/spec/features/delete_work_spec.rb +++ b/spec/features/delete_work_spec.rb @@ -1,4 +1,4 @@ -RSpec.feature 'Deleting a work', type: :feature do +RSpec.describe 'Deleting a work', type: :feature do let(:user) { create(:user) } let(:work) { build(:work, user: user) } let(:file_set) { create(:file_set, user: user, title: ['ABC123xyz']) } diff --git a/spec/features/edit_file_spec.rb b/spec/features/edit_file_spec.rb index 0ab250f965..6ed8b786b4 100644 --- a/spec/features/edit_file_spec.rb +++ b/spec/features/edit_file_spec.rb @@ -1,4 +1,4 @@ -RSpec.feature "Editing a file:", type: :feature do +RSpec.describe "Editing a file:", type: :feature do let(:user) { create(:user) } let(:file_title) { 'Some kind of title' } let(:work) { build(:work, user: user) } diff --git a/spec/features/edit_work_spec.rb b/spec/features/edit_work_spec.rb index 4417eb3203..0f78528440 100644 --- a/spec/features/edit_work_spec.rb +++ b/spec/features/edit_work_spec.rb @@ -1,4 +1,4 @@ -RSpec.feature 'Editing a work', type: :feature do +RSpec.describe 'Editing a work', type: :feature do let(:user) { create(:user) } let(:work) { build(:work, user: user) } diff --git a/spec/features/embargo_spec.rb b/spec/features/embargo_spec.rb index 3ceef6abae..6b8f5e9e2c 100644 --- a/spec/features/embargo_spec.rb +++ b/spec/features/embargo_spec.rb @@ -1,4 +1,4 @@ -RSpec.feature 'embargo' do +RSpec.describe 'embargo' do let(:user) { create(:user) } before do diff --git a/spec/features/homepage_spec.rb b/spec/features/homepage_spec.rb index 643b56ea46..5e6ee0269b 100644 --- a/spec/features/homepage_spec.rb +++ b/spec/features/homepage_spec.rb @@ -1,11 +1,11 @@ -RSpec.feature "The homepage" do +RSpec.describe "The homepage" do let(:work1) { create(:work, :public, title: ['Work 1']) } before do create(:featured_work, work_id: work1.id) end - scenario 'it shows featured works' do + it 'shows featured works' do visit root_path expect(page).to have_link "Work 1" end @@ -17,7 +17,7 @@ sign_in user end - scenario 'it shows featured works that I can sort' do + it 'shows featured works that I can sort' do visit root_path within '.dd-item' do expect(page).to have_link "Work 1" diff --git a/spec/features/lease_spec.rb b/spec/features/lease_spec.rb index 64a6447b92..95ea9f4f5a 100644 --- a/spec/features/lease_spec.rb +++ b/spec/features/lease_spec.rb @@ -1,4 +1,4 @@ -RSpec.feature 'leases' do +RSpec.describe 'leases' do let(:user) { create(:user) } before do diff --git a/spec/features/notifications_spec.rb b/spec/features/notifications_spec.rb index 25fdbe355e..324ceefc75 100644 --- a/spec/features/notifications_spec.rb +++ b/spec/features/notifications_spec.rb @@ -1,4 +1,4 @@ -RSpec.feature "Notifications page", type: :feature do +RSpec.describe "Notifications page", type: :feature do before do sign_in create(:user_with_mail) visit "/notifications" diff --git a/spec/features/ownership_transfer_spec.rb b/spec/features/ownership_transfer_spec.rb index 2dce4abcfe..86ed42da93 100644 --- a/spec/features/ownership_transfer_spec.rb +++ b/spec/features/ownership_transfer_spec.rb @@ -1,4 +1,4 @@ -RSpec.feature 'Transferring work ownership:', type: :feature do +RSpec.describe 'Transferring work ownership:', type: :feature do include Selectors::Dashboard include Selectors::NewTransfers include Selectors::Transfers diff --git a/spec/features/proxy_spec.rb b/spec/features/proxy_spec.rb index a8850a94db..7ba3564793 100644 --- a/spec/features/proxy_spec.rb +++ b/spec/features/proxy_spec.rb @@ -1,4 +1,4 @@ -RSpec.feature 'proxy', type: :feature do +RSpec.describe 'proxy', type: :feature do let(:user) { create(:user) } let(:second_user) { create(:user) } diff --git a/spec/features/search_spec.rb b/spec/features/search_spec.rb index 3078493131..6a97310668 100644 --- a/spec/features/search_spec.rb +++ b/spec/features/search_spec.rb @@ -1,4 +1,4 @@ -RSpec.feature 'searching' do +RSpec.describe 'searching' do let(:user) { create :user } let(:subject_value) { 'mustache' } let!(:work) do diff --git a/spec/features/static_pages_spec.rb b/spec/features/static_pages_spec.rb index e07e71f896..40c7e6449e 100644 --- a/spec/features/static_pages_spec.rb +++ b/spec/features/static_pages_spec.rb @@ -1,5 +1,5 @@ RSpec.describe "The static pages" do - scenario do + it do visit root_path click_link "About" click_link "Help" diff --git a/spec/features/users_spec.rb b/spec/features/users_spec.rb index b3957a8849..004e432326 100644 --- a/spec/features/users_spec.rb +++ b/spec/features/users_spec.rb @@ -1,4 +1,4 @@ -RSpec.feature "User Profile", type: :feature do +RSpec.describe "User Profile", type: :feature do before do sign_in user end diff --git a/spec/features/work_generator_spec.rb b/spec/features/work_generator_spec.rb index 180314e984..2684cd267c 100644 --- a/spec/features/work_generator_spec.rb +++ b/spec/features/work_generator_spec.rb @@ -1,7 +1,7 @@ require 'rails/generators' require 'redlock' -RSpec.feature 'Creating a new Work' do +RSpec.describe 'Creating a new Work' do before do Rails::Generators.invoke('hyrax:work', ['Catapult', '--quiet'], destination_root: Rails.root) load "#{EngineCart.destination}/app/indexers/catapult_indexer.rb" diff --git a/spec/features/work_show_spec.rb b/spec/features/work_show_spec.rb index 78f1689b8a..d60773de1a 100644 --- a/spec/features/work_show_spec.rb +++ b/spec/features/work_show_spec.rb @@ -1,4 +1,4 @@ -RSpec.feature "display a work as its owner" do +RSpec.describe "display a work as its owner" do let(:work_path) { "/concern/generic_works/#{work.id}" } before do diff --git a/spec/features/workflow_roles_spec.rb b/spec/features/workflow_roles_spec.rb index 2d568d3bcd..f20377e958 100644 --- a/spec/features/workflow_roles_spec.rb +++ b/spec/features/workflow_roles_spec.rb @@ -1,4 +1,4 @@ -RSpec.feature "Manage workflow roles", type: :feature do +RSpec.describe "Manage workflow roles", type: :feature do let(:user) { create(:admin) } let(:one_step_workflow) do { diff --git a/spec/features/workflow_state_changes_spec.rb b/spec/features/workflow_state_changes_spec.rb index b3b00eec8f..7beeceb189 100644 --- a/spec/features/workflow_state_changes_spec.rb +++ b/spec/features/workflow_state_changes_spec.rb @@ -1,4 +1,4 @@ -RSpec.feature "Workflow state changes", type: :feature do +RSpec.describe "Workflow state changes", type: :feature do let(:workflow_name) { 'with_comment' } let(:approving_user) { create(:admin) } let(:depositing_user) { create(:admin) } diff --git a/spec/indexers/hyrax/generic_work_indexer_spec.rb b/spec/indexers/hyrax/generic_work_indexer_spec.rb index d702fd4390..4524346a33 100644 --- a/spec/indexers/hyrax/generic_work_indexer_spec.rb +++ b/spec/indexers/hyrax/generic_work_indexer_spec.rb @@ -98,14 +98,14 @@ end describe "with a remote resource (based near)" do - mpls = < Minneapolis -EOF +RDFXML before do allow(service).to receive(:rdf_service).and_return(Hyrax::DeepIndexingService) diff --git a/spec/models/user_mailbox_spec.rb b/spec/models/user_mailbox_spec.rb index 56a93a16cd..1701db934f 100644 --- a/spec/models/user_mailbox_spec.rb +++ b/spec/models/user_mailbox_spec.rb @@ -1,5 +1,3 @@ -# coding: utf-8 - RSpec.describe UserMailbox do let(:user) { create(:user) } let(:another_user) { create(:user) } diff --git a/spec/views/_flash_msg.html.erb_spec.rb b/spec/views/_flash_msg.html.erb_spec.rb index 515789abad..7c99c01bc3 100644 --- a/spec/views/_flash_msg.html.erb_spec.rb +++ b/spec/views/_flash_msg.html.erb_spec.rb @@ -1,5 +1,3 @@ -# coding: utf-8 - RSpec.describe '/_flash_msg.html.erb', type: :view do before do allow(view).to receive(:flash).and_return(flash) diff --git a/spec/views/_user_util_links.html.erb_spec.rb b/spec/views/_user_util_links.html.erb_spec.rb index 54760b015c..edc02686c2 100644 --- a/spec/views/_user_util_links.html.erb_spec.rb +++ b/spec/views/_user_util_links.html.erb_spec.rb @@ -1,5 +1,3 @@ -# coding: utf-8 - RSpec.describe '/_user_util_links.html.erb', type: :view do let(:join_date) { 5.days.ago } let(:can_create_file) { true }