cleaned up code, fixed tests

Author: cameronmccord2

Validator/Validator.swift

@@ -31,6 +31,8 @@ public class Validator {
 
     private func validateAllFields() {
 
+        self.clearErrors()
+        
         for field in validations.keys {
             if let currentRule: ValidationRule = validations[field] {
                 if var error: ValidationError = currentRule.validateField() {
@@ -73,8 +75,6 @@ public class Validator {
 
     public func validate(delegate:ValidationDelegate) {
 
-        self.clearErrors()
-        
         self.validateAllFields()
 
         if errors.isEmpty {

Validator/ViewController.swift

@@ -37,8 +37,9 @@ class ViewController: UIViewController , ValidationDelegate, UITextFieldDelegate
             println("here")
                 // clear error label
                 validationRule.errorLabel?.hidden = true
-                validationRule.textField.layer.borderColor = UIColor.clearColor().CGColor
-                validationRule.textField.layer.borderWidth = 0.0
+                validationRule.errorLabel?.text = ""
+                validationRule.textField.layer.borderColor = UIColor.greenColor().CGColor
+                validationRule.textField.layer.borderWidth = 0.5
 
             }, error:{ (validationError) -> Void in
                 println("error")
@@ -57,7 +58,6 @@ class ViewController: UIViewController , ValidationDelegate, UITextFieldDelegate
 
     @IBAction func submitTapped(sender: AnyObject) {
         println("Validating...")
-//        self.clearErrors()
         validator.validate(self)
     }
 
@@ -73,39 +73,8 @@ class ViewController: UIViewController , ValidationDelegate, UITextFieldDelegate
     }
     func validationFailed(errors:[UITextField:ValidationError]) {
         println("Validation FAILED!")
-//        self.setErrors()
     }
 
-    // MARK: Error Styling
-    
-//    func removeError(label:UILabel, textField:UITextField) {
-//        label.hidden = true
-//        textField.layer.borderWidth = 0.0
-//    }
-    
-//    func removeAllErrors(){
-//        removeError(fullNameErrorLabel, textField: fullNameTextField)
-//        removeError(emailErrorLabel, textField: emailTextField)
-//        removeError(phoneNumberErrorLabel, textField: phoneNumberTextField)
-//        removeError(zipcodeErrorLabel, textField: zipcodeTextField)
-//    }
-    
-//    private func setErrors(){
-//        for (field, error) in validator.errors {
-//            field.layer.borderColor = UIColor.redColor().CGColor
-//            field.layer.borderWidth = 1.0
-//            error.errorLabel?.text = error.errorMessage
-//            error.errorLabel?.hidden = false
-//        }
-//    }
-    
-//    private func clearErrors(){
-//        for (field, error) in validator.errors {
-//            field.layer.borderWidth = 0.0
-//            error.errorLabel?.hidden = true
-//        }
-//    }
-    
     func hideKeyboard(){
         self.view.endEditing(true)
     }

ValidatorTests/ValidatorTests.swift

@@ -217,58 +217,51 @@ class ValidatorTests: XCTestCase {
         REGISTER_TXT_FIELD.text = VALID_EMAIL
         REGISTER_VALIDATOR.validate { (errors) -> Void in
             XCTAssert(errors.count == 0, "Should not come back with errors")
-            XCTAssert(self.ERROR_LABEL.text == nil, "Shouldn't have an error message on the label")
         }
     }
 
     func testErrorMessageSet() {
         REGISTER_VALIDATOR.registerField(REGISTER_TXT_FIELD, errorLabel: ERROR_LABEL, rules: [EmailRule()])
+        var successCount = 0
+        var errorCount = 0
+        REGISTER_VALIDATOR.styleTransformers(success: { (validationRule) -> Void in
+            successCount++
+        }) { (validationError) -> Void in
+            errorCount++
+        }
         REGISTER_TXT_FIELD.text = INVALID_EMAIL
         REGISTER_VALIDATOR.validate { (errors) -> Void in
             XCTAssert(errors.count == 1, "Should come back with errors")
-            if let errorText = self.ERROR_LABEL.text {
-                XCTAssert(errorText == errors[self.REGISTER_TXT_FIELD]!.errorMessage, "Shouldn't have an error message on the label, got: \(self.ERROR_LABEL.text!), expected: \(errors[self.REGISTER_TXT_FIELD]!.errorMessage)")
-            }else{
-                XCTAssert(false, "Error label should have text, not nil")
-            }
+            XCTAssert(errorCount == 1, "Should have called the error style transform once")
+            XCTAssert(successCount == 0, "Should not have called the success style transform as there are no successful fields")
         }
     }
 
     func testErrorMessageSetAndThenUnset() {
         REGISTER_VALIDATOR.registerField(REGISTER_TXT_FIELD, errorLabel: ERROR_LABEL, rules: [EmailRule()])
+        
+        var successCount = 0
+        var errorCount = 0
+        REGISTER_VALIDATOR.styleTransformers(success: { (validationRule) -> Void in
+            successCount++
+            }) { (validationError) -> Void in
+                errorCount++
+        }
+        
         REGISTER_TXT_FIELD.text = INVALID_EMAIL
         REGISTER_VALIDATOR.validate { (errors) -> Void in
             XCTAssert(errors.count == 1, "Should come back with errors")
-            if let errorText = self.ERROR_LABEL.text {
-                XCTAssert(errorText == errors[self.REGISTER_TXT_FIELD]!.errorMessage, "Shouldn't have an error message on the label, got: \(self.ERROR_LABEL.text!), expected: \(errors[self.REGISTER_TXT_FIELD]!.errorMessage)")
-                
-                self.REGISTER_TXT_FIELD.text = self.VALID_EMAIL
-                self.REGISTER_VALIDATOR.validate { (errors) -> Void in
-                    XCTAssert(errors.count == 0, "Should not come back with errors")
-                    XCTAssert(self.ERROR_LABEL.text == nil, "Shouldn't have an error message on the label")
-                }
-            }else{
-                XCTAssert(false, "Error label should have text, not nil")
+            XCTAssert(errorCount == 1, "Should have called the error style transform once")
+            XCTAssert(successCount == 0, "Should not have called the success style transform as there are no successful fields")
+            self.REGISTER_TXT_FIELD.text = self.VALID_EMAIL
+            self.REGISTER_VALIDATOR.validate { (errors) -> Void in
+                XCTAssert(errors.count == 0, "Should not come back with errors: \(errors)")
+                XCTAssert(successCount == 1, "Should have called the success style transform once")
+                XCTAssert(errorCount == 1, "Should not have called the error style transform again")
             }
         }
     }
 
-//    func testTextFieldBorderColorSet() {
-//        REGISTER_VALIDATOR.registerField(REGISTER_TXT_FIELD, errorLabel: ERROR_LABEL, rules: [EmailRule()])
-//        REGISTER_TXT_FIELD.text = INVALID_EMAIL
-//        REGISTER_VALIDATOR.shouldMarkTextFieldsInError = true
-//        REGISTER_VALIDATOR.validate { (errors) -> Void in
-//            XCTAssert(errors.count == 1, "Should come back with errors")
-//            XCTAssert(CGColorEqualToColor(self.REGISTER_TXT_FIELD.layer.borderColor, UIColor.redColor().CGColor), "Color should be what it was set as")
-//            
-//            self.REGISTER_TXT_FIELD.text = self.VALID_EMAIL
-//            self.REGISTER_VALIDATOR.validate { (errors) -> Void in
-//                XCTAssert(errors.count == 0, "Should come back without errors")
-//                XCTAssert(!CGColorEqualToColor(self.REGISTER_TXT_FIELD.layer.borderColor, UIColor.redColor().CGColor), "Color should be what it was set as")
-//            }
-//        }
-//    }
-    
     func testTextFieldBorderColorNotSet() {
         REGISTER_VALIDATOR.registerField(REGISTER_TXT_FIELD, errorLabel: ERROR_LABEL, rules: [EmailRule()])
         REGISTER_TXT_FIELD.text = INVALID_EMAIL