Make linter happy.

Replace the sugared rspec helpers with core matchers.

Author: stas

.rubocop.yml

@@ -13,3 +13,8 @@ Metrics/BlockLength:
 
 Style/IfUnlessModifier:
   Enabled: false
+
+Metrics/BlockLength:
+  Max: 35
+  Exclude:
+    - 'spec/*/*_spec.rb'

lib/jsonapi/rspec/attributes.rb

@@ -5,7 +5,7 @@ module Attributes
         match do |actual|
           actual = JSONAPI::RSpec.as_indifferent_hash(actual)
           @attributes_node = actual['attributes']
-          
+
           return false unless @attributes_node
 
           @has_attribute = @attributes_node.key?(attr.to_s)
@@ -34,11 +34,13 @@ module Attributes
           result
         end
 
-        failure_message do |actual|
+        failure_message do |_actual|
           if @has_attribute
-            "expected `#{attr}` attribute to have value `#{@expected}` but was `#{@actual}`"
+            "expected `#{attr}` attribute " \
+              "to have value `#{@expected}` but was `#{@actual}`"
           else
-            "expected attributes to include `#{attr}`. Actual attributes were #{@attributes_node.keys}"
+            "expected attributes to include `#{attr}`. " \
+              "Actual attributes were #{@attributes_node.keys}"
           end
         end
 

spec/jsonapi/attributes_spec.rb

@@ -20,21 +20,28 @@
     it { expect(doc).to have_attribute(:six).with_value(foo: 'bar') }
 
     it 'rejects with an appropriate failure message' do
-      expect {
-        expect(doc).to have_attribute(:three)
-      }.to fail_with('expected attributes to include `three`. Actual attributes were ["one", "two", "four", "six"]')
+      expect { expect(doc).to have_attribute(:three) }
+        .to raise_error(
+          RSpec::Expectations::ExpectationNotMetError,
+          'expected attributes to include `three`. ' \
+          'Actual attributes were ["one", "two", "four", "six"]'
+        )
     end
 
-    it 'rejects with an appropriate failure message for chained with_value, simple values' do
-      expect {
-        expect(doc).to have_attribute(:one).with_value(2)
-      }.to fail_with('expected `one` attribute to have value `2` but was `1`')
+    it 'fails with a failure message for chained with_value' do
+      expect { expect(doc).to have_attribute(:one).with_value(2) }
+        .to raise_error(
+          RSpec::Expectations::ExpectationNotMetError,
+          /expected `one` attribute to have value `2` but was `1`/m
+        )
     end
 
-    it 'rejects with an appropriate failure message for chained with_value, complex values show diff' do
-      expect {
-        expect(doc).to have_attribute(:six).with_value(bar: 'baz')
-      }.to fail_with(/expected `six` attribute to have value `{:bar=>"baz"}` but was `{:foo=>"bar"}`.*Diff:/m)
+    it 'fails with a failure message and diff for chained with_value' do
+      expect { expect(doc).to have_attribute(:six).with_value(bar: 'baz') }
+        .to raise_error(
+          RSpec::Expectations::ExpectationNotMetError,
+          /expected `six` .* `{:bar=>"baz"}` but was `{:foo=>"bar"}`.*Diff:/m
+        )
     end
   end
 

spec/spec_helper.rb

@@ -6,27 +6,8 @@
 end
 SimpleCov.minimum_coverage 90
 
-module FailMatchers
-  def fail
-    raise_error(RSpec::Expectations::ExpectationNotMetError)
-  end
-
-  def fail_with(message)
-    raise_error(RSpec::Expectations::ExpectationNotMetError, message)
-  end
-
-  def fail_including(snippet)
-    raise_error(
-      RSpec::Expectations::ExpectationNotMetError,
-      a_string_including(snippet)
-    )
-  end
-end
-
 # See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
 RSpec.configure do |config|
-  config.include FailMatchers
-
   config.expect_with :rspec do |expectations|
     expectations.include_chain_clauses_in_custom_matcher_descriptions = true
   end