Merge pull request #232 from cerebris/extend_tests

Extend tests

Author: dgeb

lib/jsonapi/operation.rb

@@ -18,7 +18,7 @@ class FindOperation < Operation
     def initialize(resource_klass, options = {})
       @filters = options[:filters]
       @include_directives = options[:include_directives]
-      @sort_criteria = options[:sort_criteria]
+      @sort_criteria = options.fetch(:sort_criteria, [])
       @paginator = options[:paginator]
       super(resource_klass, false)
     end
@@ -42,7 +42,7 @@ class ShowOperation < Operation
 
     def initialize(resource_klass, options = {})
       @id = options.fetch(:id)
-      @include_directives = options.fetch(:include_directives)
+      @include_directives = options[:include_directives]
       @transactional = false
       super(resource_klass, options)
     end
@@ -113,9 +113,9 @@ def initialize(resource_klass, options = {})
       @source_klass = options.fetch(:source_klass)
       @source_id = options.fetch(:source_id)
       @association_type = options.fetch(:association_type)
-      @filters = options.fetch(:filters)
-      @sort_criteria = options.fetch(:sort_criteria)
-      @paginator = options.fetch(:paginator)
+      @filters = options[:filters]
+      @sort_criteria = options[:sort_criteria]
+      @paginator = options[:paginator]
       @transactional = false
       super(resource_klass, options)
     end

lib/jsonapi/resource.rb

@@ -332,18 +332,22 @@ def apply_filter(records, filter, value)
 
       def apply_filters(records, filters)
         required_includes = []
-        filters.each do |filter, value|
-          if _associations.include?(filter)
-            if _associations[filter].is_a?(JSONAPI::Association::HasMany)
-              required_includes.push(filter)
-              records = apply_filter(records, "#{filter}.#{_associations[filter].primary_key}", value)
+
+        if filters
+          filters.each do |filter, value|
+            if _associations.include?(filter)
+              if _associations[filter].is_a?(JSONAPI::Association::HasMany)
+                required_includes.push(filter)
+                records = apply_filter(records, "#{filter}.#{_associations[filter].primary_key}", value)
+              else
+                records = apply_filter(records, "#{_associations[filter].foreign_key}", value)
+              end
             else
-              records = apply_filter(records, "#{_associations[filter].foreign_key}", value)
+              records = apply_filter(records, filter, value)
             end
-          else
-            records = apply_filter(records, filter, value)
           end
         end
+
         if required_includes.any?
           records.includes(required_includes)
         elsif records.respond_to? :to_ary
@@ -520,6 +524,8 @@ def module_path
       end
 
       def construct_order_options(sort_params)
