Merge remote-tracking branch 'origin/develop' into zachw/issue-22525

cypress-io · Jul 19, 2022 · 7a65ef8 · 7a65ef8 · cypress-bot · Jul 19, 2022
2 parents 56f5d69 + 1da95a7
commit 7a65ef8
Show file tree

Hide file tree

Showing 17 changed files with 163 additions and 76 deletions.
diff --git a/circle.yml b/circle.yml
@@ -36,7 +36,6 @@ macWorkflowFilters: &darwin-workflow-filters
   when:
     or:
     - equal: [ develop, << pipeline.git.branch >> ]
-    - equal: [ linux-arm64, << pipeline.git.branch >> ]
     - equal: [ 'zachw/issue-22525', << pipeline.git.branch >> ]
     - matches:
           pattern: "-release$"
@@ -46,7 +45,6 @@ linuxArm64WorkflowFilters: &linux-arm64-workflow-filters
   when:
     or:
     - equal: [ develop, << pipeline.git.branch >> ]
-    - equal: [ linux-arm64, << pipeline.git.branch >> ]
     - matches:
           pattern: "-release$"
           value: << pipeline.git.branch >>
@@ -65,7 +63,6 @@ windowsWorkflowFilters: &windows-workflow-filters
   when:
     or:
     - equal: [ develop, << pipeline.git.branch >> ]
-    - equal: [ linux-arm64, << pipeline.git.branch >> ]
     - matches:
           pattern: "-release$"
           value: << pipeline.git.branch >>
@@ -658,7 +655,7 @@ commands:
         ## by default, assert that at least 1 test ran
         default: 0
     steps:
-      - run: 
+      - run:
           name: 'Verify Mocha Results'
           command: |
             source ./scripts/ensure-node.sh
@@ -1614,7 +1611,7 @@ jobs:
           path: /tmp/cypress
       - store_artifacts:
           path: /tmp/artifacts
-      - store-npm-logs      
+      - store-npm-logs
 
   run-vite-dev-server-integration-tests:
     <<: *defaults
@@ -1636,7 +1633,7 @@ jobs:
           path: /tmp/cypress
       - store_artifacts:
           path: /tmp/artifacts
-      - store-npm-logs            
+      - store-npm-logs
 
   ui-components-integration-tests:
     <<: *defaults
@@ -2363,7 +2360,7 @@ linux-x64-workflow: &linux-x64-workflow
     - run-vite-dev-server-integration-tests:
         context: [test-runner:cypress-record-key, test-runner:percy]
         requires:
-          - system-tests-node-modules-install          
+          - system-tests-node-modules-install
     - run-app-component-tests-chrome:
         context: [test-runner:cypress-record-key, test-runner:launchpad-tests, test-runner:percy]
         percy: true

