Changeset 13492

Timestamp:

06/08/08 18:10:47 (5 years ago)

Author:

kumatch

Message:

Refactored.

Location:

events/phpframework/piece_framework/trunk

Files:

• libs/Phwittr/Service.php (modified) (1 diff)
• specs/Phwittr/AuthenticationSpec.php (modified) (2 diffs)

events/phpframework/piece_framework/trunk/libs/Phwittr/Service.php

@@ -155 +155 @@
 
         if (!$user) {
-            return false;
+            throw new Phwittr_Service_Exception('認証に失敗しました');
         }
 

events/phpframework/piece_framework/trunk/specs/Phwittr/AuthenticationSpec.php

@@ -79 +79 @@
         $this->_createUserRecord($this->_foo);
 
-        $this->spec(Phwittr_Service::authenticate('dummy', 'dummy'))->should->beFalse();
-        $this->spec(Phwittr_Service::authenticate('dummy@example.com', 'dummy'))->should->beFalse();
-        $this->spec(Phwittr_Service::authenticate($this->_foo->userName, 'dummy'))->should->beFalse();
-        $this->spec(Phwittr_Service::authenticate($this->_foo->email, 'dummy'))->should->beFalse();
-        $this->spec(Phwittr_Service::authenticate('dummy', $this->_foo->password))->should->beFalse();
-        $this->spec(Phwittr_Service::authenticate('dummy@example.com', $this->_foo->password))->should->beFalse();
+        try {
+            Phwittr_Service::authenticate($this->_foo->userName, 'dummy');
+        } catch (Phwittr_Service_Exception $e) {
+            return;
+        }
+
+        $this->fail();
     }
 
-    public function it仮登録状態のユーザの認証は認められない()
+    public function it仮登録状態のユーザではユーザ名とパスワードによる認証はできない()
     {
         $this->_foo->flag = 0;
@@ -93 +94 @@
         $this->_foo->flag = 1;
 
-        $result1 = Phwittr_Service::authenticate($this->_foo->userName,
-                                                 $this->_foo->password
-                                                 );
-        $result2 = Phwittr_Service::authenticate($this->_foo->email,
-                                                 $this->_foo->password
-                                                 );
+        try {
+            Phwittr_Service::authenticate($this->_foo->userName,
+                                          $this->_foo->password
+                                          );
+        } catch (Phwittr_Service_Exception $e) {
+            return;
+        }
 
-        $this->spec($result1)->should->beFalse();
-        $this->spec($result2)->should->beFalse();
+        $this->fail();
+    }
+
+    public function it仮登録状態のユーザではメールアドレスとパスワードによる認証はできない()
+    {
+        $this->_foo->flag = 0;
+        $this->_createUserRecord($this->_foo);
+        $this->_foo->flag = 1;
+
+        try {
+            Phwittr_Service::authenticate($this->_foo->email,
+                                          $this->_foo->password
+                                          );
+        } catch (Phwittr_Service_Exception $e) {
+            return;
+        }
+
+        $this->fail();
     }