Update 'prepare' regexp to allow hyphen

Address failing specs
faker-ruby · May 26, 2020 · 2fe184f · 2fe184f
1 parent acebadd
commit 2fe184f
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/lib/helpers/char.rb b/lib/helpers/char.rb
@@ -5,7 +5,7 @@ module Char
     def self.prepare(string)
       result = romanize_cyrillic string
       result = fix_umlauts result
-      result.gsub(/\W/, '').downcase
+      result.gsub(/[^\w-]/, '').downcase
     end
 
     def self.fix_umlauts(string)

diff --git a/test/faker/default/test_faker_internet.rb b/test/faker/default/test_faker_internet.rb
@@ -151,11 +151,11 @@ def test_password_without_special_chars
   end
 
   def test_domain_name_without_subdomain
-    assert @tester.domain_name.match(/\w+\.\w+/)
+    assert @tester.domain_name.match(/[\w-]+\.\w+/)
   end
 
   def test_domain_name_with_subdomain
-    assert @tester.domain_name(subdomain: true).match(/\w+\.\w+\.\w+/)
+    assert @tester.domain_name(subdomain: true).match(/[\w-]+\.[\w-]+\.\w+/)
   end
 
   def test_domain_name_with_subdomain_and_with_domain_option_given
@@ -167,7 +167,7 @@ def test_domain_name_with_subdomain_and_with_domain_option_given_with_domain_suf
   end
 
   def test_domain_word
-    assert @tester.domain_word.match(/^\w+$/)
+    assert @tester.domain_word.match(/^[\w-]+$/)
   end
 
   def test_domain_suffix

diff --git a/test/test_uk_locale.rb b/test/test_uk_locale.rb
@@ -39,7 +39,7 @@ def test_uk_commerce_methods
 
   def test_uk_internet_methods
     assert Faker::Internet.email.match(/.+@[^.].+\.\w+/)
-    assert Faker::Internet.domain_word.match(/^\w+$/)
+    assert Faker::Internet.domain_word.match(/^[\w-]+$/)
   end
 
   def test_uk_name_methods