diff --git a/cli/lib/exec/open.js b/cli/lib/exec/open.js
@@ -15,6 +15,12 @@ const { exitWithError } = require('../errors')
  * @returns {string[]} list of CLI arguments
  */
 const processOpenOptions = (options = {}) => {
+  // In addition to setting the project directory, setting the project option
+  // here ultimately decides whether cypress is run in global mode or not.
+  // It's first based off whether it's installed globally by npm/yarn (-g).
+  // A global install can be overridden by the --project flag, putting Cypress
+  // in project mode. A non-global install can be overridden by the --global
+  // flag, putting it in global mode.
   if (!util.isInstalledGlobally() && !options.global && !options.project) {
     options.project = process.cwd()
   }

diff --git a/packages/app/cypress/e2e/specs.cy.ts b/packages/app/cypress/e2e/specs.cy.ts
@@ -61,7 +61,7 @@ describe('App: Specs', () => {
         }).should('be.visible').within(() => {
           cy.validateExternalLink({ name: 'Need help', href: 'https://on.cypress.io/test-type-options' })
           cy.findByRole('button', { name: 'Close' }).should('be.visible').as('CloseDialogButton')
-          cy.get('[data-cy="file-match-indicator"]').contains('0 Matches')
+          cy.get('[data-cy="file-match-indicator"]').contains('No Matches')
           cy.get('[data-cy="spec-pattern"]').contains('cypress/e2e/**/*.cy.{js,jsx,ts,tsx}')
         })
 
@@ -320,7 +320,7 @@ describe('App: Specs', () => {
         .should('be.visible')
         .and('contain', defaultMessages.createSpec.page.customPatternNoSpecs.description.split('{0}')[0])
 
-        cy.findByTestId('file-match-indicator').should('contain', '0 Matches')
+        cy.findByTestId('file-match-indicator').should('contain', 'No Matches')
         cy.findByRole('button', { name: 'cypress.config.js' })
         cy.findByTestId('spec-pattern').should('contain', 'src/**/*.{cy,spec}.{js,jsx}')
 
@@ -652,7 +652,7 @@ describe('App: Specs', () => {
         .should('be.visible')
         .and('contain', defaultMessages.createSpec.page.customPatternNoSpecs.description.split('{0}')[0])
 
-        cy.findByTestId('file-match-indicator').should('contain', '0 Matches')
+        cy.findByTestId('file-match-indicator').should('contain', 'No Matches')
         cy.findByRole('button', { name: 'cypress.config.js' })
         cy.findByTestId('spec-pattern').should('contain', 'src/specs-folder/*.cy.{js,jsx}')
 

diff --git a/packages/app/src/components/SpecPatterns.cy.tsx b/packages/app/src/components/SpecPatterns.cy.tsx
@@ -30,7 +30,7 @@ describe('<SpecPatterns />', () => {
     cy.get('[data-cy="file-match-indicator"]').contains('50 Matches')
   })
 
-  it('renders component spec pattern should not show matches', () => {
+  it('renders component spec pattern should not show matches verbiage', () => {
     cy.mountFragment(SpecPatternsFragmentDoc, {
       onResult: (res) => {
         if (!res) {
@@ -46,4 +46,36 @@ describe('<SpecPatterns />', () => {
     cy.get('[data-cy="spec-pattern"]').contains('**/*.cy.{js,jsx,ts,tsx}')
     cy.get('[data-cy="file-match-indicator"]').should('contain', 'specPattern')
   })
+
+  it('displays `No Matches` when specs are empty', () => {
+    cy.mountFragment(SpecPatternsFragmentDoc, {
+      onResult: (res) => {
+        if (!res) {
+          return
+        }
+
+        res.currentTestingType = 'component'
+        res.specs = []
+      },
+      render: (gql) => <div class="p-16px"><SpecPatterns gql={gql}/></div>,
+    })
+
+    cy.get('[data-cy="file-match-indicator"]').contains('No Matches')
+  })
+
+  it('displays `1 Match` when specs has 1 element', () => {
+    cy.mountFragment(SpecPatternsFragmentDoc, {
+      onResult: (res) => {
+        if (!res) {
+          return
+        }
+
+        res.currentTestingType = 'component'
+        res.specs = res.specs.slice(0, 1) || []
+      },
+      render: (gql) => <div class="p-16px"><SpecPatterns gql={gql}/></div>,
+    })
+
+    cy.get('[data-cy="file-match-indicator"]').contains('1 Match')
+  })
 })
diff --git a/packages/app/src/components/SpecPatterns.vue b/packages/app/src/components/SpecPatterns.vue
@@ -3,13 +3,7 @@
     <div class="flex p-16px items-center justify-between">
       <FileMatchIndicator :variant="props.variant">
         <span v-if="props.variant === 'info'">specPattern</span>
-        <i18n-t
-          v-else
-          scope="global"
-          keypath="components.specPattern.matches"
-        >
-          {{ props.gql.specs.length }}
-        </i18n-t>
+        <span v-else>{{ t('components.specPattern.matches', props.gql.specs.length) }}</span>
       </FileMatchIndicator>
       <OpenConfigFileInIDE
         v-slot="{onClick}"
@@ -41,6 +35,7 @@
 <script lang="ts" setup>
 import { computed } from 'vue'
 import { gql } from '@urql/core'
+import { useI18n } from 'vue-i18n'
 import type { SpecPatternsFragment } from '../generated/graphql'
 import OpenConfigFileInIDE from '@packages/frontend-shared/src/gql-components/OpenConfigFileInIDE.vue'
 import FileMatchIndicator from './FileMatchIndicator.vue'
@@ -58,6 +53,7 @@ fragment SpecPatterns on CurrentProject {
 }
 `
 
+const { t } = useI18n()
 const props = defineProps<{
   gql: SpecPatternsFragment
   variant?: 'default' | 'info'