Alter the merge order on Hanami::Action::Params#_params

The `_router_params` where taking precedence over `@result.output` leading to the problem reported on #226 Fixes #226
hanami · May 16, 2017 · 3ec98fe · 3ec98fe
1 parent 7564849
commit 3ec98fe
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/lib/hanami/action/params.rb b/lib/hanami/action/params.rb
@@ -146,7 +146,7 @@ def to_h
 
       # @api private
       def _params
-        @result.output.merge(_router_params)
+        _router_params.merge(@result.output)
       end
     end
   end

diff --git a/test/integration/routing_test.rb b/test/integration/routing_test.rb
@@ -144,7 +144,7 @@
         response = @app.request('PATCH', '/painters/23', params: { painter: { first_name: 'Gustav', last_name: 'Klimt' } })
 
         response.status.must_equal 200
-        response.body.must_equal %({:painter=>{:first_name=>"Gustav", :last_name=>"Klimt"}, :id=>"23"})
+        response.body.must_equal %({:id=>"23", :painter=>{:first_name=>"Gustav", :last_name=>"Klimt"}})
       end
     end
   end