From eedbaaff6eae24ba4ffe91a34a8345188b8ac7f1 Mon Sep 17 00:00:00 2001
From: Ana Nunes da Silva <ananunesdasilva@gmail.com>
Date: Thu, 28 Mar 2024 19:50:46 +0000
Subject: [PATCH] Fix duplicate branch in Spree::Preferences::Preferable
 private method

:string, :text and :password cases have the same value
---
 .rubocop_todo.yml                          | 10 ----------
 app/models/spree/preferences/preferable.rb |  4 +---
 2 files changed, 1 insertion(+), 13 deletions(-)

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 6f2bdd9e78..b7d0593f62 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -23,16 +23,6 @@ Lint/ConstantDefinitionInBlock:
     - 'spec/validators/date_time_string_validator_spec.rb'
     - 'spec/validators/integer_array_validator_spec.rb'
 
-# Offense count: 6
-# Configuration parameters: IgnoreLiteralBranches, IgnoreConstantBranches.
-Lint/DuplicateBranch:
-  Exclude:
-    # - 'app/helpers/spree/admin/base_helper.rb'
-    # - 'app/models/enterprise.rb'
-    # - 'app/models/spree/calculator.rb'
-    # - 'app/models/spree/preference.rb'
-    - 'app/models/spree/preferences/preferable.rb'
-
 # Offense count: 2
 Lint/DuplicateMethods:
   Exclude:
diff --git a/app/models/spree/preferences/preferable.rb b/app/models/spree/preferences/preferable.rb
index 40131daef3..e81a24aaf7 100644
--- a/app/models/spree/preferences/preferable.rb
+++ b/app/models/spree/preferences/preferable.rb
@@ -111,9 +111,7 @@ module Spree
 
       def convert_preference_value(value, type)
         case type
-        when :string, :text
-          value.to_s
-        when :password
+        when :string, :text, :password
           value.to_s
         when :decimal
           value = 0 if value.blank?