Merge branch 'bugfix/fix-electron-slowness-cy-origin' of github.com:c…

…ypress-io/cypress into bugfix/fix-electron-slowness-cy-origin
cypress-io · May 13, 2022 · dbbf06a · dbbf06a
2 parents 2c98438 + 7690f0e
commit dbbf06a
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 22 deletions.
diff --git a/packages/app/cypress/e2e/settings.cy.ts b/packages/app/cypress/e2e/settings.cy.ts
@@ -246,7 +246,7 @@ describe('App: Settings', () => {
       cy.get('[data-cy="config-legend"]').within(() => {
         cy.get('.bg-gray-50').contains('default')
         cy.get('.bg-teal-100').contains('config')
-        cy.get('.bg-yellow-100').contains('env')
+        cy.get('.bg-orange-100').contains('env')
         cy.get('.bg-red-50').contains('cli')
       })
 
@@ -289,7 +289,7 @@ describe('App: Settings', () => {
       cy.get('[data-cy="config-legend"]').within(() => {
         cy.get('.bg-gray-50').contains('default')
         cy.get('.bg-teal-100').contains('config')
-        cy.get('.bg-yellow-100').contains('env')
+        cy.get('.bg-orange-100').contains('env')
         cy.get('.bg-red-50').contains('cli')
       })
 

diff --git a/packages/app/src/settings/project/ConfigBadge.cy.tsx b/packages/app/src/settings/project/ConfigBadge.cy.tsx
@@ -14,7 +14,7 @@ describe('<ConfigBadge />', () => {
     cy.mount(() => (
       <div class="p-12 children:pb-4">
         <ConfigBadge label="Superb" class="bg-gray-100 text-gray-600">This is a pretty <pre class="inline">great</pre> badge</ConfigBadge>
-        <ConfigBadge label="Sub-par" class="bg-yellow-100 text-yellow-600">A warning would probably go here</ConfigBadge>
+        <ConfigBadge label="Sub-par" class="bg-orange-100 text-orange-600">A warning would probably go here</ConfigBadge>
         <ConfigBadge label="So cool" class="bg-indigo-100 text-indigo-600">Populated by lorem ipsum</ConfigBadge>
         <ConfigBadge label="...Super?" class="bg-rose-100 text-rose-600">...is <a>this</a> expected?</ConfigBadge>
       </div>

diff --git a/packages/app/src/settings/project/ConfigSourceColors.ts b/packages/app/src/settings/project/ConfigSourceColors.ts
@@ -1,7 +1,7 @@
 export const CONFIG_LEGEND_COLOR_MAP = {
   default: 'text-gray-800 bg-gray-50',
   config: 'bg-teal-100 text-teal-700',
-  env: 'bg-yellow-100 text-yellow-700',
+  env: 'bg-orange-100 text-orange-700',
   cli: 'bg-red-50 text-red-700',
   plugin: 'bg-purple-50 text-purple-700',
 } as const
diff --git a/packages/app/src/specs/SpecsList.cy.tsx b/packages/app/src/specs/SpecsList.cy.tsx
@@ -137,7 +137,7 @@ describe('<SpecsList />', { keystrokeDelay: 0 }, () => {
     })
 
     it('should display the component testing header', () => {
-      cy.get('[data-cy="specs-testing-type-header"]').should('have.text', 'Component Specs')
+      cy.get('[data-cy="specs-testing-type-header"]').should('have.text', 'Component specs')
     })
   })
 })
diff --git a/packages/driver/cypress/e2e/cypress/proxy-logging.cy.ts b/packages/driver/cypress/e2e/cypress/proxy-logging.cy.ts
@@ -103,7 +103,10 @@ describe('Proxy Logging', () => {
     })
 
     // @see https://github.com/cypress-io/cypress/issues/18757 and https://github.com/cypress-io/cypress/issues/17656
-    it('xhr log has response body/status code when xhr response is logged first', (done) => {
+    it('xhr log has response body/status code when xhr response is logged first', {
+      // TODO: unskip in Electron: https://cypress-io.atlassian.net/browse/UNIFY-1753
+      browser: '!electron',
+    }, (done) => {
       cy.visit('/fixtures/empty.html')
 
       cy.window()

diff --git a/packages/frontend-shared/.windicss/colors.ts b/packages/frontend-shared/.windicss/colors.ts
@@ -94,19 +94,6 @@ const customColors = {
     900: '#320E58',
     1000: '#2F0C52',
   },
-  yellow: {
-    50: '#F7F4D2',
-    100: '#ECE6A9',
-    200: '#E1D984',
-    300: '#CBBE41',
-    400: '#A18E00',
-    500: '#7E6A00',
-    600: '#644D00',
-    700: '#523800',
-    800: '#452900',
-    900: '#3D1E00',
-    1000: '#391800',
-  },
   green: {
     50: '#F5F5D0',
     100: '#E7E8AB',

diff --git a/packages/frontend-shared/src/gql-components/topnav/TopNav.vue b/packages/frontend-shared/src/gql-components/topnav/TopNav.vue
@@ -53,7 +53,7 @@
     </TopNavListItem>
 
     <TopNavListItem
-      class="bg-yellow-50 py-8px px-16px"
+      class="bg-orange-50 py-8px px-16px"
       data-cy="current-hint"
     >
       <div class="whitespace-nowrap">
@@ -68,7 +68,7 @@
         <span class="text-gray-600 text-14px">{{ t('topNav.released') }} {{ versions.current.released }}</span>
       </div>
       <template #suffix>
-        <span class="rounded-md bg-yellow-100">
+        <span class="rounded-md bg-orange-100">
           <span class="p-5px text-amber-800">
             {{ t('topNav.installed') }}
           </span>

diff --git a/packages/frontend-shared/src/locales/en-US.json b/packages/frontend-shared/src/locales/en-US.json
@@ -119,7 +119,7 @@
     "pageTitle": "Specs",
     "newSpecButton": "New Spec",
     "searchPlaceholder": "Search Specs",
-    "componentSpecsHeader": "Component Specs",
+    "componentSpecsHeader": "Component specs",
     "e2eSpecsHeader": "E2E specs",
     "lastUpdatedHeader": "Last updated",
     "rows": {