Skip to content

Commit 0920b24

Browse files
committed
PC-50: Fixed validation for formula to use regular expression
1 parent 2b0c860 commit 0920b24

2 files changed

Lines changed: 2 additions & 2 deletions

File tree

app/models/item.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ def calculation_formula_must_be_valid
8383

8484
def check_all_formula_parameters_present
8585
missing_parameters = formula_parameters.reject do |param|
86-
calculation_formula.include?(param)
86+
calculation_formula.match?(/\b#{Regexp.escape(param)}\b/)
8787
end
8888

8989
return unless missing_parameters.any?

spec/models/item_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@
109109
end
110110

111111
it 'is invalid if all formula_parameters are missing in formula' do
112-
item.calculation_formula = 'param1 + 123'
112+
item.calculation_formula = 'param1 + 123 + param212'
113113
expect(item).not_to be_valid
114114
expect(item.errors[:calculation_formula]).to include('is missing parameters: param2')
115115
end

0 commit comments

Comments
 (0)