Merge pull request #4 from matthewsullivan/feature/add-email-validation

Feature/add email validation

Author: matthewsullivan

.rubocop.yml

@@ -2121,6 +2121,8 @@ Metrics/BlockNesting:
 Metrics/ClassLength:
   Description: "Avoid classes longer than 100 lines of code."
   Enabled: true
+  Exclude:
+    - "test/**/*"
   VersionAdded: "0.25"
   VersionChanged: "0.87"
   CountComments: false # count full line comments?

app/models/user.rb

@@ -3,7 +3,10 @@
 class User < ApplicationRecord
   has_secure_password
 
-  validates :email, presence: true, uniqueness: true
+  validates :email, format: {
+    message: 'invalid format',
+    with: URI::MailTo::EMAIL_REGEXP
+  }, presence: true, uniqueness: true
   validates :first_name, presence: true
   validates :last_name, presence: true
 end

test/graph/mutations/register_test.rb

@@ -74,7 +74,15 @@ def perform(args = {})
       parameters = build_parameters(@user)
       result = perform(parameters)
 
-      assert_equal("Invalid input: Email can't be blank", result['errors'][0]['message'])
+      assert_equal("Invalid input: Email invalid format, Email can't be blank", result['errors'][0]['message'])
+    end
+
+    test 'should not register without valid email' do
+      @user[:email] = 'taylorlocalhost'
+      parameters = build_parameters(@user)
+      result = perform(parameters)
+
+      assert_equal('Invalid input: Email invalid format', result['errors'][0]['message'])
     end
 
     test 'should not register without password' do

test/graph/mutations/update_user_test.rb

@@ -93,7 +93,7 @@ def perform(args = {})
       }
       result = perform(parameters)
 
-      assert_equal("Invalid input: Email can't be blank", result['errors'][0]['message'])
+      assert_equal("Invalid input: Email invalid format, Email can't be blank", result['errors'][0]['message'])
     end
 
     test 'should not update with pre-existing email' do
@@ -108,5 +108,18 @@ def perform(args = {})
 
       assert_equal('Invalid input: Email has already been taken', result['errors'][0]['message'])
     end
+
+    test 'should not update without valid email' do
+      parameters = {
+        input: {
+          arguments: {
+            email: 'janedoelocalhost'
+          }
+        }
+      }
+      result = perform(parameters)
+
+      assert_equal('Invalid input: Email invalid format', result['errors'][0]['message'])
+    end
   end
 end

test/models/user_test.rb

@@ -41,6 +41,14 @@ def setup
     assert_not_nil(user.errors[:email], 'duplicate email present')
   end
 
+  test 'should not create without valid email' do
+    @user[:email] = 'johndoelocalhost'
+    user = User.create(@user)
+
+    refute(user.valid?)
+    assert_equal(user.errors[:email][0], 'invalid format')
+  end
+
   test 'should not create without password' do
     user = User.new(first_name: @user[:first_name])