From b702c1fc22a921b027d3242dd1c7c1045bb6499b Mon Sep 17 00:00:00 2001 From: Javier Torres Date: Wed, 7 Mar 2018 15:03:23 +0100 Subject: [PATCH] Avoid using splat (only works with symbolized hashes --- app/model_factories/carto/layer_factory.rb | 5 ++--- app/model_factories/layer_factory.rb | 5 ++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/app/model_factories/carto/layer_factory.rb b/app/model_factories/carto/layer_factory.rb index f65063771c..d035255f82 100644 --- a/app/model_factories/carto/layer_factory.rb +++ b/app/model_factories/carto/layer_factory.rb @@ -18,9 +18,8 @@ module Carto kind: 'tiled', options: base_layer_options.except('className', 'labels').merge( 'type' => 'Tiled', - 'name' => "#{base_layer_options['name']} Labels", - **base_layer_options['labels'] - ) + 'name' => "#{base_layer_options['name']} Labels" + ).merge(base_layer_options['labels']) ) end diff --git a/app/model_factories/layer_factory.rb b/app/model_factories/layer_factory.rb index 7769e35279..2b1686623e 100644 --- a/app/model_factories/layer_factory.rb +++ b/app/model_factories/layer_factory.rb @@ -47,9 +47,8 @@ module ModelFactories kind: 'tiled', options: base_layer.options.except('className', 'labels').merge( 'type' => 'Tiled', - 'name' => "#{base_layer.options['name']} Labels", - **base_layer.options['labels'] - ) + 'name' => "#{base_layer.options['name']} Labels" + ).merge(base_layer.options['labels']) ) end