Merge 1a9949e into 0220e6d

.rubocop.yml

@@ -204,10 +204,8 @@ Style/FileName:
     - 'spec/samples/hydra-mods_article_datastream.rb'
 
 Style/ZeroLengthPredicate:
-  Enabled: false # https://github.com/bbatsov/rubocop/issues/2782
-
-Performance/RedundantMerge:
-  Enabled: false # https://github.com/bbatsov/rubocop/issues/2781
+  Exclude:
+    - 'lib/active_fedora/file/attributes.rb'
 
 Rails:
   Enabled: true
@@ -222,6 +220,9 @@ Rails/Date:
 Rails/TimeZone:
   Enabled: false
 
+RSpec/AnyInstance:
+  Enabled: false
+
 RSpec/ExampleWording:
   CustomTransform:
     be: is
@@ -244,3 +245,6 @@ RSpec/DescribeClass:
 RSpec/DescribedClass:
   Exclude:
     - 'spec/unit/finder_methods_spec.rb'
+
+RSpec/NotToNot:
+  Enabled: false

active-fedora.gemspec

@@ -33,8 +33,8 @@ Gem::Specification.new do |s|
   s.add_development_dependency "rspec-its"
   s.add_development_dependency "equivalent-xml"
   s.add_development_dependency "simplecov", '~> 0.7.1'
-  s.add_development_dependency "rubocop", '~> 0.34'
-  s.add_development_dependency "rubocop-rspec", '~> 1.3.1'
+  s.add_development_dependency "rubocop", '~> 0.37'
+  s.add_development_dependency "rubocop-rspec", '~> 1.4'
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {spec}/*`.split("\n")

spec/integration/scoped_query_spec.rb

@@ -39,7 +39,7 @@ def to_solr(doc = {})
         result = ModelIntegrationSpec::Basic.all.to_a
         expect(result).to be_instance_of(Array)
         # this test is meaningless if the array length is zero
-        expect(result.length > 0).to be true
+        expect(result.length).to be > 0
         expect(result).to all(be_an(ModelIntegrationSpec::Basic))
       end
     end