+        return {} unless sort_params
+
         sort_params.each_with_object({}) { |sort, order_hash|
           field = sort[:field] == 'id' ? _primary_key : sort[:field]
           order_hash[field] = sort[:direction]

lib/jsonapi/response_document.rb

@@ -4,7 +4,7 @@ def initialize(operation_results, options = {})
       @operation_results = operation_results
       @options = options
 
-      @key_formatter = @options.fetch(:key_formatter)
+      @key_formatter = @options.fetch(:key_formatter, JSONAPI.configuration.key_formatter)
     end
 
     def contents
@@ -29,12 +29,12 @@ def status
     def serializer
       @serializer ||= JSONAPI::ResourceSerializer.new(
         @options.fetch(:primary_resource_klass),
-        include: @options.fetch(:include),
-        include_directives: @options.fetch(:include_directives),
-        fields: @options.fetch(:fields),
-        base_url: @options.fetch(:base_url),
+        include: @options.fetch(:include, []),
+        include_directives: @options[:include_directives],
+        fields: @options[:fields],
+        base_url: @options.fetch(:base_url, ''),
         key_formatter: @key_formatter,
-        route_formatter: @options.fetch(:route_formatter)
+        route_formatter: @options.fetch(:route_formatter, JSONAPI.configuration.route_formatter)
       )
     end
 

test/unit/operation/operations_processor_test.rb

@@ -351,4 +351,156 @@ def test_rollback_from_error
     assert_equal(:no_content, operation_results.results[1].code)
     assert_equal(404, operation_results.results[2].code)
   end
+
+  def test_show_operation
+    op = JSONAPI::OperationsProcessor.new
+
+    operations = [
+      JSONAPI::ShowOperation.new(PlanetResource, {id: '1'})
+    ]
+
+    request = JSONAPI::Request.new
+    request.operations = operations
+
+    operation_results = op.process(request)
+
+    assert_kind_of(JSONAPI::OperationResults, operation_results)
+    assert_equal(operation_results.results.size, 1)
+    refute operation_results.has_errors?
+  end
+
+  def test_show_operation_error
+    op = JSONAPI::OperationsProcessor.new
+
+    operations = [
+      JSONAPI::ShowOperation.new(PlanetResource, {id: '145'})
+    ]
+
+    request = JSONAPI::Request.new
+    request.operations = operations
+
+    operation_results = op.process(request)
+
+    assert_kind_of(JSONAPI::OperationResults, operation_results)
+    assert_equal(operation_results.results.size, 1)
+    assert operation_results.has_errors?
+  end
+
+  def test_show_association_operation
+    op = JSONAPI::OperationsProcessor.new
+
+    operations = [
+      JSONAPI::ShowAssociationOperation.new(PlanetResource, {parent_key: '1', association_type: :planet_type})
+    ]
+
+    request = JSONAPI::Request.new
+    request.operations = operations
+
+    operation_results = op.process(request)
+
+    assert_kind_of(JSONAPI::OperationResults, operation_results)
+    assert_equal(operation_results.results.size, 1)
+    refute operation_results.has_errors?
+  end
+
+  def test_show_association_operation_error
+    op = JSONAPI::OperationsProcessor.new
+
+    operations = [
+      JSONAPI::ShowAssociationOperation.new(PlanetResource, {parent_key: '145', association_type: :planet_type})
+    ]
+
+    request = JSONAPI::Request.new
+    request.operations = operations
+
+    operation_results = op.process(request)
+
+    assert_kind_of(JSONAPI::OperationResults, operation_results)
+    assert_equal(operation_results.results.size, 1)
+    assert operation_results.has_errors?
+  end
+
+  def test_show_related_resource_operation
+    op = JSONAPI::OperationsProcessor.new
+
+    operations = [
+      JSONAPI::ShowRelatedResourceOperation.new(PlanetResource,
+                                                {
+                                                  source_klass: PlanetResource,
+                                                  source_id: '1',
+                                                  association_type: :planet_type})
+    ]
+
+    request = JSONAPI::Request.new
+    request.operations = operations
+
+    operation_results = op.process(request)
+
+    assert_kind_of(JSONAPI::OperationResults, operation_results)
+    assert_equal(operation_results.results.size, 1)
+    refute operation_results.has_errors?
+  end
+
+  def test_show_related_resource_operation_error
+    op = JSONAPI::OperationsProcessor.new
+
+    operations = [
+      JSONAPI::ShowRelatedResourceOperation.new(PlanetResource,
+                                                {
+                                                  source_klass: PlanetResource,
+                                                  source_id: '145',
+                                                  association_type: :planet_type})
+    ]
+
+    request = JSONAPI::Request.new
+    request.operations = operations
+
+    operation_results = op.process(request)
+
+    assert_kind_of(JSONAPI::OperationResults, operation_results)
+    assert_equal(operation_results.results.size, 1)
+    assert operation_results.has_errors?
+  end
+
+  def test_show_related_resources_operation
+    op = JSONAPI::OperationsProcessor.new
+
+    operations = [
+      JSONAPI::ShowRelatedResourcesOperation.new(PlanetResource,
+                                                {
+                                                  source_klass: PlanetResource,
+                                                  source_id: '1',
+                                                  association_type: :moons})
+    ]
+
+    request = JSONAPI::Request.new
+    request.operations = operations
+
+    operation_results = op.process(request)
+
+    assert_kind_of(JSONAPI::OperationResults, operation_results)
+    assert_equal(operation_results.results.size, 1)
+    refute operation_results.has_errors?
+  end
+
+  def test_show_related_resources_operation_error
+    op = JSONAPI::OperationsProcessor.new
+
+    operations = [
+      JSONAPI::ShowRelatedResourcesOperation.new(PlanetResource,
+                                                {
+                                                  source_klass: PlanetResource,
+                                                  source_id: '145',
+                                                  association_type: :moons})
+    ]
+
+    request = JSONAPI::Request.new
+    request.operations = operations
+
+    operation_results = op.process(request)
+
+    assert_kind_of(JSONAPI::OperationResults, operation_results)
+    assert_equal(operation_results.results.size, 1)
+    assert operation_results.has_errors?
+  end
 end

test/unit/resource/resource_test.rb

@@ -144,7 +144,9 @@ def test_has_many_association_filters
     # define apply_filters method on post resource to not respect filters
     PostResource.instance_eval do
       def apply_filters(records, filters)
+        # :nocov:
         records
+        # :nocov:
       end
     end
 
@@ -154,7 +156,9 @@ def apply_filters(records, filters)
     # reset method to original implementation
     PostResource.instance_eval do
       def apply_filters(records, filters)
+        # :nocov:
         super
+        # :nocov:
       end
     end
   end
@@ -167,7 +171,9 @@ def test_has_many_association_sorts
     # define apply_filters method on post resource to not respect filters
     PostResource.instance_eval do
       def apply_sort(records, criteria)
+        # :nocov:
         records
+        # :nocov:
       end
     end
 
@@ -177,7 +183,9 @@ def apply_sort(records, criteria)
     # reset method to original implementation
     PostResource.instance_eval do
       def apply_sort(records, criteria)
+        # :nocov:
         super
+        # :nocov:
       end
     end
   end
@@ -190,7 +198,9 @@ def test_has_many_association_pagination
     # define apply_filters method on post resource to not respect filters
     PostResource.instance_eval do
       def apply_pagination(records, criteria, order_options)
+        # :nocov:
         records
+        # :nocov:
       end
     end
 
@@ -211,7 +221,9 @@ def apply(relation, order_options)
     # reset method to original implementation
     PostResource.instance_eval do
       def apply_pagination(records, criteria, order_options)
+        # :nocov:
         super
+        # :nocov:
       end
     end
   end

test/unit/serializer/response_document_test.rb

@@ -0,0 +1,61 @@
+require File.expand_path('../../../test_helper', __FILE__)
+require 'jsonapi-resources'
+require 'json'
+
+class ResponseDocumentTest < ActionDispatch::IntegrationTest
+  def setup
+    JSONAPI.configuration.json_key_format = :dasherized_key
+    JSONAPI.configuration.route_format = :dasherized_route
+  end
+
+  def create_response_document(operation_results, resource_klass)
+    JSONAPI::ResponseDocument.new(
+      operation_results,
+      {
+        primary_resource_klass: resource_klass
+      }
+    )
+  end
+
+  def test_response_document
+    operations = [
+      JSONAPI::CreateResourceOperation.new(PlanetResource, data: {attributes: {'name' => 'Earth 2.0'}}),
+      JSONAPI::CreateResourceOperation.new(PlanetResource, data: {attributes: {'name' => 'Vulcan'}})
+    ]
+
+    request = JSONAPI::Request.new
+    request.operations = operations
+
+    op = BasicOperationsProcessor.new()
+    operation_results = op.process(request)
+
+    response_doc = create_response_document(operation_results, PlanetResource)
+
+    assert_equal :created, response_doc.status
+    contents = response_doc.contents
+    assert contents.is_a?(Hash)
+    assert contents[:data].is_a?(Array)
+    assert_equal 2, contents[:data].size
+  end
+
+  def test_response_document_multiple_find
+    operations = [
+      JSONAPI::FindOperation.new(PostResource, filters: {id: '1'}),
+      JSONAPI::FindOperation.new(PostResource, filters: {id: '2'})
+    ]
+
+    request = JSONAPI::Request.new
+    request.operations = operations
+
+    op = ActiveRecordOperationsProcessor.new()
+    operation_results = op.process(request)
+
+    response_doc = create_response_document(operation_results, PostResource)
+
+    assert_equal :ok, response_doc.status
+    contents = response_doc.contents
+    assert contents.is_a?(Hash)
+    assert contents[:data].is_a?(Array)
+    assert_equal 2, contents[:data].size
+  end
+end