Skip to content

Commit

Permalink
Upgrade Hyrax to 2.0.2 and upgrade gems with security vulnerabilities (
Browse files Browse the repository at this point in the history
…#1519)

* update hyrax to 2.0.2

* update rspec, rspec-rails and loofah bc of security alerts

* rubocop changes
  • Loading branch information
Julie Allinson authored Mar 22, 2018
1 parent 374eec1 commit 116d4b9
Show file tree
Hide file tree
Showing 91 changed files with 526 additions and 327 deletions.
6 changes: 3 additions & 3 deletions .rubocop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,10 @@ Metrics/LineLength:
- 'spec/services/iiif_work_thumbnail_path_service_spec.rb'
- 'spec/routing/proprietor/accounts_routing_spec.rb'

Style/IndentationConsistency:
Layout/IndentationConsistency:
EnforcedStyle: rails

Style/DotPosition:
Layout/DotPosition:
EnforcedStyle: leading

Style/Documentation:
Expand Down Expand Up @@ -114,4 +114,4 @@ Metrics/BlockLength:
Exclude:
- 'spec/**/*.rb'
- 'lib/tasks/*.rake'
- 'app/controllers/catalog_controller.rb'
- 'app/controllers/catalog_controller.rb'
65 changes: 65 additions & 0 deletions .rubocop_todo.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,3 +50,68 @@ RSpec/LetSetup:
RSpec/NestedGroups:
Exclude:
- 'spec/services/iiif_authorization_service_spec.rb'

RSpec/ContextWording:
Enabled: false

RSpec/IteratedExpectation:
Exclude:
- 'spec/tasks/rake_spec.rb'

RSpec/BeforeAfterAll:
Exclude:
- 'spec/tasks/rake_spec.rb'
- 'spec/models/uploaded_file_spec.rb'

Style/MixinUsage:
Exclude:
- 'spec/support/devise.rb'
- 'spec/features/create_image_spec.rb'

RSpec/ScatteredLet:
Enabled: false

RSpec/HookArgument:
Exclude:
- 'spec/rails_helper.rb'
- 'spec/models/uploaded_file_spec.rb'

RSpec/ExpectInHook:
Exclude:
- 'spec/models/uploaded_file_spec.rb'
- 'spec/controllers/sites_controller_spec.rb'

Style/FormatStringToken:
Exclude:
- 'spec/models/account_spec.rb'
- 'app/models/account.rb'

Rails/ApplicationJob:
Enabled: false

Rails/ApplicationRecord:
Enabled: false

RSpec/BeforeAfterAll:
Exclude:
- 'spec/models/hyku/group_spec.rb'
- 'spec/tasks/rake_spec.rb'
- 'spec/models/uploaded_file_spec.rb'

Naming/HeredocDelimiterNaming:
Exclude:
- 'spec/jobs/import_work_from_purl_job_spec.rb'

Rails/HasManyOrHasOneDependent:
Exclude:
- 'app/models/endpoint.rb'

FactoryBot/DynamicAttributeDefinedStatically:
Exclude:
- 'spec/factories/users.rb'

Performance/RegexpMatch:
Exclude:
- 'lib/importer/csv_parser.rb'
- 'app/services/solr_config_uploader.rb'
- 'app/models/account.rb'
6 changes: 3 additions & 3 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,8 @@ group :development, :test do
gem 'fcrepo_wrapper', '~> 0.4'
gem 'solr_wrapper', '~> 1.0'

gem 'rubocop', '~> 0.47.0'
gem 'rubocop-rspec', '~> 1.10.0'
gem 'rubocop', '~> 0.50', '<= 0.52.1'
gem 'rubocop-rspec', '~> 1.22', '<= 1.22.2'
end

group :test do
Expand All @@ -74,7 +74,7 @@ end

gem 'blacklight', '~> 6.7'

gem 'hyrax', '2.0.0'
gem 'hyrax', '2.0.2'
gem 'rsolr', '~> 2.0'

gem 'devise'
Expand Down
Loading

0 comments on commit 116d4b9

Please sign in to comment.