[CI] Fix dusk tests for new admin/dashboard URL

barryo · barryo · commit 66d10d887df9 · 2026-02-18T00:12:58.000Z
diff --git a/tests/Browser/ApiKeyControllerTest.php b/tests/Browser/ApiKeyControllerTest.php
@@ -70,7 +70,7 @@ public function test(): void
                 ->type( 'username', 'travis' )
                 ->type( 'password', 'travisci' )
                 ->press( '#login-btn' )
-                ->waitForLocation( '/admin' );
+                ->waitForLocation( '/admin/dashboard' );
 
             $browser->visit( '/api-key/list' )
                 ->assertSee( 'API Keys' )
diff --git a/tests/Browser/CabinetControllerTest.php b/tests/Browser/CabinetControllerTest.php
@@ -70,7 +70,7 @@ public function testCabinet(): void
                 ->type( 'username', 'travis' )
                 ->type( 'password', 'travisci' )
                 ->press( '#login-btn' )
-                ->waitForLocation( '/admin' );
+                ->waitForLocation( '/admin/dashboard' );
 
             $browser->visit( route( 'rack@list' ) )
                 ->assertSee( 'Racks' )
diff --git a/tests/Browser/ConsoleServerControllerTest.php b/tests/Browser/ConsoleServerControllerTest.php
@@ -76,7 +76,7 @@ public function testConsoleServers(): void
                 ->type( 'username', 'travis' )
                 ->type( 'password', 'travisci' )
                 ->press( '#login-btn' )
-                ->waitForLocation( '/admin' );
+                ->waitForLocation( '/admin/dashboard' );
 
             $browser->visit( route( 'console-server@list' ) )
                 ->waitForText( 'Console Servers' );
diff --git a/tests/Browser/ContactControllerTest.php b/tests/Browser/ContactControllerTest.php
@@ -67,7 +67,7 @@ public function testAdd(): void
                 ->type( 'username', 'travis' )
                 ->type( 'password', 'travisci' )
                 ->press( '#login-btn' )
-                ->waitForLocation( '/admin' );
+                ->waitForLocation( '/admin/dashboard' );
 
             $browser->visit( '/contact/list' )
                 ->assertSee( 'HEAnet CustAdmin' )
diff --git a/tests/Browser/CoreBundleControllerTest.php b/tests/Browser/CoreBundleControllerTest.php
@@ -77,7 +77,7 @@ public function testAddWizard(): void
                 ->type( 'username', 'travis' )
                 ->type( 'password', 'travisci' )
                 ->press( '#login-btn' )
-                ->waitForLocation( '/admin' );
+                ->waitForLocation( '/admin/dashboard' );
 
             $coreBundlesList = [
                 CoreBundle::TYPE_ECMP => [
diff --git a/tests/Browser/CustomerEquipmentControllerTest.php b/tests/Browser/CustomerEquipmentControllerTest.php
@@ -69,7 +69,7 @@ public function testColocatedEquipment(): void
                 ->type( 'username', 'travis' )
                 ->type( 'password', 'travisci' )
                 ->press( '#login-btn' )
-                ->waitForLocation( '/admin' );
+                ->waitForLocation( '/admin/dashboard' );
 
             $browser->visit( route( 'cust-kit@list' ) )
                 ->assertSee( 'Colocated Equipment' );
diff --git a/tests/Browser/InfrastructureControllerTest.php b/tests/Browser/InfrastructureControllerTest.php
@@ -68,7 +68,7 @@ public function testAdd(): void
                 ->type( 'username', 'travis' )
                 ->type( 'password', 'travisci' )
                 ->press( '#login-btn' )
-                ->waitForLocation( '/admin' );
+                ->waitForLocation( '/admin/dashboard' );
 
             $browser->visit( route( 'infrastructure@list' ) )
                 ->assertSee( 'Infrastructures' )
diff --git a/tests/Browser/IpAddressControllerTest.php b/tests/Browser/IpAddressControllerTest.php
@@ -103,7 +103,7 @@ public function testIpAddress(): void
                 ->type( 'username', 'travis' )
                 ->type( 'password', 'travisci' )
                 ->press( '#login-btn' )
-                ->waitForLocation( '/admin' );
+                ->waitForLocation( '/admin/dashboard' );
 
             $vlan = Vlan::create( $this->vlan );
             $vlanId = $vlan->id;
diff --git a/tests/Browser/IrrdbConfigControllerTest.php b/tests/Browser/IrrdbConfigControllerTest.php
@@ -69,7 +69,7 @@ public function testIRRDBConfig(): void
                 ->type( 'username', 'travis' )
                 ->type( 'password', 'travisci' )
                 ->press( '#login-btn' )
-                ->waitForLocation( '/admin' );
+                ->waitForLocation( '/admin/dashboard' );
 
             $browser->visit( route( 'irrdb-config@list' ) )
                 ->assertSee( 'IRRDB Sources' );
diff --git a/tests/Browser/LocationControllerTest.php b/tests/Browser/LocationControllerTest.php
@@ -71,7 +71,7 @@ public function testAdd(): void
                     ->type( 'username', 'travis'    )
                     ->type( 'password', 'travisci'  )
                     ->press( '#login-btn'   )
-                    ->waitForLocation( '/admin'    );
+                    ->waitForLocation( '/admin/dashboard'    );
 
             $browser->visit( route( 'facility@list' )   )
                     ->assertSee( 'Facilities'   )
diff --git a/tests/Browser/LoginTest.php b/tests/Browser/LoginTest.php
@@ -55,8 +55,8 @@ public function testExample(): void
                     ->type( 'username', 'travis' )
                     ->type( 'password', 'travisci' )
                     ->press( '#login-btn' )
-                    ->waitForLocation( '/admin' )
-                    ->assertPathIs( '/admin' );
+                    ->waitForLocation( '/admin/dashboard' )
+                    ->assertPathIs( '/admin/dashboard' );
         });
     }
 }
