Merge pull request #105 from inertiajs/broken-have-exact-props

Fix `have_exact_props` RSpec matcher.

Author: bknoles

lib/inertia_rails/inertia_rails.rb

@@ -14,8 +14,7 @@ def self.configure
   # "Getters"
   def self.shared_data(controller)
     shared_plain_data.
-      merge!(evaluated_blocks(controller, shared_blocks)).
-      with_indifferent_access
+      merge!(evaluated_blocks(controller, shared_blocks))
   end
 
   def self.version

lib/inertia_rails/renderer.rb

@@ -12,7 +12,7 @@ def initialize(component, controller, request, response, render_method, props: n
       @request = request
       @response = response
       @render_method = render_method
-      @props = props ? props.with_indifferent_access : controller.inertia_view_assigns.with_indifferent_access
+      @props = props ? props : controller.inertia_view_assigns
       @view_data = view_data || {}
       @deep_merge = !deep_merge.nil? ? deep_merge : InertiaRails.deep_merge_shared_data?
     end
@@ -43,15 +43,25 @@ def layout
     end
 
     def computed_props
-      _props = ::InertiaRails.shared_data(@controller).send(prop_merge_method, @props).select do |key, prop|
+      # Cast props to symbol keyed hash before merging so that we have a consistent data structure and
+      # avoid duplicate keys after merging.
+      #
+      # Functionally, this permits using either string or symbol keys in the controller. Since the results
+      # is cast to json, we should treat string/symbol keys as identical.
+      _props = ::InertiaRails.shared_data(@controller).deep_symbolize_keys.send(prop_merge_method, @props.deep_symbolize_keys).select do |key, prop|
         if rendering_partial_component?
-          key.to_sym.in? partial_keys
+          key.in? partial_keys
         else
           !prop.is_a?(InertiaRails::Lazy)
         end
       end
 
-      deep_transform_values(_props, lambda {|prop| prop.respond_to?(:call) ? @controller.instance_exec(&prop) : prop }).with_indifferent_access
+      deep_transform_values(
+        _props,
+        lambda do |prop|
+          prop.respond_to?(:call) ? @controller.instance_exec(&prop) : prop
+        end
+      )
     end
 
     def page

lib/inertia_rails/rspec.rb

@@ -74,7 +74,8 @@ def inertia_tests_setup?
 
 RSpec::Matchers.define :have_exact_props do |expected_props|
   match do |inertia|
-    expect(inertia.props).to eq expected_props.with_indifferent_access
+  # Computed props have symbolized keys. 
+    expect(inertia.props).to eq expected_props.deep_symbolize_keys
   end
 
   failure_message do |inertia|
@@ -84,7 +85,8 @@ def inertia_tests_setup?
 
 RSpec::Matchers.define :include_props do |expected_props|
   match do |inertia|
-    expect(inertia.props).to include expected_props.with_indifferent_access
+  # Computed props have symbolized keys. 
+    expect(inertia.props).to include expected_props.deep_symbolize_keys
   end
 
   failure_message do |inertia|

spec/dummy/app/controllers/inertia_lambda_shared_props_controller.rb

@@ -0,0 +1,12 @@
+class InertiaLambdaSharedPropsController < ApplicationController
+  inertia_share someProperty: -> {
+    {
+      property_a: "some value",
+      property_b: "this value"
+    }
+  }
+
+  def lamda_shared_props
+    render inertia: 'ShareTestComponent', props: { property_c: "some other value" }
+  end
+end

spec/dummy/config/routes.rb

@@ -39,4 +39,6 @@
   get 'deep_merge_shared' => 'inertia_merge_shared#deep_merge_shared'
   get 'shallow_merge_shared' => 'inertia_merge_shared#shallow_merge_shared'
   get 'merge_instance_props' => 'inertia_merge_instance_props#merge_instance_props'
+
+  get 'lamda_shared_props' => 'inertia_lambda_shared_props#lamda_shared_props'
 end

spec/inertia/rspec_helper_spec.rb

@@ -114,4 +114,20 @@ def puts(thing)
       end
     end
   end
+
+  describe '.have_exact_props' do
+    context 'when shared props are wrapped in a callable', inertia: true do
+      it 'compares props with either string or symbol keys' do
+        get lamda_shared_props_path
+
+        expect_inertia.to have_exact_props({
+          someProperty: {
+            property_a: "some value",
+            'property_b' => "this value",
+          },
+          property_c: "some other value"
+        })
+      end
+    end
+  end
 end