Merge pull request #519 from lorenzomaieru/master

Drop default config before defining test config

Author: steinkel

.semver

@@ -1,5 +1,5 @@
 ---
 :major: 4
 :minor: 2
-:patch: 0
+:patch: 1
 :special: ''

CHANGELOG.md

@@ -4,9 +4,20 @@ Changelog
 Releases for CakePHP 3
 -------------
 
+* 4.2.1
+  * Improvements in unit tests
+
 * 4.2.0
   * New configuration param `Users.Registration.defaultRole` to set the default role on user registration or addUser Shell action
 
+* 4.1.3
+  * Configurable rememberMe checkbox status
+  * Update brazilian portuguese translations
+  * Add active finder to SocialAccountsTable
+  * Improvements in UsersShell for superuser add options
+  * Update to robthree/twofactorauth 1.6
+  * UserHelper improvements
+
 * 4.1.2
   * Fix RememberMe redirect
   * Fix AuthLink rendering inside Cells

tests/TestCase/Controller/SocialAccountsControllerTest.php

@@ -50,6 +50,7 @@ public function setUp()
             'className' => 'Debug'
         ]);
         $this->configEmail = Email::config('default');
+        Email::drop('default');
         Email::config('default', [
             'transport' => 'test',
             'from' => '[email protected]'

tests/TestCase/Controller/Traits/BaseTraitTest.php

@@ -64,6 +64,7 @@ public function setUp()
                 'className' => 'Debug'
             ]);
             $this->configEmail = Email::config('default');
+            Email::drop('default');
             Email::config('default', [
                 'transport' => 'test',
                 'from' => '[email protected]'