diff --git a/tests/Browser/RouterControllerTest.php b/tests/Browser/RouterControllerTest.php
@@ -69,7 +69,7 @@ public function testAdd(): void
                 ->type( 'username', 'travis' )
                 ->type( 'password', 'travisci' )
                 ->press( '#login-btn' )
-                ->waitForLocation( '/admin' );
+                ->waitForLocation( '/admin/dashboard' );
 
             $browser->visit( route( 'router@create' ) )
                 ->assertSee( 'Handle' );
diff --git a/tests/Browser/SettingsControllerTest.php b/tests/Browser/SettingsControllerTest.php
@@ -80,7 +80,7 @@ public function testSettings(): void
                 ->type( 'username', 'travis' )
                 ->type( 'password', 'travisci' )
                 ->press( '#login-btn' )
-                ->waitForLocation( '/admin' );
+                ->waitForLocation( '/admin/dashboard' );
 
             $browser->visit( route( 'settings@index' ) )
                 ->assertSee( 'IXP Manager Settings' );
diff --git a/tests/Browser/SwitchControllerTest.php b/tests/Browser/SwitchControllerTest.php
@@ -71,7 +71,7 @@ public function testAdd(): void
                     ->type( 'username', 'travis' )
                     ->type( 'password', 'travisci' )
                     ->press( '#login-btn' )
-                    ->waitForLocation( '/admin' );
+                    ->waitForLocation( '/admin/dashboard' );
 
             $browser->visit( route( 'switch@list' ) )
                 ->assertSee( 'switch1' )
diff --git a/tests/Browser/SwitchPortControllerTest.php b/tests/Browser/SwitchPortControllerTest.php
@@ -57,7 +57,7 @@ public function testSwitchPort(): void
                     ->type( 'username', 'travis' )
                     ->type( 'password', 'travisci' )
                     ->press( '#login-btn' )
-                    ->waitForLocation( '/admin' )
+                    ->waitForLocation( '/admin/dashboard' )
                     ->visit( route( 'switch-port@list' ) );
 
             /**
diff --git a/tests/Browser/User2FAControllerTest.php b/tests/Browser/User2FAControllerTest.php
@@ -90,7 +90,7 @@ public function test(): void
                 ->type('username', $userUsername )
                 ->type('password', $userPassword )
                 ->press('#login-btn' )
-                ->waitForLocation('/admin');
+                ->waitForLocation( '/admin/dashboard' );
 
             $browser->visit('/profile')
                     ->assertPathIs('/profile');
@@ -138,7 +138,7 @@ public function test(): void
              */
             $browser->type('one_time_password', $otp)
                 ->press('Authenticate')
-                ->waitForLocation('/admin')
+                ->waitForLocation( '/admin/dashboard' )
                 ->assertDontSee('The one time password entered was wrong.');
 
 
