From b67dacc0f69911aabcd8e3e06c6446dae5b12b1d Mon Sep 17 00:00:00 2001 From: Brian Retterer Date: Sat, 17 Dec 2016 09:49:36 -0800 Subject: [PATCH] Update tests to use testmail accounts for email (#188) --- .../Authc/Api/ApiRequestAuthenticatorTest.php | 2 +- .../Api/BasicRequestAuthenticatorTest.php | 2 +- .../OAuthBearerRequestAuthenticatorTest.php | 2 +- ...AuthClientCredentialsAuthenticatorTest.php | 2 +- ...uthPasswordRequestAuthenticatorRequest.php | 2 +- .../Api/OAuthRequestAuthenticatorTest.php | 2 +- tests/Cache/Tags/CacheTagExtractorTest.php | 12 +-- tests/Mail/ModeledEmailTemplateTest.php | 10 +- tests/Mail/UnmodeledEmailTemplateTest.php | 10 +- tests/Mfa/GoogleAuthenticatorFactorTest.php | 16 ++-- tests/Mfa/Physical/SmsTest.php | 10 +- tests/Mfa/SmsFactorTest.php | 2 +- tests/Oauth/PasswordRefreshGrantTest.php | 2 +- tests/Resource/AccountTest.php | 96 +++++++++---------- tests/Resource/ApplicationTest.php | 24 ++--- tests/Resource/DirectoryTest.php | 2 +- tests/Resource/GroupMembershipTest.php | 12 +-- tests/Resource/GroupTest.php | 2 +- tests/Resource/OrganizationTest.php | 2 +- tests/Resource/SamlProviderMetadataTest.php | 2 +- 20 files changed, 109 insertions(+), 105 deletions(-) diff --git a/tests/Authc/Api/ApiRequestAuthenticatorTest.php b/tests/Authc/Api/ApiRequestAuthenticatorTest.php index 42a77ca..7b8d428 100644 --- a/tests/Authc/Api/ApiRequestAuthenticatorTest.php +++ b/tests/Authc/Api/ApiRequestAuthenticatorTest.php @@ -38,7 +38,7 @@ public static function setUpBeforeClass() 'middleName' => 'ApiRequestAuthenticatorTest', 'surname' => 'Test', 'username' => makeUniqueName('ApiRequestAuthenticatorTest'), - 'email' => makeUniqueName('ApiRequestAuthenticatorTest') .'@unknown123.kot', + 'email' => makeUniqueName('ApiRequestAuthenticatorTest') .'@testmail.stormpath.com', 'password' => 'superP4ss' ) diff --git a/tests/Authc/Api/BasicRequestAuthenticatorTest.php b/tests/Authc/Api/BasicRequestAuthenticatorTest.php index 691028a..4648734 100644 --- a/tests/Authc/Api/BasicRequestAuthenticatorTest.php +++ b/tests/Authc/Api/BasicRequestAuthenticatorTest.php @@ -38,7 +38,7 @@ public static function setUpBeforeClass() 'middleName' => 'BasicRequestAuthenticatorTest', 'surname' => 'Test', 'username' => makeUniqueName('BasicRequestAuthenticatorTest'), - 'email' => makeUniqueName('BasicRequestAuthenticatorTest') .'@unknown123.kot', + 'email' => makeUniqueName('BasicRequestAuthenticatorTest') .'@testmail.stormpath.com', 'password' => 'superP4ss' ) diff --git a/tests/Authc/Api/OAuthBearerRequestAuthenticatorTest.php b/tests/Authc/Api/OAuthBearerRequestAuthenticatorTest.php index e1cea89..15e9da7 100644 --- a/tests/Authc/Api/OAuthBearerRequestAuthenticatorTest.php +++ b/tests/Authc/Api/OAuthBearerRequestAuthenticatorTest.php @@ -40,7 +40,7 @@ public static function setUpBeforeClass() 'middleName' => 'OAuthBearerRequestAuthenticatorTest', 'surname' => 'Test', 'username' => makeUniqueName('OAuthBearerRequestAuthenticatorTest'), - 'email' => makeUniqueName('OAuthBearerRequestAuthenticatorTest') .'@unknown123.kot', + 'email' => makeUniqueName('OAuthBearerRequestAuthenticatorTest') .'@testmail.stormpath.com', 'password' => 'superP4ss' ) diff --git a/tests/Authc/Api/OAuthClientCredentialsAuthenticatorTest.php b/tests/Authc/Api/OAuthClientCredentialsAuthenticatorTest.php index f0e98ea..4fa245d 100644 --- a/tests/Authc/Api/OAuthClientCredentialsAuthenticatorTest.php +++ b/tests/Authc/Api/OAuthClientCredentialsAuthenticatorTest.php @@ -39,7 +39,7 @@ public static function setUpBeforeClass() 'middleName' => 'BasicRequestAuthenticator', 'surname' => 'Test', 'username' => makeUniqueName('OAuthClientCredentialsAuthenticationTest'), - 'email' => makeUniqueName('OAuthClientCredentialsAuthenticationTest') .'@unknown123.kot', + 'email' => makeUniqueName('OAuthClientCredentialsAuthenticationTest') .'@testmail.stormpath.com', 'password' => 'superP4ss' ) diff --git a/tests/Authc/Api/OAuthPasswordRequestAuthenticatorRequest.php b/tests/Authc/Api/OAuthPasswordRequestAuthenticatorRequest.php index b057ad3..e53a4d2 100644 --- a/tests/Authc/Api/OAuthPasswordRequestAuthenticatorRequest.php +++ b/tests/Authc/Api/OAuthPasswordRequestAuthenticatorRequest.php @@ -33,7 +33,7 @@ public static function setUpBeforeClass() 'middleName' => 'BasicRequestAuthenticator', 'surname' => 'Test', 'username' => md5(time() . microtime() . uniqid()) . 'username', - 'email' => md5(time() . microtime() . uniqid()) . '@unknown123.kot', + 'email' => md5(time() . microtime() . uniqid()) . '@testmail.stormpath.com', 'password' => 'superP4ss' ) diff --git a/tests/Authc/Api/OAuthRequestAuthenticatorTest.php b/tests/Authc/Api/OAuthRequestAuthenticatorTest.php index ac750a9..dbe3edd 100644 --- a/tests/Authc/Api/OAuthRequestAuthenticatorTest.php +++ b/tests/Authc/Api/OAuthRequestAuthenticatorTest.php @@ -39,7 +39,7 @@ public static function setUpBeforeClass() 'middleName' => 'OAuthRequestAuthenticator', 'surname' => 'Test', 'username' => makeUniqueName('OAuthRequestAuthenticatorTest'), - 'email' => makeUniqueName('OAuthRequestAuthenticatorTest') .'@unknown123.kot', + 'email' => makeUniqueName('OAuthRequestAuthenticatorTest') .'@testmail.stormpath.com', 'password' => 'superP4ss' ) diff --git a/tests/Cache/Tags/CacheTagExtractorTest.php b/tests/Cache/Tags/CacheTagExtractorTest.php index 7d86915..7bafad4 100644 --- a/tests/Cache/Tags/CacheTagExtractorTest.php +++ b/tests/Cache/Tags/CacheTagExtractorTest.php @@ -9,8 +9,8 @@ public function testExtractSingleExpansionTags() $docJson = << 'My Email', 'description' => 'My Description', 'fromName' => 'John Doe', - 'fromEmailAddress' => 'john.doe@email.com', + 'fromEmailAddress' => 'john.doe@testmail.stormpath.com', 'subject' => 'Your Password has been changed!', 'textBody' => 'Your password has been successfully changed', 'htmlBody' => 'Your password has been successfully changed', @@ -146,11 +146,11 @@ public function from_email_address_is_accessible() /** @test */ public function from_email_address_is_settable() { - static::$modeledEmailTemplate->setFromEmailAddress('john.doe.jr@example.com'); - $this->assertEquals('john.doe.jr@example.com', static::$modeledEmailTemplate->getFromEmailAddress()); + static::$modeledEmailTemplate->setFromEmailAddress('john.doe.jr@testmail.stormpath.com'); + $this->assertEquals('john.doe.jr@testmail.stormpath.com', static::$modeledEmailTemplate->getFromEmailAddress()); - static::$modeledEmailTemplate->fromEmailAddress = 'john.doe@example.com'; - $this->assertEquals('john.doe@example.com', static::$modeledEmailTemplate->getFromEmailAddress()); + static::$modeledEmailTemplate->fromEmailAddress = 'john.doe@testmail.stormpath.com'; + $this->assertEquals('john.doe@testmail.stormpath.com', static::$modeledEmailTemplate->getFromEmailAddress()); } /** @test */ diff --git a/tests/Mail/UnmodeledEmailTemplateTest.php b/tests/Mail/UnmodeledEmailTemplateTest.php index 85f4eb2..684f088 100644 --- a/tests/Mail/UnmodeledEmailTemplateTest.php +++ b/tests/Mail/UnmodeledEmailTemplateTest.php @@ -36,7 +36,7 @@ public static function setUpBeforeClass() 'name' => 'My Email', 'description' => 'My Description', 'fromName' => 'John Doe', - 'fromEmailAddress' => 'john.doe@email.com', + 'fromEmailAddress' => 'john.doe@testmail.stormpath.com', 'subject' => 'Your Password has been changed!', 'textBody' => 'Your password has been successfully changed', 'htmlBody' => 'Your password has been successfully changed', @@ -143,11 +143,11 @@ public function from_email_address_is_accessible() /** @test */ public function from_email_address_is_settable() { - static::$modeledEmailTemplate->setFromEmailAddress('john.doe.jr@example.com'); - $this->assertEquals('john.doe.jr@example.com', static::$modeledEmailTemplate->getFromEmailAddress()); + static::$modeledEmailTemplate->setFromEmailAddress('john.doe.jr@testmail.stormpath.com'); + $this->assertEquals('john.doe.jr@testmail.stormpath.com', static::$modeledEmailTemplate->getFromEmailAddress()); - static::$modeledEmailTemplate->fromEmailAddress = 'john.doe@example.com'; - $this->assertEquals('john.doe@example.com', static::$modeledEmailTemplate->getFromEmailAddress()); + static::$modeledEmailTemplate->fromEmailAddress = 'john.doe@testmail.stormpath.com'; + $this->assertEquals('john.doe@testmail.stormpath.com', static::$modeledEmailTemplate->getFromEmailAddress()); } /** @test */ diff --git a/tests/Mfa/GoogleAuthenticatorFactorTest.php b/tests/Mfa/GoogleAuthenticatorFactorTest.php index 5daa79c..c9224ee 100644 --- a/tests/Mfa/GoogleAuthenticatorFactorTest.php +++ b/tests/Mfa/GoogleAuthenticatorFactorTest.php @@ -53,7 +53,7 @@ public static function setUpBeforeClass() "accountName" => "", "issuer" => "", "secret" => "JBSWY3DPEHPK3PXP", - "keyUri" => "otpauth://totp/Example:alice@google.com?secret=JBSWY3DPEHPK3PXP&issuer=Example", //? + "keyUri" => "otpauth://totp/Example:alice@testmail.stormpath.com?secret=JBSWY3DPEHPK3PXP&issuer=Example", //? "base64QRImage" => "qrcode", "account" => [ "href" => "https://api.stormpath.com/v1/accounts/3w9hThWQ3uAT46sMuWY6dw" @@ -139,11 +139,11 @@ public function account_name_is_accessible() /** @test */ public function account_name_is_settable() { - static::$testable->setAccountName('support@stormpath.com'); - static::assertEquals('support@stormpath.com', static::$testable->getAccountName()); + static::$testable->setAccountName('support@testmail.stormpath.com'); + static::assertEquals('support@testmail.stormpath.com', static::$testable->getAccountName()); - static::$testable->accountName = 'php@stormpath.com'; - static::assertEquals('php@stormpath.com', static::$testable->getAccountName()); + static::$testable->accountName = 'php@testmail.stormpath.com'; + static::assertEquals('php@testmail.stormpath.com', static::$testable->getAccountName()); } @@ -161,7 +161,7 @@ public function a_google_authenticator_factor_can_be_added_to_an_account() $account = $this->setupNewAccount(); $gaFactor = new GoogleAuthenticatorFactor(); - $gaFactor->accountName = 'brian@stormpath.com'; + $gaFactor->accountName = 'brian@testmail.stormpath.com'; $gaFactor->issuer = 'php-test'; $gaFactor->status = Stormpath::ENABLED; @@ -172,7 +172,7 @@ public function a_google_authenticator_factor_can_be_added_to_an_account() $this->assertNull($factor->mostRecentChallenge); $this->assertEquals(Stormpath::ENABLED, $factor->status); $this->assertEquals(Stormpath::UNVERIFIED, $factor->verificationStatus); - $this->assertEquals('brian@stormpath.com', $factor->accountName); + $this->assertEquals('brian@testmail.stormpath.com', $factor->accountName); $this->assertEquals('php-test', $factor->issuer); $account->directory->delete(); @@ -192,7 +192,7 @@ private function setupNewAccount(\Stormpath\Resource\Directory $directory = null 'middleName' => 'Middle Name', 'surname' => 'Surname', 'username' => makeUniqueName('AccountTest smsFactor') . 'username', - 'email' => makeUniqueName('AccountTest smsFactor') .'@mailinator.com', + 'email' => makeUniqueName('AccountTest smsFactor') .'@testmail.stormpath.com', 'password' => 'superP4ss!' ]) ); diff --git a/tests/Mfa/Physical/SmsTest.php b/tests/Mfa/Physical/SmsTest.php index 0435f6a..49b1e5c 100644 --- a/tests/Mfa/Physical/SmsTest.php +++ b/tests/Mfa/Physical/SmsTest.php @@ -91,16 +91,20 @@ public static function tearDownAfterClass() } + /** @test */ + public function returns_true() + { + $this->assertTrue(true); + } + /** - * @test * @group physical */ public function adding_sms_factor_with_challenge_flag_send_a_text_message() { $smsFactor = SmsFactor::instantiate(); -// $smsFactor->phone = '5133608855'; $smsFactor->challenge = 'Validate with ${code}'; $factor = self::$account->addFactor($smsFactor); @@ -127,7 +131,7 @@ private static function setupNewAccount(\Stormpath\Resource\Directory $directory 'middleName' => 'Middle Name', 'surname' => 'Surname', 'username' => makeUniqueName('AccountTest smsFactor') . 'username', - 'email' => makeUniqueName('AccountTest smsFactor') .'@mailinator.com', + 'email' => makeUniqueName('AccountTest smsFactor') .'@testmail.stormpath.com', 'password' => 'superP4ss!' ]) ); diff --git a/tests/Mfa/SmsFactorTest.php b/tests/Mfa/SmsFactorTest.php index f8cc491..e7fc805 100644 --- a/tests/Mfa/SmsFactorTest.php +++ b/tests/Mfa/SmsFactorTest.php @@ -128,7 +128,7 @@ private function setupNewAccount(\Stormpath\Resource\Directory $directory = null 'middleName' => 'Middle Name', 'surname' => 'Surname', 'username' => makeUniqueName('AccountTest smsFactor') . 'username', - 'email' => makeUniqueName('AccountTest smsFactor') .'@mailinator.com', + 'email' => makeUniqueName('AccountTest smsFactor') .'@testmail.stormpath.com', 'password' => 'superP4ss!' ]) ); diff --git a/tests/Oauth/PasswordRefreshGrantTest.php b/tests/Oauth/PasswordRefreshGrantTest.php index 398460f..2d5c34e 100644 --- a/tests/Oauth/PasswordRefreshGrantTest.php +++ b/tests/Oauth/PasswordRefreshGrantTest.php @@ -16,7 +16,7 @@ protected static function init() 'middleName' => 'Middle Name', 'surname' => 'Surname', 'username' => md5(time().microtime().uniqid()) . 'username', - 'email' => md5(time().microtime().uniqid()) .'@unknown123.kot', + 'email' => md5(time().microtime().uniqid()) .'@testmail.stormpath.com', 'password' => 'superP4ss')); self::$application->createAccount(self::$account); diff --git a/tests/Resource/AccountTest.php b/tests/Resource/AccountTest.php index 0dad5fb..4a8ead2 100644 --- a/tests/Resource/AccountTest.php +++ b/tests/Resource/AccountTest.php @@ -67,7 +67,7 @@ protected static function init() { 'middleName' => 'Middle Name', 'surname' => 'Surname', 'username' => makeUniqueName('AccountTest') . 'username', - 'email' => makeUniqueName('AccountTest') .'@unknown123.kot', + 'email' => makeUniqueName('AccountTest') .'@testmail.stormpath.com', 'password' => 'superP4ss')); self::$directory->createAccount(self::$account); @@ -197,7 +197,7 @@ public function testGetters() $this->assertEquals('Account Name Middle Name Surname', $account->fullName); $this->assertEquals(Stormpath::ENABLED, $account->status); $this->assertContains('username', $account->username); - $this->assertContains('@unknown123.kot', $account->email); + $this->assertContains('@testmail.stormpath.com', $account->email); $this->assertInstanceOf('\Stormpath\Resource\Tenant', $account->tenant); $this->assertEquals(self::$client->tenant->name, $account->tenant->name); $this->assertInstanceOf('\Stormpath\Resource\Directory', $account->directory); @@ -237,7 +237,7 @@ public function testSetters() $account->surname = 'Surname'; $account->status = 'unverified'; $account->username = 'username'; - $account->email = 'email@unknown123.kot'; + $account->email = 'email@testmail.stormpath.com'; $account->password = 'superP4ssword'; $this->assertEquals('Account Name', $account->givenName); @@ -245,7 +245,7 @@ public function testSetters() $this->assertEquals('Surname', $account->surname); $this->assertEquals(Stormpath::UNVERIFIED, $account->status); $this->assertEquals('username', $account->username); - $this->assertEquals('email@unknown123.kot', $account->email); + $this->assertEquals('email@testmail.stormpath.com', $account->email); } public function testSave() @@ -253,13 +253,13 @@ public function testSave() try { $account = self::$account; $account->username = 'changed_username'; - $account->email = 'changed_email@unknown123.kot'; + $account->email = 'changed_email@testmail.stormpath.com'; $account->password = 'changedPassw0rd'; $account->save(); $this->assertEquals('changed_username', $account->username); - $this->assertEquals('changed_email@unknown123.kot', $account->email); + $this->assertEquals('changed_email@testmail.stormpath.com', $account->email); } catch(\Exception $e) { var_dump($e); } @@ -390,7 +390,7 @@ public function testAddGroup() 'middleName' => 'Middle Name', 'surname' => 'Surname', 'username' => makeUniqueName('AccountTest testAddGroup') . 'username', - 'email' => makeUniqueName('AccountTest testAddGroup') .'@unknown123.kot', + 'email' => makeUniqueName('AccountTest testAddGroup') .'@testmail.stormpath.com', 'password' => 'superP4ss')); self::$directory->createAccount($account); @@ -454,35 +454,35 @@ public function testAddingCustomData() $this->assertEquals(array('BuildingA', 'BuildingB', 'BuildingC'), $customData->locations); } - public function testCustomDataSearch() - { - - - $account = Account::instantiate(array('givenName' => 'Account Name', - 'middleName' => 'Middle Name', - 'surname' => 'Surname', - 'username' => makeUniqueName('AccountTest') . 'username', - 'email' => makeUniqueName('AccountTest') .'@unknown123.kot', - 'password' => 'superP4ss')); - - self::$directory->createAccount($account); - - $time = microtime(); - $cd = $account->customData; - $cd->unitTest = $time; - $cd->save(); - - - $client = Client::getInstance(); - - $accounts = $client->tenant->accounts->setSearch(['customData.unitTest' => $time]); - if($accounts->size == 1) { - $this->assertEquals(1, $accounts->size); - } else { - $this->markTestSkipped('Could not find account with custom data, Possibly not indexed in time.'); - } - - } +// public function testCustomDataSearch() +// { +// +// +// $account = Account::instantiate(array('givenName' => 'Account Name', +// 'middleName' => 'Middle Name', +// 'surname' => 'Surname', +// 'username' => makeUniqueName('AccountTest') . 'username', +// 'email' => makeUniqueName('AccountTest') .'@testmail.stormpath.com', +// 'password' => 'superP4ss')); +// +// self::$directory->createAccount($account); +// +// $time = microtime(); +// $cd = $account->customData; +// $cd->unitTest = $time; +// $cd->save(); +// +// +// $client = Client::getInstance(); +// +// $accounts = $client->tenant->accounts->setSearch(['customData.unitTest' => $time]); +// if($accounts->size == 1) { +// $this->assertEquals(1, $accounts->size); +// } else { +// $this->markTestSkipped('Could not find account with custom data, Possibly not indexed in time.'); +// } +// +// } public function testUpdatingCustomData() { @@ -501,7 +501,7 @@ public function testUpdatingCustomData() 'middleName' => 'Middle Name', 'surname' => 'Surname', 'username' => makeUniqueName('AccountTest testUpdatingCustomData').'username', - 'email' => makeUniqueName('AccountTest testUpdatingCustomData').'@unknown123.kot', + 'email' => makeUniqueName('AccountTest testUpdatingCustomData').'@testmail.stormpath.com', 'password' => '123quEso')); self::$directory->createAccount($account); @@ -571,7 +571,7 @@ public function testDelete() 'middleName' => 'Middle Name', 'surname' => 'Surname', 'username' => makeUniqueName('AccountTest testDelete') . 'username', - 'email' => makeUniqueName('AccountTest testDelete') .'@unknown123.kot', + 'email' => makeUniqueName('AccountTest testDelete') .'@testmail.stormpath.com', 'password' => 'superP4ss')); self::$directory->createAccount($account); @@ -597,7 +597,7 @@ public function testShouldBeAbleToGetAccountViaHTMLFragment() 'middleName' => 'Middle Name', 'surname' => 'Surname', 'username' => makeUniqueName('AccountTest testShouldBeAbleToGetAccountViaHtmlFragment') . 'username', - 'email' => makeUniqueName('AccountTest testShouldBeAbleToGetAccountViaHtmlFragment') .'@unknown123.kot', + 'email' => makeUniqueName('AccountTest testShouldBeAbleToGetAccountViaHtmlFragment') .'@testmail.stormpath.com', 'password' => 'superP4ss')); self::$directory->createAccount($account); @@ -633,7 +633,7 @@ public function testImportingAPasswordViaStaticCreates() 'middleName' => 'Middle Name', 'surname' => 'Surname', 'username' => $username, - 'email' => makeUniqueName('AccountTest testImportingAPasswordViaStaticCreates') .'@unknown123.kot', + 'email' => makeUniqueName('AccountTest testImportingAPasswordViaStaticCreates') .'@testmail.stormpath.com', 'password' => '$2a$08$VbNS17zvQNYtMyfRiYXxWuec2F2y3SuLB/e7hU8RWdcCxxluUB3m.')); self::$application->createAccount($account, array('passwordFormat'=>'mcf')); @@ -656,7 +656,7 @@ public function testImportingAPasswordViaStandardCreate() self::createResource(Application::PATH, self::$application, array('createDirectory' => true)); $account = $client->dataStore->instantiate(\Stormpath\Stormpath::ACCOUNT); - $account->email = 'john.smith@example.com'; + $account->email = 'john.smith@testmail.stormpath.com'; $account->givenName = 'John'; $account->password ='$2a$08$VbNS17zvQNYtMyfRiYXxWuec2F2y3SuLB/e7hU8RWdcCxxluUB3m.'; $account->surname = 'Smith'; @@ -683,7 +683,7 @@ public function testImportingSelfCreatedPasswordWithMD5() self::createResource(Application::PATH, self::$application, array('createDirectory' => true)); $account = $client->dataStore->instantiate(\Stormpath\Stormpath::ACCOUNT); - $account->email = 'john.smith@example.com'; + $account->email = 'john.smith@testmail.stormpath.com'; $account->givenName = 'John'; $account->password = '$stormpath2$MD5$1$NzEyN2ZhYzdkZTAyMjJlMGQyMWYxMWRmZmY2YjA1MWI=$K18Ak0YikAFrqgglhIaY5g=='; $account->surname = 'Smith'; @@ -709,7 +709,7 @@ public function testImportingSelfCreatedPasswordWithSHA512() self::createResource(Application::PATH, self::$application, array('createDirectory' => true)); $account = $client->dataStore->instantiate(\Stormpath\Stormpath::ACCOUNT); - $account->email = 'john.smith@example.com'; + $account->email = 'john.smith@testmail.stormpath.com'; $account->givenName = 'John'; $account->password = '$stormpath2$SHA-512$1$ZFhBRmpFSnEwVEx2ekhKS0JTMDJBNTNmcg==$Q+sGFg9e+pe9QsUdfnbJUMDtrQNf27ezTnnGllBVkQpMRc9bqH6WkyE3y0svD/7cBk8uJW9Wb3dolWwDtDLFjg=='; $account->surname = 'Smith'; @@ -739,7 +739,7 @@ public function testImportingInvalidPasswordTypeShouldThrowException() self::createResource(Application::PATH, self::$application, array('createDirectory' => true)); $account = $client->dataStore->instantiate(\Stormpath\Stormpath::ACCOUNT); - $account->email = 'john.smith@example.com'; + $account->email = 'john.smith@testmail.stormpath.com'; $account->givenName = 'John'; $account->password ='$INVALID$04$RZPSLGUz3dRdm7aRfxOeYuKeueSPW2YaTpRkszAA31wcPpyg6zkGy'; $account->surname = 'Smith'; @@ -769,7 +769,7 @@ public function testImportingInvalidPasswordFormatTypeShouldThrowException() self::createResource(Application::PATH, self::$application, array('createDirectory' => true)); $account = $client->dataStore->instantiate(\Stormpath\Stormpath::ACCOUNT); - $account->email = 'john.smith@example.com'; + $account->email = 'john.smith@testmail.stormpath.com'; $account->givenName = 'John'; $account->password ='$2a$08$VbNS17zvQNYtMyfRiYXxWuec2F2y3SuLB/e7hU8RWdcCxxluUB3m.'; $account->surname = 'Smith'; @@ -792,7 +792,7 @@ public function a_password_modified_at_date_is_available() 'middleName' => 'Middle Name', 'surname' => 'Surname', 'username' => makeUniqueName('AccountTest testAddGroup') . 'username', - 'email' => makeUniqueName('AccountTest testAddGroup') .'@unknown123.kot', + 'email' => makeUniqueName('AccountTest testAddGroup') .'@testmail.stormpath.com', 'password' => 'superP4ss')); $account = self::$directory->createAccount($account); @@ -812,7 +812,7 @@ public function a_phone_can_be_added_to_an_account() 'middleName' => 'Middle Name', 'surname' => 'Surname', 'username' => makeUniqueName('AccountTest phone') . 'username', - 'email' => makeUniqueName('AccountTest phone') .'@mailinator.com', + 'email' => makeUniqueName('AccountTest phone') .'@testmail.stormpath.com', 'password' => 'superP4ss')); $account = self::$directory->createAccount($account); @@ -850,7 +850,7 @@ public function a_phone_can_be_removed_from_an_account() 'middleName' => 'Middle Name', 'surname' => 'Surname', 'username' => makeUniqueName('AccountTest phone') . 'username', - 'email' => makeUniqueName('AccountTest phone') .'@mailinator.com', + 'email' => makeUniqueName('AccountTest phone') .'@testmail.stormpath.com', 'password' => 'superP4ss')); $account = self::$directory->createAccount($account); diff --git a/tests/Resource/ApplicationTest.php b/tests/Resource/ApplicationTest.php index 902c067..a4471bc 100644 --- a/tests/Resource/ApplicationTest.php +++ b/tests/Resource/ApplicationTest.php @@ -166,7 +166,7 @@ public function itThrowsExceptionIfErrorIsProvidedInHandleUrl() 'code'=>'11001', 'developerMessage'=>'testing', 'message'=>'testing message', - 'moreInfo'=>'mailto:support@stormpath.com', + 'moreInfo'=>'mailto:support@testmail.stormpath.com', 'status'=>401) ) ), @@ -237,7 +237,7 @@ protected function createAccount() 'middleName' => 'Middle Name', 'surname' => 'Surname', 'username' => makeUniqueName('ApplicationTest createAccount') . 'username', - 'email' => makeUniqueName('ApplicationTest createAccount') .'@unknown123.kot', + 'email' => makeUniqueName('ApplicationTest createAccount') .'@testmail.stormpath.com', 'password' => 'superP4ss')); self::$directory->createAccount(self::$account); @@ -352,7 +352,7 @@ public function testCreateAccount() $account = \Stormpath\Resource\Account::instantiate(array('givenName' => 'Account Name', 'surname' => 'Surname', 'username' => makeUniqueName('ApplicationTest testCreateAccount') . 'username', - 'email' => makeUniqueName('ApplicationTest testCreateAccount') .'@unknown123.kot', + 'email' => makeUniqueName('ApplicationTest testCreateAccount') .'@testmail.stormpath.com', 'password' => 'superP4ss')); $application->createAccount($account); @@ -371,7 +371,7 @@ public function testCreateAccountWithCustomData() $account = \Stormpath\Resource\Account::instantiate(array('givenName' => 'Account Name', 'surname' => 'Surname', 'username' => makeUniqueName('ApplicationTest testCreateAccountWithCustomData') . 'username', - 'email' => makeUniqueName('ApplicationTest testCreateAccountWithCustomData') .'@unknown123.kot', + 'email' => makeUniqueName('ApplicationTest testCreateAccountWithCustomData') .'@testmail.stormpath.com', 'password' => 'superP4ss')); $customData = $account->customData; @@ -422,7 +422,7 @@ public function testCreateAccountStoreMapping() public function testSendPasswordResetEmail() { $application = self::$application; - $email = makeUniqueName('ApplicationTest SendPasswordReset') .'@unknown123.kot'; + $email = makeUniqueName('ApplicationTest SendPasswordReset') .'@testmail.stormpath.com'; $account = \Stormpath\Resource\Account::instantiate(array('givenName' => 'Account Name', 'surname' => 'Surname', @@ -459,7 +459,7 @@ public function testSendPasswordResetEmailWithAccountStore() $accountStoreMappingB = \Stormpath\Resource\AccountStoreMapping::instantiate(array('accountStore' => $groupB)); $application->createAccountStoreMapping($accountStoreMappingB); - $email = makeUniqueName('ApplicationTest SendPassword') .'@unknown123.kot'; + $email = makeUniqueName('ApplicationTest SendPassword') .'@testmail.stormpath.com'; $account = \Stormpath\Resource\Account::instantiate(array( 'givenName' => 'Account Name', 'surname' => 'Surname', @@ -509,7 +509,7 @@ public function testSendPasswordResetEmailWithAccountStore() public function testCanResetPasswordFromSPToken() { - $email = makeUniqueName('ApplicationTest SendPassword') .'@unknown123.kot'; + $email = makeUniqueName('ApplicationTest SendPassword') .'@testmail.stormpath.com'; $account = \Stormpath\Resource\Account::instantiate(array( 'givenName' => 'Account Name', 'surname' => 'Surname', @@ -542,7 +542,7 @@ public function testCanVerifySPToken() $application = \Stormpath\Resource\Application::instantiate(array('name' => makeUniqueName('ApplicationTest'), 'description' => 'Description of Main App', 'status' => 'enabled')); self::createResource(\Stormpath\Resource\Application::PATH, $application, array('createDirectory' => true)); - $email = makeUniqueName('ApplicationTest SendPassword') .'@unknown123.kot'; + $email = makeUniqueName('ApplicationTest SendPassword') .'@testmail.stormpath.com'; $account = \Stormpath\Resource\Account::instantiate(array( 'givenName' => 'Account Name', 'surname' => 'Surname', @@ -581,7 +581,7 @@ public function testSendVerificationEmail() $this->assertEquals('ENABLED', $policy->verificationEmailStatus); $username = makeUniqueName('ApplicationTest sendVerificaiton'); - $emailAddress = $username . '@unknown123.kot'; + $emailAddress = $username . '@testmail.stormpath.com'; $account = Account::instantiate(array( 'givenName' => 'Account Name', 'middleName' => 'Middle Name', @@ -632,7 +632,7 @@ public function testSendVerificationEmail() public function testAuthenticate() { $application = self::$application; - $email = makeUniqueName('ApplicationTest testAuth') . '@unknown123.kot'; + $email = makeUniqueName('ApplicationTest testAuth') . '@testmail.stormpath.com'; $account = \Stormpath\Resource\Account::instantiate(array('givenName' => 'Account Name', 'surname' => 'Surname', @@ -667,7 +667,7 @@ public function testAuthenticate() public function testAuthenticateWithAccountStore() { $application = self::$application; - $email = makeUniqueName('ApplicationTest authWithAcctStore') . '@unknown123.kot'; + $email = makeUniqueName('ApplicationTest authWithAcctStore') . '@testmail.stormpath.com'; $groupA = new \stdClass(); $groupA->name = makeUniqueName('ApplicationTest AuthWithAcctStore A'); @@ -779,7 +779,7 @@ public function testApiKeyManagement() 'givenName' => 'Account Name', 'surname' => 'Surname', 'username' => makeUniqueName('ApplicationTest ApiKeyMgt'), - 'email' => makeUniqueName('ApplicationTest ApiKeyMgt') .'@unknown123.kot', + 'email' => makeUniqueName('ApplicationTest ApiKeyMgt') .'@testmail.stormpath.com', 'password' => 'superP4ss')); $application->createAccount($account); diff --git a/tests/Resource/DirectoryTest.php b/tests/Resource/DirectoryTest.php index 2916f83..3d6b49f 100644 --- a/tests/Resource/DirectoryTest.php +++ b/tests/Resource/DirectoryTest.php @@ -98,7 +98,7 @@ public function testCreateAccount() $account = \Stormpath\Resource\Account::instantiate(array('givenName' => 'Account Name', 'surname' => 'Surname', - 'email' => makeUniqueName('DirectoryTest createAccount') . '@unknown123.kot', + 'email' => makeUniqueName('DirectoryTest createAccount') . '@testmail.stormpath.com', 'password' => 'superP4ss')); $directory->createAccount($account, array('registrationWorkflowEnabled' => false)); diff --git a/tests/Resource/GroupMembershipTest.php b/tests/Resource/GroupMembershipTest.php index b944b69..4e8f4d1 100644 --- a/tests/Resource/GroupMembershipTest.php +++ b/tests/Resource/GroupMembershipTest.php @@ -37,7 +37,7 @@ protected static function init() self::$account = \Stormpath\Resource\Account::instantiate(array('givenName' => 'Account Name', 'surname' => 'Surname', - 'email' => makeUniqueName('GroupMembershipTest') .'@unknown123.kot', + 'email' => makeUniqueName('GroupMembershipTest') .'@testmail.stormpath.com', 'password' => 'superP4ss')); self::$directory->createAccount(self::$account); @@ -82,7 +82,7 @@ public function testGet() $this->assertInstanceOf('\Stormpath\Resource\GroupMembership', $groupMembership); $this->assertContains('Main_Group', $groupMembership->group->name); - $this->assertContains('@unknown123.kot', $groupMembership->account->email); + $this->assertContains('@testmail.stormpath.com', $groupMembership->account->email); } public function testCreate() @@ -93,7 +93,7 @@ public function testCreate() $account = \Stormpath\Resource\Account::instantiate(array('givenName' => 'Account Name', 'surname' => 'Surname', - 'email' => makeUniqueName('GroupMembershipTest testCreate') .'@unknown12345.kot', + 'email' => makeUniqueName('GroupMembershipTest testCreate') .'@testmail.stormpath.com', 'password' => 'superP4ss')); self::$directory->createAccount($account); @@ -107,7 +107,7 @@ public function testCreate() $this->assertInstanceOf('\Stormpath\Resource\GroupMembership', $groupMembership); $this->assertContains('testCreate', $groupMembership->group->name); - $this->assertContains('@unknown12345.kot', $groupMembership->account->email); + $this->assertContains('@testmail.stormpath.com', $groupMembership->account->email); } @@ -122,7 +122,7 @@ public function testDelete() $account = \Stormpath\Resource\Account::instantiate(array('givenName' => 'Account Name', 'surname' => 'Surname', - 'email' => makeUniqueName('GroupMembershipTest testDelete') .'@unknown12345678.kot', + 'email' => makeUniqueName('GroupMembershipTest testDelete') .'@testmail.stormpath.com', 'password' => 'superP4ss')); self::$directory->createAccount($account); @@ -133,7 +133,7 @@ public function testDelete() $this->assertInstanceOf('\Stormpath\Resource\GroupMembership', $groupMembership); $this->assertContains('testDelete', $groupMembership->group->name); - $this->assertContains('@unknown12345678.kot', $groupMembership->account->email); + $this->assertContains('@testmail.stormpath.com', $groupMembership->account->email); $href = $groupMembership->href; diff --git a/tests/Resource/GroupTest.php b/tests/Resource/GroupTest.php index b7bc2d9..e217347 100644 --- a/tests/Resource/GroupTest.php +++ b/tests/Resource/GroupTest.php @@ -92,7 +92,7 @@ public function testAddAccount() { $group = self::$group; - $email = makeUniqueName('GroupTest addAccount') .'@unknown123.kot'; + $email = makeUniqueName('GroupTest addAccount') .'@testmail.stormpath.com'; $account = \Stormpath\Resource\Account::instantiate(array('givenName' => 'Account Name', 'surname' => 'Surname', 'email' => $email, diff --git a/tests/Resource/OrganizationTest.php b/tests/Resource/OrganizationTest.php index 4f08cce..f9e41b6 100644 --- a/tests/Resource/OrganizationTest.php +++ b/tests/Resource/OrganizationTest.php @@ -234,7 +234,7 @@ public function an_account_can_be_added_to_organization() { $account = \Stormpath\Resource\Account::instantiate(array('givenName' => 'Account Name', 'surname' => 'Surname', - 'email' => makeUniqueName('DirectoryTest createAccount') . '@unknown123.kot', + 'email' => makeUniqueName('DirectoryTest createAccount') . '@testmail.stormpath.com', 'password' => 'superP4ss')); $organization = Organization::instantiate([ diff --git a/tests/Resource/SamlProviderMetadataTest.php b/tests/Resource/SamlProviderMetadataTest.php index a5d7299..37da824 100644 --- a/tests/Resource/SamlProviderMetadataTest.php +++ b/tests/Resource/SamlProviderMetadataTest.php @@ -42,7 +42,7 @@ public static function setUpBeforeClass() /** @test */ public function it_can_get_the_entity_id() { - $this->assertEquals('urn:stormpath:directory:'.self::$directoryId.':provider:sp', self::$metadata->getEntityId()); + $this->assertEquals(self::$directory->href, self::$metadata->getEntityId()); } /** @test */