[2.x] Change current team of user when creating a new additional team (…

…#618) * Change current team of user when creating a new team * Update stubs/app/Actions/Jetstream/CreateTeam.php Co-authored-by: Joel Butcher <[email protected]> * Update CreateTeam.php * Fixed changes wanted by StyleCI * Remove an unneeded test * Update TeamBehaviorTest.php * Update CreateTeam.php * Attempt to fix StyleCI errors Co-authored-by: Joel Butcher <[email protected]>
laravel · Jan 11, 2021 · 00f9d74 · 00f9d74
1 parent 6c226b4
commit 00f9d74
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/stubs/app/Actions/Jetstream/CreateTeam.php b/stubs/app/Actions/Jetstream/CreateTeam.php
@@ -27,9 +27,13 @@ public function create($user, array $input)
 
         AddingTeam::dispatch($user);
 
-        return $user->ownedTeams()->create([
+        $team = $user->ownedTeams()->create([
             'name' => $input['name'],
             'personal_team' => false,
         ]);
+
+        $user->switchTeam($team);
+
+        return $team;
     }
 }
diff --git a/tests/TeamBehaviorTest.php b/tests/TeamBehaviorTest.php
@@ -145,11 +145,9 @@ public function test_user_does_not_need_to_refresh_after_switching_teams()
 
         $personalTeam->forceFill(['personal_team' => true])->save();
 
-        $anotherTeam = $action->create($user, ['name' => 'Test Team']);
-
         $this->assertTrue($user->isCurrentTeam($personalTeam));
 
-        $user->switchTeam($anotherTeam);
+        $anotherTeam = $action->create($user, ['name' => 'Test Team']);
 
         $this->assertTrue($user->isCurrentTeam($anotherTeam));
     }