added 'auth-multi-user-login' test

frontend/packages/console-app/src/components/tour/TourStepComponent.tsx

@@ -88,6 +88,7 @@ const TourStepComponent: React.FC<TourStepComponentProps> = ({
       footer={footer}
       onClose={handleClose}
       id="guided-tour-modal"
+      data-test="guided-tour-modal"
       aria-label={`guided tour ${step}`}
     >
       {stepContent}

frontend/packages/console-app/src/components/tour/steps/StepFooter.tsx

@@ -21,12 +21,22 @@ const StepFooter: React.FC<StepFooterProps> = ({
   <Flex>
     {children && <FlexItem>{children}</FlexItem>}
     <FlexItem align={{ default: 'alignRight' }}>
-      <Button variant="secondary" id="tour-step-footer-secondary" onClick={secondaryButtonCallback}>
+      <Button
+        variant="secondary"
+        id="tour-step-footer-secondary"
+        data-test="tour-step-footer-secondary"
+        onClick={secondaryButtonCallback}
+      >
         {secondaryButton}
       </Button>
     </FlexItem>
     <FlexItem>
-      <Button variant="primary" id="tour-step-footer-primary" onClick={primaryButtonCallback}>
+      <Button
+        variant="primary"
+        id="tour-step-footer-primary"
+        data-test="tour-step-footer-primary"
+        onClick={primaryButtonCallback}
+      >
         {primaryButton}
       </Button>
     </FlexItem>

frontend/packages/integration-tests-cypress/plugins/index.js

@@ -48,6 +48,9 @@ module.exports = (on, config) => {
   config.baseUrl = `${process.env.BRIDGE_BASE_ADDRESS || 'http://localhost:9000'}${(
     process.env.BRIDGE_BASE_PATH || '/'
   ).replace(/\/$/, '')}`;
+  config.env.BRIDGE_HTPASSWD_IDP = process.env.BRIDGE_HTPASSWD_IDP;
+  config.env.BRIDGE_HTPASSWD_USERNAME = process.env.BRIDGE_HTPASSWD_USERNAME;
+  config.env.BRIDGE_HTPASSWD_PASSWORD = process.env.BRIDGE_HTPASSWD_PASSWORD;
   config.env.BRIDGE_KUBEADMIN_PASSWORD = process.env.BRIDGE_KUBEADMIN_PASSWORD;
   return config;
 };

frontend/packages/integration-tests-cypress/support/index.ts

@@ -20,6 +20,11 @@ Cypress.Cookies.defaults({
   preserve: ['openshift-session-token', 'csrf-token'],
 });
 
+Cypress.Commands.overwrite('log', (originalFn, message) => {
+  cy.task('log', `    ${message}`, { log: false }); // log:false means do not log task in runner GUI
+  originalFn(message); // calls original cy.log(message)
+});
+
 Cypress.Commands.add('logA11yViolations', (violations: Result[], target: string) => {
   // pluck specific keys to keep the table readable
   const violationData = violations.map(({ id, impact, description, nodes }) => ({

frontend/packages/integration-tests-cypress/support/login.ts

@@ -1,4 +1,5 @@
 import { submitButton } from '../views/form';
+import { masthead } from '../views/masthead';
 
 declare global {
   namespace Cypress {
@@ -32,7 +33,7 @@ Cypress.Commands.add('login', (provider: string, username: string, password: str
   cy.get('#inputUsername').type(username || KUBEADMIN_USERNAME);
   cy.get('#inputPassword').type(password || Cypress.env('BRIDGE_KUBEADMIN_PASSWORD'));
   cy.get(submitButton).click();
-  cy.byTestID('user-dropdown').should('be.visible');
+  masthead.username.shouldBeVisible();
 });
 
 Cypress.Commands.add('logout', () => {

frontend/packages/integration-tests-cypress/tests/app/auth-multiuser-login.spec.ts

@@ -0,0 +1,63 @@
+import { checkErrors } from '../../support';
+import { guidedTour } from '../../views/guided-tour';
+import { nav } from '../../views/nav';
+import { masthead } from '../../views/masthead';
+
+describe('Auth test', () => {
+  const KUBEADMIN_IDP = 'kube:admin';
+  const KUBEADMIN_USERNAME = 'kubeadmin';
+
+  afterEach(() => {
+    checkErrors();
+    cy.logout();
+  });
+
+  if (Cypress.env('BRIDGE_KUBEADMIN_PASSWORD')) {
+    it(`logs in as 'test' user via htpasswd identity provider`, () => {
+      const idp = Cypress.env('BRIDGE_HTPASSWD_IDP') || 'test';
+      const username = Cypress.env('BRIDGE_HTPASSWD_USERNAME') || 'test';
+      const passwd = Cypress.env('BRIDGE_HTPASSWD_PASSWORD') || 'test';
+      cy.login(idp, username, passwd);
+      cy.url().should('include', Cypress.config('baseUrl'));
+      guidedTour.close();
+      masthead.username.shouldHaveText(username);
+
+      cy.log('switches from dev to admin perspective');
+      nav.sidenav.switcher.shouldHaveText('Developer');
+      nav.sidenav.switcher.changePerspectiveTo('Administrator');
+      nav.sidenav.switcher.shouldHaveText('Administrator');
+
+      cy.log('does not show admin nav items in Administration to test user');
+      nav.sidenav.shouldNotHaveNavSection(['Administration', 'Cluster Status']);
+      nav.sidenav.shouldNotHaveNavSection(['Administration', 'Cluster Settings']);
+      nav.sidenav.shouldNotHaveNavSection(['Administration', 'Namespaces']);
+      nav.sidenav.shouldNotHaveNavSection(['Administration', 'Custom Resource Definitions']);
+
+      cy.log('does not show admin nav items in Operators to test user');
+      nav.sidenav.shouldNotHaveNavSection(['Operators', 'OperatorHub']);
+
+      cy.log('does not show admin nav items in Storage to test user');
+      nav.sidenav.shouldNotHaveNavSection(['Storage', 'Persistent Volumes']);
+
+      cy.log('does not show Compute or Monitoring to test user');
+      nav.sidenav.shouldNotHaveNavSection(['Compute']);
+      nav.sidenav.shouldNotHaveNavSection(['Monitoring']);
+    });
+  }
+
+  it(`log in as 'kubeadmin' user`, () => {
+    cy.login(KUBEADMIN_IDP, KUBEADMIN_USERNAME, Cypress.env('BRIDGE_KUBEADMIN_PASSWORD'));
+    cy.visit('');
+    cy.url().should('include', Cypress.config('baseUrl'));
+    masthead.username.shouldHaveText(KUBEADMIN_IDP);
+    cy.byTestID('global-notifications').contains(
+      'You are logged in as a temporary administrative user. Update the cluster OAuth configuration to allow others to log in.',
+    );
+
+    cy.log('verify sidenav menus and Administration menu access for cluster admin user');
+    nav.sidenav.shouldHaveNavSection(['Compute']);
+    nav.sidenav.shouldHaveNavSection(['Operators']);
+    nav.sidenav.clickNavLink(['Administration', 'Cluster Settings']);
+    cy.byLegacyTestID('cluster-settings-page-heading').should('be.visible');
+  });
+});

frontend/packages/integration-tests-cypress/tests/monitoring/monitoring.spec.ts

@@ -3,6 +3,7 @@ import { submitButton, errorMessage } from '../../views/form';
 import { listPage } from '../../views/list-page';
 import { detailsPage } from '../../views/details-page';
 import { modal } from '../../views/modal';
+import { nav } from '../../views/nav';
 
 const shouldBeWatchdogAlertDetailsPage = () => {
   cy.byTestID('resource-title').contains('Watchdog');
@@ -39,7 +40,7 @@ describe('Monitoring: Alerts', () => {
 
   it('displays and filters the Alerts list page, links to detail pages', () => {
     cy.log('use vert. nav. menu to goto Monitoring -> Alerting');
-    cy.clickNavLink(['Monitoring', 'Alerting']);
+    nav.sidenav.clickNavLink(['Monitoring', 'Alerting']);
     // TODO, switch to 'listPage.titleShouldHaveText('Alerting');', when we switch to new test id
     cy.byLegacyTestID('resource-title').should('have.text', 'Alerting');
     listPage.projectDropdownShouldNotExist();

frontend/packages/integration-tests-cypress/tests/storage/snapshot.spec.ts

@@ -4,6 +4,7 @@ import { listPage } from '../../views/list-page';
 import { PVC, testerDeployment, SnapshotClass } from '../../mocks/snapshot';
 import { detailsPage } from '../../views/details-page';
 import { modal } from '../../views/modal';
+import { nav } from '../../views/nav';
 import { resourceStatusShouldContain } from '../../views/common';
 
 const snapshotName = `${PVC.metadata.name}-snapshot`;
@@ -17,7 +18,7 @@ if (Cypress.env('BRIDGE_AWS')) {
       cy.exec(`echo '${JSON.stringify(PVC)}' | oc apply -n ${testName} -f -`);
       cy.exec(`echo '${JSON.stringify(testerDeployment)}' | oc apply -n ${testName} -f -`);
       cy.exec(`echo '${JSON.stringify(SnapshotClass)}' | oc apply -f -`);
-      cy.clickNavLink(['Storage', 'Persistent Volume Claims']);
+      nav.sidenav.clickNavLink(['Storage', 'Persistent Volume Claims']);
       listPage.filter.byName(PVC.metadata.name);
       resourceStatusShouldContain('Bound');
     });
@@ -35,7 +36,7 @@ if (Cypress.env('BRIDGE_AWS')) {
     });
 
     it('Creates Snapshot', () => {
-      cy.clickNavLink(['Volume Snapshots']);
+      nav.sidenav.clickNavLink(['Volume Snapshots']);
       listPage.clickCreateYAMLbutton();
       cy.byTestID('pvc-dropdown').click();
       cy.get(dropdownFirstItem)
@@ -69,7 +70,7 @@ if (Cypress.env('BRIDGE_AWS')) {
     });
 
     it('Lists Snapshot', () => {
-      cy.clickNavLink(['Volume Snapshots']);
+      nav.sidenav.clickNavLink(['Volume Snapshots']);
       listPage.rows.shouldBeLoaded();
       listPage.rows.shouldExist(snapshotName);
       listPage.rows.shouldNotExist(`${snapshotName}dup`);

frontend/packages/integration-tests-cypress/views/guided-tour.ts

@@ -0,0 +1,11 @@
+export const guidedTour = {
+  close: () => {
+    cy.get('body').then(($body) => {
+      if ($body.find(`[data-test="guided-tour-modal"]`).length) {
+        cy.byTestID('tour-step-footer-secondary')
+          .contains('Skip tour')
+          .click();
+      }
+    });
+  },
+};

frontend/packages/integration-tests-cypress/views/masthead.ts

@@ -0,0 +1,12 @@
+export const masthead = {
+  username: {
+    shouldBeVisible: () =>
+      cy
+        .byTestID(Cypress.env('BRIDGE_KUBEADMIN_PASSWORD') ? 'user-dropdown' : 'username')
+        .should('be.visible'),
+    shouldHaveText: (text: string) =>
+      cy
+        .byTestID(Cypress.env('BRIDGE_KUBEADMIN_PASSWORD') ? 'user-dropdown' : 'username')
+        .should('have.text', text),
+  },
+};

frontend/packages/integration-tests-cypress/views/nav.ts

@@ -0,0 +1,28 @@
+export const nav = {
+  sidenav: {
+    switcher: {
+      shouldHaveText: (text: string) =>
+        cy.byLegacyTestID('perspective-switcher-toggle').contains(text),
+      changePerspectiveTo: (newPerspective: string) =>
+        cy
+          .byLegacyTestID('perspective-switcher-toggle')
+          .click()
+          .byLegacyTestID('perspective-switcher-menu-option')
+          .contains(newPerspective)
+          .click(),
+    },
+    shouldHaveNavSection: (path: string[]) => {
+      cy.get('#page-sidebar').contains(path[0]);
+      if (path.length === 2) {
+        cy.get('#page-sidebar').contains(path[1]);
+      }
+    },
+    shouldNotHaveNavSection: (path: string[]) => {
+      cy.get('#page-sidebar').should('not.have.text', path[0]);
+      if (path.length === 2) {
+        cy.get('#page-sidebar').should('not.have.text', path[1]);
+      }
+    },
+    clickNavLink: (path: string[]) => cy.clickNavLink(path),
+  },
+};

frontend/public/components/global-notifications.jsx

@@ -4,7 +4,7 @@ import { ImpersonateNotifier } from './impersonate-notifier';
 import { KubeAdminNotifier } from './kube-admin-notifier';
 
 export const GlobalNotifications = () => (
-  <div className="co-global-notifications">
+  <div className="co-global-notifications" data-test="global-notifications">
     <KubeAdminNotifier />
     <ImpersonateNotifier />
   </div>

frontend/public/components/masthead-toolbar.jsx

@@ -498,7 +498,11 @@ class MastheadToolbarContents_ extends React.Component {
     }
 
     if (_.isEmpty(actions)) {
-      return <div className="co-username">{username}</div>;
+      return (
+        <div data-test="username" className="co-username">
+          {username}
+        </div>
+      );
     }
 
     const userToggle = (

test-cypress.sh

@@ -8,4 +8,8 @@ function generateReport {
 }
 trap generateReport EXIT
 
-yarn run test-cypress-headless
+if [ $# -gt 0 ] && [ -n "$1" ]; then
+  yarn run test-cypress-headless --spec "$1"
+else
+  yarn run test-cypress-headless
+fi

test-prow-e2e.sh

@@ -32,9 +32,14 @@ oc patch oauths cluster --patch "$(cat ./frontend/integration-tests/data/patch-h
 DBUS_SESSION_BUS_ADDRESS=/dev/null
 export DBUS_SESSION_BUS_ADDRESS
 
-CHROME_VERSION=$(google-chrome --version) ./test-gui.sh "${1:-e2e}"
+if [ $# -eq 0 ] || [ "$1" != "login" ]; then
+  CHROME_VERSION=$(google-chrome --version) ./test-gui.sh "${1:-e2e}"
+fi
 
-# Only run Cypress tests if no agruments passed, or if the 'release' argument was passed
 if [ $# -eq 0 ] || [ "$1" == "release" ]; then
   ./test-cypress.sh
+elif [ "$1" == "login" ]; then
+  ./test-cypress.sh 'tests/app/auth-multiuser-login.spec.ts'
+else
+  echo "unknown parameter '$1'"
 fi