From f39312662d8fd5c28c423552b390d03c3fe6be61 Mon Sep 17 00:00:00 2001 From: Brian Smith Date: Wed, 27 Aug 2014 23:36:57 -0400 Subject: [PATCH] VRFS-2091 modified email regular expression to prevent 2 consecutive periods after the @ --- ruby/lib/jam_ruby/models/user.rb | 2 +- ruby/spec/jam_ruby/models/user_spec.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ruby/lib/jam_ruby/models/user.rb b/ruby/lib/jam_ruby/models/user.rb index 59e688aba..c245314ee 100644 --- a/ruby/lib/jam_ruby/models/user.rb +++ b/ruby/lib/jam_ruby/models/user.rb @@ -11,7 +11,7 @@ module JamRuby @@log = Logging.logger[User] - VALID_EMAIL_REGEX = /\A[\w+\-.]+@[a-z\d\-.]+\.[a-z]+\z/i + VALID_EMAIL_REGEX = /\A[\w+\-.]+@([a-z\d\-]+\.)+[a-z]+\z/i JAM_REASON_REGISTRATION = 'r' JAM_REASON_NETWORK_TEST = 'n' JAM_REASON_FTUE = 'g' diff --git a/ruby/spec/jam_ruby/models/user_spec.rb b/ruby/spec/jam_ruby/models/user_spec.rb index 36c729554..ae78e890c 100644 --- a/ruby/spec/jam_ruby/models/user_spec.rb +++ b/ruby/spec/jam_ruby/models/user_spec.rb @@ -106,7 +106,7 @@ describe User do describe "when email format is invalid" do it "should be invalid" do - addresses = %w[user@foo,com user_at_foo.org example.user@foo.] + addresses = %w[user@foo,com user_at_foo.org example.user@foo. blah@gmail..com] addresses.each do |invalid_address| @user.email = invalid_address @user.should_not be_valid