Revert "Merge branch 'linode:develop' into develop"

This reverts commit bfed239, reversing
changes made to 342fd96.

.gitignore

@@ -127,7 +127,12 @@ packages/manager/test-report.xml
 **/manager/cypress/videos/
 **/manager/cypress/downloads/
 **/manager/cypress/results/
-**/manager/cypress/screenshots/
+
+# ignore all screenshots except records
+# we ignore the png files, not the whole folder recursively
+# or the record files are ignored too
+**/manager/cypress/screenshots/**/*.png
+!**/manager/cypress/screenshots/**/record*.png
 
 packages/manager/cypress/fixtures/example.json
 
@@ -137,4 +142,4 @@ packages/manager/bundle_analyzer_report.html
 **/manager/src/dev-tools/*.local.*
 
 # vitepress
-docs/.vitepress/cache
+docs/.vitepress/cache

docker-compose.yml

@@ -43,9 +43,6 @@ x-e2e-env:
   CY_TEST_SPLIT_RUN_TOTAL: ${CY_TEST_SPLIT_RUN_TOTAL}
   CY_TEST_SPLIT_RUN_INDEX: ${CY_TEST_SPLIT_RUN_INDEX}
 
-  # Cypress performance.
-  CY_TEST_ACCOUNT_CACHE_DIR: ${CY_TEST_ACCOUNT_CACHE_DIR}
-
   # Cypress reporting.
   CY_TEST_JUNIT_REPORT: ${CY_TEST_JUNIT_REPORT}
   CY_TEST_USER_REPORT: ${CY_TEST_USER_REPORT}
@@ -66,7 +63,6 @@ x-e2e-env:
 x-e2e-volumes:
   &default-volumes
   - ./.git:/home/node/app/.git
-  - ./cache:/home/node/app/cache
   - ./packages/manager:/home/node/app/packages/manager
   - ./packages/validation:/home/node/app/packages/validation
   - ./packages/api-v4:/home/node/app/packages/api-v4
@@ -87,8 +83,6 @@ x-e2e-runners:
       condition: service_healthy
   env_file: ./packages/manager/.env
   volumes: *default-volumes
-  # TODO Stop using entrypoint, use CMD instead.
-  # (Or just make `yarn` the entrypoint, but either way stop forcing `cy:e2e`).
   entrypoint: ['yarn', 'cy:e2e']
 
 services:
@@ -120,16 +114,6 @@ services:
       <<: *default-env
       MANAGER_OAUTH: ${MANAGER_OAUTH}
 
-  # Component test runner.
-  # Does not require any Cloud Manager environment to run.
-  component:
-    <<: *default-runner
-    depends_on: []
-    environment:
-      CY_TEST_DISABLE_RETRIES: ${CY_TEST_DISABLE_RETRIES}
-      CY_TEST_JUNIT_REPORT: ${CY_TEST_JUNIT_REPORT}
-    entrypoint: ['yarn', 'cy:component:run']
-
   # End-to-end test runner for Cloud's synthetic monitoring tests.
   # Configured to run against a remote Cloud instance hosted at some URL.
   e2e_heimdall:

docs/development-guide/08-testing.md

@@ -220,14 +220,6 @@ Environment variables related to Cypress logging and reporting, as well as repor
 | `CY_TEST_FAIL_ON_MANAGED`       | Fail affected tests when Managed is enabled        | `1`              | Unset; disabled by default |
 | `CY_TEST_GENWEIGHTS`            | Generate and output test weights to the given path | `./weights.json` | Unset; disabled by default |
 
-###### Performance
-Environment variables that can be used to improve test performance in some scenarios.
-
-| Environment Variable            | Description                                   | Example            | Default                    |
-|---------------------------------|-----------------------------------------------|--------------------|----------------------------|
-| `CY_TEST_ACCOUNT_CACHE_DIR`     | Directory containing test account cache data  | `./cache/accounts` | Unset; disabled by default |
-
-
 ### Writing End-to-End Tests
 
 1. Look here for [Cypress Best Practices](https://docs.cypress.io/guides/references/best-practices)

package.json

@@ -36,7 +36,6 @@
     "cy:ci": "yarn cy:e2e",
     "cy:debug": "yarn workspace linode-manager cy:debug",
     "cy:component": "yarn workspace linode-manager cy:component",
-    "cy:component:run": "yarn workspace linode-manager cy:component:run",
     "cy:rec-snap": "yarn workspace linode-manager cy:rec-snap",
     "changeset": "node scripts/changelog/changeset.mjs",
     "generate-changelogs": "node scripts/changelog/generate-changelogs.mjs",

packages/api-v4/src/linodes/types.ts

@@ -19,7 +19,7 @@ export interface Linode {
   id: number;
   alerts: LinodeAlerts;
   backups: LinodeBackups;
-  capabilities?: LinodeCapabilities[]; // @TODO BSE: Remove optionality once BSE is fully rolled out
+  capabilities?: string[]; // @TODO BSE: Remove optionality once BSE is fully rolled out
   created: string;
   disk_encryption?: EncryptionStatus; // @TODO LDE: Remove optionality once LDE is fully rolled out
   region: string;
@@ -54,8 +54,6 @@ export interface LinodeBackups {
   last_successful: string | null;
 }
 
-export type LinodeCapabilities = 'Block Storage Encryption';
-
 export type Window =
   | 'Scheduling'
   | 'W0'

packages/manager/cypress.config.ts

@@ -58,14 +58,6 @@ export default defineConfig({
     specPattern: './cypress/component/**/*.spec.tsx',
     viewportWidth: 500,
     viewportHeight: 500,
