Merge pull request #3506 from betagouv/dev

MEP 2019-02-25-02

.circleci/config.yml

@@ -3,7 +3,7 @@ version: 2
 defaults: &defaults
   working_directory: ~/tps
   docker:
-    - image: circleci/ruby:2.5.0-node-browsers
+    - image: circleci/ruby:2.6.1-node-browsers
     - image: circleci/postgres:9.5
       environment:
         POSTGRES_USER: tps_test

.ruby-version

@@ -1 +1 @@
-2.5.0
+2.6.1

Gemfile.lock

@@ -740,4 +740,4 @@ DEPENDENCIES
   zxcvbn-ruby
 
 BUNDLED WITH
-   1.17.1
+   1.17.2

app/services/api_entreprise_service.rb

@@ -7,10 +7,11 @@ class ApiEntrepriseService
       association_params = ApiEntreprise::RNAAdapter.new(siret, procedure_id).to_params
       exercices_params = ApiEntreprise::ExercicesAdapter.new(siret, procedure_id).to_params
 
-      etablissement_params
-        .merge(entreprise_params)
-        .merge(association_params)
-        .merge(exercices_params)
+      etablissement_params.merge(
+        entreprise_params,
+        association_params,
+        exercices_params
+      )
     end
   end
 end