Merge pull request #87 from facebook/gFosco.apptoken

Removed appToken from test credentials file.

Author: Fosco Marotto

tests/FacebookRequestTest.php

@@ -31,7 +31,7 @@ public function testCanPostAndDelete()
     );
     $response = (
       new FacebookRequest(
-        new FacebookSession(FacebookTestCredentials::$appToken),
+        new FacebookSession(FacebookTestHelper::getAppToken()),
         'POST',
         '/' . FacebookTestCredentials::$appId . '/accounts/test-users',
         $params
@@ -42,7 +42,7 @@ public function testCanPostAndDelete()
     // Delete test user
     $response = (
     new FacebookRequest(
-      new FacebookSession(FacebookTestCredentials::$appToken),
+      new FacebookSession(FacebookTestHelper::getAppToken()),
       'DELETE',
       '/' . $user_id
     ))->execute()->getGraphObject()->asArray();

tests/FacebookSessionTest.php

@@ -13,9 +13,9 @@ public static function setUpBeforeClass()
 
   public function testSessionToken()
   {
-    $session = new FacebookSession(FacebookTestCredentials::$appToken);
+    $session = new FacebookSession(FacebookTestHelper::getAppToken());
     $this->assertEquals(
-      FacebookTestCredentials::$appToken, $session->getToken()
+      FacebookTestHelper::getAppToken(), $session->getToken()
     );
   }
 

tests/FacebookTestCredentials.php.dist

@@ -8,7 +8,6 @@ class FacebookTestCredentials {
    */
   public static $appId = '';
   public static $appSecret = '';
-  public static $appToken = '';
 
 }
 

tests/FacebookTestHelper.php

@@ -12,8 +12,7 @@ class FacebookTestHelper
   public static function setUpBeforeClass()
   {
     if (!strlen(FacebookTestCredentials::$appId) ||
-      !strlen(FacebookTestCredentials::$appSecret) ||
-      !strlen(FacebookTestCredentials::$appToken)) {
+      !strlen(FacebookTestCredentials::$appSecret)) {
       throw new FacebookSDKException(
         'You must fill out FacebookTestCredentials.php'
       );
@@ -52,11 +51,16 @@ public static function createTestSession()
       'method' => 'post'
     );
     $response = (new FacebookRequest(
-      new FacebookSession(FacebookTestCredentials::$appToken),
+      new FacebookSession(FacebookTestHelper::getAppToken()),
       'GET',
       $testUserPath,
       $params))->execute()->getGraphObject();
     return new FacebookSession($response->getProperty('access_token'));
   }
 
+  public static function getAppToken()
+  {
+    return FacebookTestCredentials::$appId . '|' . FacebookTestCredentials::$appSecret;
+  }
+
 }

tests/GraphSessionInfoTest.php

@@ -18,7 +18,7 @@ public function testSessionInfo()
       'input_token' => FacebookTestHelper::$testSession->getToken()
     );
     $response = (new FacebookRequest(
-      new FacebookSession(FacebookTestCredentials::$appToken),
+      new FacebookSession(FacebookTestHelper::getAppToken()),
       'GET',
       '/debug_token',
       $params