Merge branch 'develop' into marktnoonan/percy-content-flake

Author: marktnoonan

packages/frontend-shared/src/gql-components/HeaderBarContent.vue

@@ -50,21 +50,9 @@
                 <i-cy-chevron-right_x16 class="icon-dark-gray-200" />
               </li>
               <li class="inline-block">
-                <!-- context for use of aria role and disabled here: https://www.scottohara.me/blog/2021/05/28/disabled-links.html -->
-                <!-- the `href` given here is a fake one provided for the sake of assistive technology. no actual routing is happening. -->
-                <!-- the `key` is used to ensure the role/href attrs are added and removed appropriately from the element. -->
-                <a
-                  :key="canClearTestingType.toString()"
-                  class="font-medium"
-                  :role="canClearTestingType ? undefined : 'link'"
-                  :href="canClearTestingType ? 'choose-testing-type' : undefined"
-                  :class="canClearTestingType ? 'text-indigo-500 hocus-link-default' :
-                    'text-gray-700'"
-                  :ariaDisabled="!canClearTestingType"
-                  @click.prevent="clearTestingType"
-                >
+                <span class="font-medium">
                   {{ currentProject.title }}
-                </a>
+                </span>
                 <!-- currentProject might not have a branch -->
                 <template v-if="currentProject.branch">
                   <!-- Using a margin here causes different overflow problems.
@@ -179,7 +167,7 @@ import { gql, useMutation, useSubscription } from '@urql/vue'
 import { ref, computed } from 'vue'
 import type { HeaderBar_HeaderBarContentFragment } from '../generated/graphql'
 import {
-  GlobalPageHeader_ClearCurrentProjectDocument, GlobalPageHeader_ClearCurrentTestingTypeDocument,
+  GlobalPageHeader_ClearCurrentProjectDocument,
   HeaderBarContent_AuthChangeDocument,
 } from '../generated/graphql'
 import TopNav from './topnav/TopNav.vue'