@@ -245,7 +245,7 @@ private function checkOtpAndPassword( Browser $browser, string $userPassword, Us
         $browser->type( '#one_time_password', $otp )
                 ->type( 'password', $userPassword )
                 ->press( 'Enable 2FA' )
-                ->waitForLocation( '/admin')
+                ->waitForLocation( '/admin/dashboard')
                 ->assertSee( '2FA successfully enabled.',1);
 
         //Check 2fa is enabled
diff --git a/tests/Browser/UserControllerTest.php b/tests/Browser/UserControllerTest.php
@@ -85,7 +85,7 @@ public function testAdd(): void
                 ->type( 'username', 'travis' )
                 ->type( 'password', 'travisci' )
                 ->press( '#login-btn' )
-                ->waitForLocation( '/admin' );
+                ->waitForLocation( '/admin/dashboard' );
 
             $browser->visit( '/user/list' )
                 ->assertSee( 'hecustadmin' )
@@ -494,7 +494,7 @@ public function testAdd(): void
                 ->assertSeeIn( "#my-account-dd", "Imagine" );
 
             $browser->click( "#switch-cust-1" )
-                ->waitForLocation( "/admin" )
+                ->waitForLocation( "/admin/dashboard" )
                 ->assertSee( "You are now logged in for INEX." );
 
 
@@ -736,7 +736,7 @@ public function testSuperAdminPrivs(): void
                 ->type( 'username', 'travis' )
                 ->type( 'password', 'travisci' )
                 ->press( '#login-btn' )
-                ->waitForLocation( '/admin' );
+                ->waitForLocation( '/admin/dashboard' );
 
             /** @var Customer $nonInternalCust */
             $nonInternalCust = Customer::whereType( Customer::TYPE_FULL )->first();
diff --git a/tests/Browser/UserRememberTokenControllerTest.php b/tests/Browser/UserRememberTokenControllerTest.php
@@ -66,7 +66,7 @@ public function testAdd(): void
                     ->type('username', $user->username )
                     ->type('password', 'travisci' )
                     ->press('#login-btn' )
-                    ->waitForLocation( '/admin' );
+                    ->waitForLocation( '/admin/dashboard' );
 
             /**
              * Check that the remember cookie and DB entry is not existing as we didn't check the remember me checkbox
@@ -85,7 +85,7 @@ public function testAdd(): void
                     ->type('password', 'travisci' )
                     ->check( '#remember-me')
                     ->press('#login-btn' )
-                    ->waitForLocation( '/admin' );
+                    ->waitForLocation( '/admin/dashboard' );
 
             /**
              * Check that the remember cookie and DB entry is existing as we checked the remember me checkbox
@@ -105,7 +105,7 @@ public function testAdd(): void
                 ->type('password', 'travisci' )
                 ->check( '#remember-me')
                 ->press('#login-btn' )
-                ->waitForLocation( '/admin' );
+                ->waitForLocation( '/admin/dashboard' );
 
             /**
              * Check that the remember cookie exist in the new browser
diff --git a/tests/Browser/VendorControllerTest.php b/tests/Browser/VendorControllerTest.php
@@ -71,7 +71,7 @@ public function testVendor(): void
                 ->type( 'username', 'travis' )
                 ->type( 'password', 'travisci' )
                 ->press( '#login-btn' )
-                ->waitForLocation( '/admin' );
+                ->waitForLocation( '/admin/dashboard' );
 
             $browser->visit( route( 'vendor@list' ) )
                 ->assertSee( 'Vendors' );
diff --git a/tests/Browser/VirtualInterfaceControllerTest.php b/tests/Browser/VirtualInterfaceControllerTest.php
@@ -60,7 +60,7 @@ public function testAddWizard(): void
                 ->type('username', 'travis' )
                 ->type('password', 'travisci' )
                 ->press('#login-btn' )
-                ->waitForLocation('/admin' );
+                ->waitForLocation('/admin/dashboard' );
 
             $vi = $this->intTestVi( $browser );
 
diff --git a/tests/Browser/VlanControllerTest.php b/tests/Browser/VlanControllerTest.php
@@ -70,7 +70,7 @@ public function testAdd(): void
                 ->type( 'username', 'travis' )
                 ->type( 'password', 'travisci' )
                 ->press( '#login-btn' )
-                ->waitForLocation( '/admin' );
+                ->waitForLocation( '/admin/dashboard' );
 
             $browser->visit( route( 'vlan@list' ) )
                 ->assertSee( 'VLANs' );
