Fix regexps so they are anchored to start/end of string instead of st…

…art/end of line
gocardless · Jan 20, 2013 · 18c02e8 · hinglau886 · Jun 20, 2024 · 18c02e8
1 parent 32cd677
commit 18c02e8
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/lib/uk_phone_numbers.rb b/lib/uk_phone_numbers.rb
@@ -31,7 +31,7 @@ def self.pattern_to_regexp(pattern)
     regexp = regexp.split.map { |p| "(#{p})" }.join
     regexp.gsub!(/\[([^\]]*)\]/, '(?:\1)?')
     regexp.gsub!(/#/, '\d')
-    Regexp.new("^#{regexp}$")
+    Regexp.new("\\A#{regexp}\\z")
   end
 
   REGEXPS = []

diff --git a/spec/uk_phone_numbers_spec.rb b/spec/uk_phone_numbers_spec.rb
@@ -16,23 +16,23 @@ def regexp_for(pattern)
     end
 
     it "strips parens from the pattern" do
-      regexp_for("()").should == "^$"
+      regexp_for("()").should_not include("()")
     end
 
     it "parenthesises whitespace-separated sections" do
-      regexp_for("0 12 345").should == "^(0)(12)(345)$"
+      regexp_for("0 12 345").should include("(0)(12)(345)")
     end
 
     it "replaces # with \\d" do
-      regexp_for("0#").should == "^(0\\d)$"
+      regexp_for("0#").should include("(0\\d)")
     end
 
     it "replaces bracketed expressions with optional non-capturing groups" do
-      regexp_for("0[12]3[4]5").should == "^(0(?:12)?3(?:4)?5)$"
+      regexp_for("0[12]3[4]5").should include("(0(?:12)?3(?:4)?5)")
     end
 
     it "handles hashes inside brackets" do
-      regexp_for("0[#]1[#]2").should == "^(0(?:\\d)?1(?:\\d)?2)$"
+      regexp_for("0[#]1[#]2").should include("(0(?:\\d)?1(?:\\d)?2)")
     end
   end
 
@@ -44,6 +44,10 @@ def regexp_for(pattern)
     it "returns false for invalid numbers" do
       subject.valid?('08456123123123').should be_false
     end
+
+    it "returns false for multiline strings containing a valid number" do
+      subject.valid?("08456123123\nnotaphonenumber\n").should be_false
+    end
   end
 
   describe ".format" do