Fix test

kmycode · Feb 22, 2024 · 3fbf420 · 3fbf420
1 parent 793bca2
commit 3fbf420
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/app/models/admin/ng_rule.rb b/app/models/admin/ng_rule.rb
@@ -198,7 +198,7 @@ def detect_keyword?(text, arr)
 
   class << self
     def string_to_array(text)
-      text.split("\n")
+      text.delete("\r").split("\n")
     end
 
     def detect_keyword(text, arr)

diff --git a/spec/models/admin/ng_rule_spec.rb b/spec/models/admin/ng_rule_spec.rb
@@ -71,6 +71,14 @@
       it_behaves_like 'matches rule', 'account'
     end
 
+    context 'with display name rule' do
+      let(:uri) { '' }
+      let(:account) { Fabricate(:account, display_name: '') }
+      let(:ng_rule) { Fabricate(:ng_rule, account_display_name: "?^$\r\n?[a-z0-9]{10}", account_include_local: true) }
+
+      it_behaves_like 'matches rule', 'account'
+    end
+
     context 'with field name rule' do
       let(:account) { Fabricate(:account, fields_attributes: { '0' => { name: 'Name', value: 'Value' } }, domain: 'example.com', uri: uri) }
       let(:ng_rule) { Fabricate(:ng_rule, account_field_name: 'Name') }