Fixes mailjet test (GoogleCloudPlatform#770)

Author: bshaffer

.kokoro/secrets.sh.enc

@@ -40,10 +40,11 @@
     /** @var Mailjet\Client $mailjet */
     $mailjet = $app['mailjet'];
     $recipient = $request->get('recipient');
+    $sender = $app['mailjet.sender'] ?: "[email protected]";
 
     # [START gae_mailjet_send_message]
     $body = [
-        'FromEmail' => "[email protected]",
+        'FromEmail' => $sender,
         'FromName' => "Testing Mailjet",
         'Subject' => "Your email flight plan!",
         'Text-part' => "Dear passenger, welcome to Mailjet! May the delivery force be with you!",

appengine/php55/mailjet/app.php

@@ -7,6 +7,6 @@
     "require-dev": {
         "phpunit/phpunit": "~4.8",
         "paragonie/random_compat": "^2.0",
-        "google/cloud-tools": "^0.6"
+        "google/cloud-tools": "^0.8.5"
     }
 }

appengine/php55/mailjet/composer.json

@@ -24,6 +24,8 @@
 // set your Mailjet API key and secret
 $app['mailjet.api_key'] = 'MAILJET_APIKEY';
 $app['mailjet.secret'] = 'MAILJET_SECRET';
+// set your mailjet sender email. This must be verified in your mailjet account
+$app['mailjet.sender'] = '';
 
 // Run the app!
 // use "gcloud app deploy" or run "php -S localhost:8000"

appengine/php55/mailjet/index.php

@@ -15,28 +15,22 @@
  * limitations under the License.
  */
 use Silex\WebTestCase;
+use Google\Cloud\TestUtils\TestTrait;
 
 class LocalTest extends WebTestCase
 {
+    use TestTrait;
+
     public function createApplication()
     {
         $app = require __DIR__ . '/../app.php';
 
         // set some parameters for testing
         $app['session.test'] = true;
         $app['debug'] = true;
-        $projectId = getenv('GOOGLE_PROJECT_ID');
-
-        // set your Mailjet API key and secret
-        $mailjetApiKey = getenv('MAILJET_APIKEY');
-        $mailjetSecret = getenv('MAILJET_SECRET');
-
-        if (empty($mailjetApiKey) || empty($mailjetSecret)) {
-            $this->markTestSkipped('set the MAILJET_APIKEY and MAILJET_SECRET environment variables');
-        }
-
-        $app['mailjet.api_key'] = $mailjetApiKey;
-        $app['mailjet.secret'] = $mailjetSecret;
+        $app['mailjet.api_key'] = $this->requireEnv('MAILJET_APIKEY');
+        $app['mailjet.secret'] = $this->requireEnv('MAILJET_SECRET');
+        $app['mailjet.sender'] = $this->requireEnv('MAILJET_SENDER');
 
         // prevent HTML error exceptions
         unset($app['exception_handler']);

appengine/php55/mailjet/test/LocalTest.php

@@ -67,7 +67,7 @@ FILES_CHANGED=$(git diff --name-only HEAD $(git merge-base HEAD master))
 # If any files outside the sample directories changed, or if we are not
 # on a Pull Request, run the whole test suite.
 if grep -q ^testing\/ <<< "$FILES_CHANGED" || \
-   grep -q ^.kokoro\/ <<< "$FILES_CHANGED" || \
+   grep -v ^.kokoro\/secrets.sh.enc$ <<< "$FILES_CHANGED" | grep -q ^.kokoro\/ || \
     grep -qv \/ <<< "$FILES_CHANGED" || \
     [ -z "$IS_PULL_REQUEST" ]; then
     RUN_ALL_TESTS=1