luisramos0
|
cdee7c0422
|
Merge branch 'master' into 2-0-stable-dec-10th
|
2018-12-10 16:41:29 +00:00 |
|
Pau Perez
|
e0f43191e2
|
Make helper methods private
Otherwise next dev might think these are attributes of the resulting
JSON serialized object.
They just made the refactoring a bit easier.
|
2018-11-28 16:21:40 +01:00 |
|
Pau Perez
|
e40c1c08ca
|
Refactor spec to not stub the class under test
This also relies on ActiveRecord which will come in handy as we move on
the refactor.
|
2018-11-28 16:21:40 +01:00 |
|
Pau Perez
|
149fc1ac6f
|
Inline PropertyMerge's #merge into serializer
Now that it has become a plain Ruby #uniq, there's no point on having
the abstraction and indirection.
|
2018-11-28 16:21:40 +01:00 |
|
Pau Perez
|
bc7258d43b
|
Test #supplied_properties helper methods
|
2018-11-28 16:21:40 +01:00 |
|
Pau Perez
|
75ad4254a6
|
Remove on_demand from Api::Admin::ProductSerializer
This change also moves the spec file to its appropriate place for the
sake of consistency and RSpec3-izes the test example.
|
2018-10-03 13:06:13 +02:00 |
|