-
-    setupNodeEvents(on, config) {
-      return setupPlugins(on, config, [
-        loadEnvironmentConfig,
-        discardPassedTestRecordings,
-        enableJunitReport('Component', true),
-      ]);
-    },
   },
 
   e2e: {
@@ -93,7 +85,7 @@ export default defineConfig({
         regionOverrideCheck,
         logTestTagInfo,
         splitCypressRun,
-        enableJunitReport(),
+        enableJunitReport,
         generateTestWeights,
       ]);
     },

packages/manager/cypress/component/poc/region-select.spec.tsx

@@ -397,9 +397,9 @@ componentTests('RegionSelect', (mount) => {
           .should('be.visible');
       });
       regionsWithoutObj.forEach((region) => {
-        ui.autocompletePopper.find().within(() => {
-          cy.findByText(`${region.label} (${region.id})`).should('not.exist');
-        });
+        ui.autocompletePopper
+          .findByTitle(`${region.label} (${region.id})`)
+          .should('not.exist');
       });
     });
 

packages/manager/cypress/e2e/core/account/account-logout.spec.ts

@@ -4,7 +4,7 @@ import { ui } from 'support/ui';
 
 describe('Logout Test', () => {
   beforeEach(() => {
-    cy.tag('purpose:syntheticTesting', 'method:e2e');
+    cy.tag('purpose:syntheticTesting');
   });
 
   /*

packages/manager/cypress/e2e/core/account/personal-access-tokens.spec.ts

@@ -24,8 +24,6 @@ describe('Personal access tokens', () => {
    * - Confirms that user is shown the token secret upon successful PAT creation
    * - Confirms that new personal access token is shown in list
    * - Confirms that user can open and close "View Scopes" drawer
-   * - Confirm that the “Child account access” grant is not visible in the list of permissions.
-   * - Upon clicking “Create Token”, assert that the outgoing API request payload contains "scopes" value as defined in token.
    */
   it('can create personal access tokens', () => {
     const token = appTokenFactory.build({
@@ -65,9 +63,6 @@ describe('Personal access tokens', () => {
       .findByTitle('Add Personal Access Token')
       .should('be.visible')
       .within(() => {
-        // Confirm that the “Child account access” grant is not visible in the list of permissions.
-        cy.findAllByText('Child Account Access').should('not.exist');
-
         // Confirm submit button is disabled without specifying scopes.
         ui.buttonGroup
           .findButtonByTitle('Create Token')
@@ -152,12 +147,7 @@ describe('Personal access tokens', () => {
       });
 
     // Confirm that new PAT is shown in list and "View Scopes" drawer works.
-    // Upon clicking “Create Token”, assert that the outgoing API request payload contains "scopes" value as defined in token.
-    cy.wait('@getTokens').then((xhr) => {
-      const actualTokenData = xhr.response?.body.data;
-      const actualTokenScopes = actualTokenData[0].scopes;
-      expect(actualTokenScopes).to.equal(token.scopes);
-    });
+    cy.wait('@getTokens');
     cy.findByText(token.label)
       .should('be.visible')
       .closest('tr')

packages/manager/cypress/e2e/core/account/service-transfer.spec.ts

@@ -121,7 +121,6 @@ describe('Account service transfers', () => {
    * - Confirms user can navigate to service transfer page via user menu.
    */
   it('can navigate to service transfers landing page', () => {
-    cy.tag('method:e2e');
     cy.visitWithLogin('/');
     cy.findByLabelText('Profile & Account').should('be.visible').click();
 
@@ -245,7 +244,6 @@ describe('Account service transfers', () => {
    * - Confirms that users can cancel a service transfer
    */
   it('can initiate and cancel a service transfer', () => {
-    cy.tag('method:e2e');
     // Create a Linode to transfer.
     const setupLinode = async (): Promise<Linode> => {
       const payload = createLinodeRequestFactory.build({