diff --git a/.circleci/config.yml b/.circleci/config.yml index 8347965d0..eb8386573 100644 --- a/.circleci/config.yml +++ b/.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 diff --git a/.ruby-version b/.ruby-version index 437459cd9..6a6a3d8e3 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -2.5.0 +2.6.1 diff --git a/Gemfile.lock b/Gemfile.lock index b973dc7d7..c9f39191f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -740,4 +740,4 @@ DEPENDENCIES zxcvbn-ruby BUNDLED WITH - 1.17.1 + 1.17.2 diff --git a/app/services/api_entreprise_service.rb b/app/services/api_entreprise_service.rb index 0dec08efc..e984ebe9e 100644 --- a/app/services/api_entreprise_service.rb +++ b/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