Merge branch '5.0-dev' into 5.0/fix/formfilter

joomla · Aug 22, 2023 · 5355399 · 5355399
2 parents d651f8e + bbcbfcb
commit 5355399
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 1 deletion.
diff --git a/administrator/modules/mod_submenu/tmpl/default.php b/administrator/modules/mod_submenu/tmpl/default.php
@@ -14,7 +14,7 @@
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Router\Route;
 
-$user = $this->getCurrentUser();
+$user = $app->getIdentity();
 
 /** @var  \Joomla\CMS\Menu\MenuItem  $root */
 ?>

diff --git a/tests/System/integration/administrator/components/com_cpanel/CPanel.cy.js b/tests/System/integration/administrator/components/com_cpanel/CPanel.cy.js
@@ -0,0 +1,21 @@
+describe('Test in backend that the cpanel system dashboard', () => {
+  beforeEach(() => {
+    cy.doAdministratorLogin();
+    cy.visit('/administrator/index.php?option=com_cpanel&view=cpanel&dashboard=system');
+  });
+
+  it('has a title', () => {
+    cy.contains('h1', 'System Dashboard').should('exist');
+  });
+
+  it('can display the modules', () => {
+    cy.contains('h2', 'Setup').should('exist');
+    cy.contains('h2', 'Install').should('exist');
+    cy.contains('h2', 'Templates').should('exist');
+    cy.contains('h2', 'Maintenance').should('exist');
+    cy.contains('h2', 'Manage').should('exist');
+    cy.contains('h2', 'Information').should('exist');
+    cy.contains('h2', 'Update').should('exist');
+    cy.contains('h2', 'User Permissions ').should('exist');
+  });
+});