Updated tests for jsonapi_indifferent_hash. Closes #18

Author: sa73917

.rubocop.yml

@@ -6,3 +6,10 @@ Style/FrozenStringLiteralComment:
 
 Style/Documentation:
   Enabled: false
+
+Metrics/BlockLength:
+  Exclude:
+    - 'spec/*/*_spec.rb'
+
+Style/IfUnlessModifier:
+  Enabled: false

lib/jsonapi/rspec/jsonapi_object.rb

@@ -4,8 +4,9 @@ module JsonapiObject
       ::RSpec::Matchers.define :have_jsonapi_object do |val|
         match do |actual|
           actual = JSONAPI::RSpec.as_indifferent_hash(actual)
-          actual.key?('jsonapi') &&
-            (!val || actual['jsonapi'] == val)
+          val = JSONAPI::RSpec.as_indifferent_hash(val)
+
+          actual.key?('jsonapi') && (!val || actual['jsonapi'] == val)
         end
       end
     end

lib/jsonapi/rspec/meta.rb

@@ -4,8 +4,9 @@ module Meta
       ::RSpec::Matchers.define :have_meta do |val|
         match do |actual|
           actual = JSONAPI::RSpec.as_indifferent_hash(actual)
-          actual.key?('meta') &&
-            (!val || actual['meta'] == val)
+          val = JSONAPI::RSpec.as_indifferent_hash(val)
+
+          actual.key?('meta') && (!val || actual['meta'] == val)
         end
       end
     end

lib/jsonapi/rspec/relationships.rb

@@ -11,7 +11,7 @@ module Relationships
 
         chain :with_data do |val|
           @data_set = true
-          @data_val = val
+          @data_val = JSONAPI::RSpec.as_indifferent_hash(val)
         end
 
         failure_message do |actual|
@@ -29,7 +29,7 @@ module Relationships
           actual = JSONAPI::RSpec.as_indifferent_hash(actual)
           return false unless actual.key?('relationships')
 
-          rels.all? { |rel| actual['relationships'].key?(rel) }
+          rels.map(&:to_s).all? { |rel| actual['relationships'].key?(rel) }
         end
       end
     end

spec/jsonapi/jsonapi_object_spec.rb

@@ -12,6 +12,16 @@
   end
 
   context 'when providing a value' do
+    context 'with jsonapi indifferent hash enabled' do
+      before(:all) { ::RSpec.configuration.jsonapi_indifferent_hash = true }
+      after(:all) { ::RSpec.configuration.jsonapi_indifferent_hash = false }
+
+      it do
+        expect('jsonapi' => { 'version' => '1.0' })
+          .to have_jsonapi_object(version: '1.0')
+      end
+    end
+
     it 'succeeds when jsonapi object matches' do
       expect('jsonapi' => { 'version' => '1.0' })
         .to have_jsonapi_object('version' => '1.0')

spec/jsonapi/meta_spec.rb

@@ -12,6 +12,15 @@
   end
 
   context 'when providing a value' do
+    context 'with jsonapi indifferent hash enabled' do
+      before(:all) { ::RSpec.configuration.jsonapi_indifferent_hash = true }
+      after(:all) { ::RSpec.configuration.jsonapi_indifferent_hash = false }
+
+      it do
+        expect('meta' => { 'foo' => 'bar' }).to have_meta(foo: :bar)
+      end
+    end
+
     it 'succeeds when meta matches' do
       expect('meta' => { foo: 'bar' }).to have_meta(foo: 'bar')
     end

spec/jsonapi/relationships_spec.rb

@@ -1,50 +1,60 @@
-RSpec.describe JSONAPI::RSpec do
-  json_doc =
+require 'spec_helper'
+
+RSpec.describe JSONAPI::RSpec, '#have_relationship(s)' do
+  let(:doc) do
     {
       'relationships' => {
-        'posts' => {
-          'data' => {
-            'id' => '1',
-            'type' => 'posts'
-          }
+        'user' => {
+          'data' => { 'id' => '1', 'type' => 'user' }
         },
         'comments' => {
-          'data' => [{
-            'id' => '1',
-            'type' => 'posts'
-          }, {
-            'id' => '2',
-            'type' => 'hides'
-          }]
+          'data' => [
+            { 'id' => '1', 'type' => 'comment' },
+            { 'id' => '2', 'type' => 'comment' }
+          ]
         }
       }
     }
+  end
 
-  describe '#have_relationship' do
-    context 'when relationships is present' do
-      it { expect(json_doc).to have_relationship('posts') }
-      it { expect(json_doc).not_to have_relationship('mails') }
-      it { expect(json_doc).to have_relationship('posts').with_data({ 'id' => '1', 'type' => 'posts' }) }
-      it do
-        expect(json_doc).to have_relationship('comments').with_data(
-          [{ 'id' => '1', 'type' => 'posts' }, { 'id' => '2', 'type' => 'hides' }]
-        )
-      end
-    end
+  it { expect(doc).not_to have_relationships('user', 'comments', 'authors') }
+  it { expect(doc).to have_relationships('user', 'comments') }
 
-    context 'when relationships is not present' do
-      it { expect({}).not_to have_relationship('posts') }
-    end
+  it { expect(doc).not_to have_relationship('authors') }
+  it { expect(doc).to have_relationship('user') }
+
+  it do
+    expect(doc).to have_relationship('user').with_data(
+      { 'id' => '1', 'type' => 'user' }
+    )
   end
 
-  describe '#have_relationships' do
-    context 'when relationships is present' do
-      it { expect(json_doc).to have_relationships('posts', 'comments') }
-      it { expect(json_doc).not_to have_relationships('posts', 'comments', 'mails') }
+  it do
+    expect(doc).to have_relationship('comments').with_data(
+      [
+        { 'id' => '1', 'type' => 'comment' },
+        { 'id' => '2', 'type' => 'comment' }
+      ]
+    )
+  end
+
+  context 'with jsonapi indifferent hash enabled' do
+    before(:all) { ::RSpec.configuration.jsonapi_indifferent_hash = true }
+    after(:all) { ::RSpec.configuration.jsonapi_indifferent_hash = false }
+
+    it { expect(doc).to have_relationships(:user, :comments) }
+
+    it do
+      expect(doc).to have_relationship('user').with_data(id: '1', type: :user)
     end
 
-    context 'when relationships is not present' do
-      it { expect({}).not_to have_relationships('posts', 'comments') }
+    it do
+      expect(doc).to have_relationship('comments').with_data(
+        [
+          { id: '1', type: 'comment' },
+          { id: '2', type: 'comment' }
+        ]
+      )
     end
   end
 end