Cleanup tests.

lib/Models/Model.php

@@ -17,7 +17,7 @@ class Model extends \Sudzy\ValidModel {
       return true;
     } catch (\Sudzy\ValidationException $e) {
       return false;
-    } catch (Exception $e) {
+    } catch (\PDOException $e) {
       return false;
     }
   }

lib/Models/Subscriber.php

@@ -13,11 +13,11 @@ class Subscriber extends Model {
     ));
     $this->addValidations('first_name', array(
       'required'    => "first_name_is_blank",
-      'minLength|2' => "first_name_is_short"
+      "isString"    => "name_is_not_string"
     ));
     $this->addValidations('last_name', array(
       'required'    => "last_name_is_blank",
-      'minLength|2' => "last_name_is_short"
+      "isString"    => "name_is_not_string"
     ));
   }
 }

tests/unit/Models/SubscriberCest.php

@@ -43,83 +43,8 @@ class SubscriberCest {
   function emailMustBeUnique() {
     $conflict_subscriber = Subscriber::create();
     $conflict_subscriber->hydrate($this->data);
-    $conflicted = false;
+    $saved = $conflict_subscriber->save();
-    try {
+    expect($saved)->equals(false);
-      $conflict_subscriber->save();
-    } catch (Exception $e) {
-      $conflicted = true;
-    }
-    expect($conflicted)->equals(true);
-  }
-
-  function emailShouldValidate() {
-    $conflict_subscriber = Subscriber::create();
-    $conflict_subscriber->validateField('email', '');
-    expect($conflict_subscriber->getValidationErrors()[0])->equals('email_is_blank');
-
-    $conflict_subscriber = Subscriber::create();
-    $conflict_subscriber->validateField('email', 'some @ email . com');
-    expect($conflict_subscriber->getValidationErrors()[0])->equals('email_is_invalid');
-  }
-
-  function firstNameShouldValidate() {
-    $conflict_subscriber = Subscriber::create();
-    $conflict_subscriber->validateField('first_name', '');
-    expect($conflict_subscriber->getValidationErrors()[0])->equals('first_name_is_blank');
-
-    $conflict_subscriber = Subscriber::create();
-    $conflict_subscriber->validateField('first_name', 'a');
-    expect($conflict_subscriber->getValidationErrors()[0])->equals('first_name_is_short');
-  }
-
-
-  function lastNameShouldValidate() {
-    $conflict_subscriber = Subscriber::create();
-    $conflict_subscriber->validateField('last_name', '');
-    expect($conflict_subscriber->getValidationErrors()[0])->equals('last_name_is_blank');
-
-    $conflict_subscriber = Subscriber::create();
-    $conflict_subscriber->validateField('last_name', 'a');
-    expect($conflict_subscriber->getValidationErrors()[0])->equals('last_name_is_short');
-  }
-
-  function itHasACreatedAtOnCreation() {
-    $subscriber = Subscriber::where('email', $this->data['email'])
-      ->findOne();
-    $time_difference = strtotime($subscriber->created_at) >= $this->before_time;
-    expect($time_difference)->equals(true);
-  }
-
-  function itHasAnUpdatedAtOnCreation() {
-    $subscriber = Subscriber::where('email', $this->data['email'])
-      ->findOne();
-    $time_difference = strtotime($subscriber->updated_at) >= $this->before_time;
-    expect($time_difference)->equals(true);
-  }
-
-  function itKeepsTheCreatedAtOnUpdate() {
-    $subscriber = Subscriber::where('email', $this->data['email'])
-      ->findOne();
-
-    $old_created_at = $subscriber->created_at;
-
-    $subscriber->first_name = 'New Name';
-    $subscriber->save();
-
-    expect($old_created_at)->equals($subscriber->created_at);
-  }
-
-  function itUpdatesTheUpdatedAtOnUpdate() {
-    $subscriber = Subscriber::where('email', $this->data['email'])
-      ->findOne();
-
-    $update_time = time();
-    $subscriber->first_name = 'New Name';
-    $subscriber->save();
-
-    $time_difference = strtotime($subscriber->updated_at) >= $update_time;
-
-    expect($time_difference)->equals(true);
   }
 
   function _after() {
@@ -127,5 +52,4 @@ class SubscriberCest {
       ->findOne()
       ->delete();
   }
-
 }