Fix issue with nil @request when record is not found

Author: tiagopog

lib/jsonapi/utils.rb

@@ -42,6 +42,7 @@ def jsonapi_render_bad_request
     end
 
     def jsonapi_render_not_found
+      setup_request
       id = extract_ids(@request.params)
       jsonapi_render_errors(JSONAPI::Exceptions::RecordNotFound.new(id))
     end

spec/support/shared/request_with_error.rb

@@ -41,39 +41,30 @@
     end
   end
 
-  if options[:action] == :index
-    context 'when error is at "filter" param' do
-      options.merge!(
-        params: { filter: { foo: 'bar' } },
-        expect: { title: 'Filter not allowed', code: 102 }
-      )
-      it_behaves_like '400 response', options
-    end
+  context 'when error is at "filter" param' do
+    options.merge!(
+      params: { filter: { foo: 'bar' } },
+      expect: { title: 'Filter not allowed', code: 102 }
+    )
+    it_behaves_like '400 response', options
+  end
 
-    context 'when error is at "sort" param' do
-      options.merge!(
-        params: { sort: 'foo' },
-        expect: { title: 'Invalid sort criteria', code: 114 }
-      )
-      it_behaves_like '400 response', options
-    end
+  context 'when error is at "sort" param' do
+    options.merge!(
+      params: { sort: 'foo' },
+      expect: { title: 'Invalid sort criteria', code: 114 }
+    )
+    it_behaves_like '400 response', options
+  end
 
-    context 'when error is at "page" param' do
-      %i(number size).each do |field|
-        context 'with invalid "number"' do
-          options.merge!(
-            params: { page: { "#{field}": 'foo' } },
-            expect: { title: 'Invalid page value', code: 118 }
-          )
-          it_behaves_like '400 response', options
-        end
-      end
-    end
-  elsif !options[:record].nil?
-    context 'with a not found record' do
-      it 'renders 404 response' do
-        get :show, options[:record]
-        expect(response).to have_http_status :not_found
+  context 'when error is at "page" param' do
+    %i(number size).each do |field|
+      context 'with invalid "number"' do
+        options.merge!(
+          params: { page: { "#{field}": 'foo' } },
+          expect: { title: 'Invalid page value', code: 118 }
+        )
+        it_behaves_like '400 response', options
       end
     end
   end

spec/support/shared/rest/show.rb

@@ -1,6 +1,16 @@
 require 'spec_helper'
 
 shared_examples_for 'JSON API #show action' do |options|
+  context 'when invalid' do
+    context 'when not found' do
+      it 'renders 404 response' do
+        options[:params] ||= {}
+        get :show, options[:params].merge(id: 9999)
+        expect(response).to have_http_status :not_found
+      end
+    end
+  end
+
   context 'when valid' do
     after(:each) { expect(response).to have_http_status :ok }