@@ -235,24 +223,6 @@ mutation GlobalPageHeader_clearCurrentProject {
 }
 `
 
-gql`
-mutation GlobalPageHeader_ClearCurrentTestingType {
-  clearCurrentTestingType {
-    baseError {
-      id
-      ...BaseError
-    }
-    warnings {
-      id
-    }
-    currentProject {
-      id
-      currentTestingType
-    }
-  }
-}
-`
-
 gql`
 fragment HeaderBar_HeaderBarContent on Query {
   currentProject {
@@ -262,7 +232,6 @@ fragment HeaderBar_HeaderBarContent on Query {
     savedState
     currentTestingType
     branch
-    isLoadingNodeEvents
   }
   isGlobalMode
   ...TopNav
@@ -284,13 +253,8 @@ const cloudProjectId = computed(() => {
 
 const currentProject = computed(() => props.gql.currentProject)
 
-const canClearTestingType = computed(() => {
-  return Boolean(props.gql?.currentProject?.currentTestingType && !props.gql?.currentProject?.isLoadingNodeEvents)
-})
-
 const isLoginOpen = ref(false)
 const clearCurrentProjectMutation = useMutation(GlobalPageHeader_ClearCurrentProjectDocument)
-const clearCurrentTestingTypeMutation = useMutation(GlobalPageHeader_ClearCurrentTestingTypeDocument)
 
 const openLogin = () => {
   isLoginOpen.value = true
@@ -302,12 +266,6 @@ const clearCurrentProject = () => {
   }
 }
 
-const clearTestingType = () => {
-  if (canClearTestingType.value) {
-    clearCurrentTestingTypeMutation.executeMutation({})
-  }
-}
-
 const props = defineProps<{
   gql: HeaderBar_HeaderBarContentFragment
   showBrowsers?: boolean

packages/launchpad/cypress/e2e/global-mode.cy.ts

@@ -169,7 +169,7 @@ describe('Launchpad: Global Mode', () => {
       cy.get('[data-cy="dropzone"]').should('not.exist')
     })
 
-    it('updates breadcrumb when selecting a project and navigating back', () => {
+    it('updates "Projects" link when a project is selected and allows navigating back', () => {
       const getBreadcrumbLink = (name: string, options: { disabled: boolean } = { disabled: false }) => {
         // The timeout is increased to account for variability in configuration load times in CI.
         return cy.findByRole('link', { name, timeout: 10000 }).should('have.attr', 'aria-disabled', options.disabled ? 'true' : 'false')
@@ -196,16 +196,6 @@ describe('Launchpad: Global Mode', () => {
       // Component testing breadcrumbs
       cy.get('[data-cy="project-card"]').contains('todos').click()
       cy.get('[data-cy-testingtype="component"]').click()
-      cy.contains('li', 'component testing', { matchCase: false }).should('not.have.attr', 'href')
-      resetSpies()
-      getBreadcrumbLink('todos').click()
-      getBreadcrumbLink('todos', { disabled: true })
-      cy.withCtx((ctx) => {
-        expect(ctx.lifecycleManager.setAndLoadCurrentTestingType).to.have.been.calledWith(null)
-      })
-
-      cy.get('[data-cy-testingtype="component"]').click()
-      cy.contains('li', 'component testing', { matchCase: false }).should('not.have.attr', 'href')
       resetSpies()
       getBreadcrumbLink('Projects').click()
       getBreadcrumbLink('Projects', { disabled: true })
@@ -216,15 +206,6 @@ describe('Launchpad: Global Mode', () => {
 
       // E2E testing breadcrumbs
       cy.get('[data-cy="project-card"]').contains('todos').click()
-      cy.get('[data-cy-testingtype="e2e"]').click()
-      cy.contains('li', 'e2e testing', { matchCase: false }).should('not.have.attr', 'href')
-      resetSpies()
-      getBreadcrumbLink('todos').click()
-      getBreadcrumbLink('todos', { disabled: true })
-      cy.withCtx((ctx) => {
-        expect(ctx.lifecycleManager.setAndLoadCurrentTestingType).to.have.been.calledWith(null)
-      })
-
       cy.get('[data-cy-testingtype="e2e"]').click()
       cy.contains('li', 'e2e testing', { matchCase: false }).should('not.have.attr', 'href')
       resetSpies()

packages/launchpad/cypress/e2e/open-mode.cy.ts

@@ -150,39 +150,6 @@ describe('Launchpad: Open Mode', () => {
       cy.contains('button', 'Docs').click()
       cy.contains(defaultMessages.topNav.docsMenu.gettingStartedTitle).should('be.visible')
     })
-
-    it('updates the breadcrumb when navigating forward and back', () => {
-      const getBreadcrumbLink = (name: string, options: { disabled: boolean } = { disabled: false }) => {
-        return cy.findByRole('link', { name }).should('have.attr', 'aria-disabled', options.disabled ? 'true' : 'false')
-      }
-
-      cy.scaffoldProject('todos')
-      cy.openProject('todos')
-      cy.visitLaunchpad()
-
-      cy.contains('h1', 'Welcome to Cypress!')
-
-      getBreadcrumbLink('todos', { disabled: true })
-
-      cy.get('[data-cy-testingtype="e2e"]').click()
-
-      cy.contains('h1', 'Choose a Browser')
-
-      cy.contains('li', 'e2e testing', { matchCase: false }).should('not.have.attr', 'href')
-
-      cy.withCtx((ctx, { sinon }) => {
-        sinon.spy(ctx.lifecycleManager, 'setAndLoadCurrentTestingType')
-      })
-
-      getBreadcrumbLink('todos').click()
-
-      cy.contains('h1', 'Welcome to Cypress!')
-      getBreadcrumbLink('todos', { disabled: true })
-
-      cy.withCtx((ctx) => {
-        expect(ctx.lifecycleManager.setAndLoadCurrentTestingType).to.have.been.calledWith(null)
-      })
-    })
   })
 
   describe('open in ide', () => {