Merge branch 'develop' into cy-5650

cypress-io · Oct 2, 2020 · c489b1f · c489b1f
2 parents 1eed178 + 3082876
commit c489b1f
Show file tree

Hide file tree

Showing 188 changed files with 2,885 additions and 14,440 deletions.
diff --git a/.gitignore b/.gitignore
@@ -20,17 +20,3 @@ cypress/videos
 # Dynamically parsed data
 
 source/_data/banners.yml
-
-# Translations
-# By default we ignore each translation folder like "source/ja",
-# During the build, We copy English file for each untranslated page to
-# the language folder - if there is no fully translated file there.
-# Thus when you add a new translation, add it to the source control
-# with "git add --force" command to override the folder.
-#
-source/ja
-source/zh-cn
-source/pt-br
-source/ru
-source/es
-
diff --git a/.node-version b/.node-version
@@ -1 +1 @@
-8.17.0
+12.18.3
diff --git a/.textlintrc b/.textlintrc
@@ -86,7 +86,7 @@
         ["craziest", "most complex"],
         ["dumb", "unintended"],
         ["insane", "outrageous"],
-        ["blacklist", "blocklist"],
+        ["blacklist", "block"],
         ["whitelist", "allow"],
 
         // Prefer American spelling

diff --git a/__snapshots__/helpers_spec.js b/__snapshots__/helpers_spec.js
@@ -7,4 +7,3 @@ exports['lib/helpers addPageAnchors is noop if no headings found 1'] = '<p>foo</
 exports['lib/helpers addPageAnchors does not wrap with <html> 1'] = '<h1 id="bar" class="article-heading">foo<a class="article-anchor" href="#bar" aria-hidden="true"></a></h1>'
 
 exports['lib/helpers addPageAnchors does not wrap fragment in html tag 1'] = '<p>foo</p>'
-
diff --git a/__snapshots__/url_generator_spec.js b/__snapshots__/url_generator_spec.js
@@ -5,4 +5,3 @@ exports['lib/url_generator .getLocalFile throws when cannot find file 1'] = `Con
     > Could not find a valid doc file in the sidebar.yml for: "foo"
       the full url was "foo"
     `
-
diff --git a/_config.yml b/_config.yml
@@ -9,13 +9,7 @@ description: Cypress is a test engine that runs unit and integration tests in yo
 author: Cypress.io
 
 # https://hexo.io/docs/internationalization.html
-language:
-  - en
-  - zh-cn
-  - ja
-  - pt-br
-  - ru
-  - es
+language: en
 
 # URL
 ## If your site is put in a subdirectory, set url as 'http://yoursite.com/child' and root as '/child/'
@@ -29,7 +23,7 @@ github: cypress-io/cypress
 # Directory
 source_dir: source
 public_dir: public
-i18n_dir: :lang
+# i18n_dir: :lang
 skip_render:
 
 # Generate alias pages for redirecting to posts, pages or URL
@@ -41,11 +35,11 @@ skip_render:
 alias:
   # indices
   index.html: guides/overview/why-cypress.html
-  zh-cn/: zh-cn/guides/overview/why-cypress.html
-  ja/: ja/guides/overview/why-cypress.html
-  pt-br/: pt-br/guides/overview/why-cypress.html
-  ru/: ru/guides/overview/why-cypress.html
-  es/: es/guides/overview/why-cypress.html
+  zh-cn/: guides/overview/why-cypress.html
+  ja/: guides/overview/why-cypress.html
+  pt-br/: guides/overview/why-cypress.html
+  ru/: guides/overview/why-cypress.html
+  es/: guides/overview/why-cypress.html
 
   guides/index.html: guides/overview/why-cypress.html
   guides.html: guides/overview/why-cypress.html
@@ -63,6 +57,7 @@ alias:
   guides/core-concepts/screenshots-and-videos.html: guides/guides/screenshots-and-videos.html
   guides/guides/reporters.html: guides/tooling/reporters.html
   guides/guides/reporters/: guides/tooling/reporters.html
+  guides/test-retries.html: guides/guides/test-retries.html
   overview-of-test-runner/: guides/core-concepts/test-runner.html
   why-cypress/: guides/overview/why-cypress.html
 

diff --git a/circle.yml b/circle.yml
@@ -16,7 +16,7 @@ defaults: &defaults
     # the Docker image with Cypress dependencies
     # https://github.com/cypress-io/cypress-docker-images
     # Note: the image needs to have fonts with Chinese characters
-    - image: cypress/base:8.16.0
+    - image: cypress/base:12
       environment:
         <<: *env_defaults
 

diff --git a/cypress.json b/cypress.json
@@ -2,5 +2,5 @@
   "baseUrl": "http://localhost:2222",
   "projectId": "ma3dkn",
   "viewportWidth": 1500,
-  "blacklistHosts": ["trackcmp.net", "js.hs-analytics.net", "js.hs-scripts.com"]
+  "blockHosts": ["trackcmp.net", "js.hs-analytics.net", "js.hs-scripts.com"]
 }
diff --git a/cypress/integration/i18n_spec.js b/cypress/integration/i18n_spec.js
diff --git a/cypress/integration/main_nav_spec.js b/cypress/integration/main_nav_spec.js
@@ -90,7 +90,7 @@ describe('Main Nav', () => {
     })
   })
 
-  context('Language selector', () => {
+  context.skip('Language selector', () => {
     beforeEach(() => {
       cy.visit('/')
     })

diff --git a/cypress/integration/plugins_spec.js b/cypress/integration/plugins_spec.js
@@ -1,7 +1,7 @@
 const yaml = require('yamljs')
 const _ = require('lodash')
 
-describe('Plugins', () => {
+describe.skip('Plugins', () => {
   let plugins = []
 
   before(() => {
@@ -19,15 +19,15 @@ describe('Plugins', () => {
 
   it('shows all plugins categories', function () {
     plugins.forEach((plugin) => {
-      cy.get(`[data-cy="plugin-${_.kebabCase(plugin.name)}"`).within(() => {
+      cy.get(`[data-cy="plugin-${_.kebabCase(plugin.name)}"]`).within(() => {
         cy.get('h2').contains(plugin.name).should('be.visible')
       })
     })
   })
 
   it('shows all plugin title and badge', () => {
     plugins.forEach((pluginCategory) => {
-      cy.get(`[data-cy="plugin-${_.kebabCase(pluginCategory.name)}"`).within(() => {
+      cy.get(`[data-cy="plugin-${_.kebabCase(pluginCategory.name)}"]`).within(() => {
         pluginCategory.plugins.forEach((plugin) => {
           cy.get('.plugins-list li').find('.plugin-title h3').contains(plugin.name).closest('li').within(() => {
             cy.root().find('.plugin-title h3').contains(plugin.name).should('be.visible')

diff --git a/gulpfile.js b/gulpfile.js
@@ -3,7 +3,7 @@ const RevAll = require('gulp-rev-all')
 const clean = require('gulp-clean')
 
 const revisionOpts = {
-  dontGlobal: ['.ico', 'sitemap.xml', 'sitemap.xsl', 'logo.png', '[email protected]'],
+  dontGlobal: ['.ico', 'sitemap.xml', 'sitemap.xsl', 'logo.png', '[email protected]', '.mp4', '.woff', '.woff2', '.less'],
   dontRenameFile: ['.html', 'CNAME'],
   dontUpdateReference: ['.html'],
   dontSearchFile: ['.js'],

diff --git a/index.js b/index.js
@@ -5,7 +5,7 @@ process.on('unhandledRejection', function (reason, p) {
   process.exit(-1)
 })
 
-const { copyUntranslatedDocs } = require('./copy-english-docs')
+// const { copyUntranslatedDocs } = require('./copy-english-docs')
 const Hexo = require('hexo')
 const chalk = require('chalk')
 const minimist = require('minimist')
@@ -151,5 +151,4 @@ function initHexo () {
   })
 }
 
-copyUntranslatedDocs()
-.then(initHexo)
+initHexo()
diff --git a/lib/tags/assertions.js b/lib/tags/assertions.js
@@ -76,6 +76,14 @@ module.exports = function yields (hexo, args) {
     </ul>`)
   }
 
+  const shadowDomExistence = () => {
+    return render(`<ul>
+      <li><p>${exist}.</p></li>
+      <li><p>${cmd} will automatically {% url "retry" retry-ability %} until the element(s) host(s) a shadow root.</p></li>
+      <li><p>${retryAssertions}.</p></li>
+    </ul>`)
+  }
+
   const actions = () => {
     return render(`<ul>
       <li><p>${actionable}.</p></li>
@@ -107,6 +115,8 @@ module.exports = function yields (hexo, args) {
       return invoke()
     case 'existence':
       return existence()
+    case 'shadow_dom_existence':
+      return shadowDomExistence()
     case 'actions':
       return actions()
     case 'wrap':

diff --git a/lib/tags/requirements.js b/lib/tags/requirements.js
@@ -58,9 +58,15 @@ module.exports = function yields (hexo, args) {
     </ul>`
   }
 
+  const shadowDom = () => {
+    return `<ul>
+      <li><p>${cmd} requires being chained off a command that yields a DOM element that is a shadow host (i.e has a shadow root directly attached to it).</p></li>
+    </ul>`
+  }
+
   const dual = () => {
     return `<ul>
-      <li><p>${cmd} ${dualCmd}</p></li>
+      <li><p>${dualCmd}</p></li>
     </ul>`
   }
 
@@ -223,6 +229,8 @@ module.exports = function yields (hexo, args) {
       return scrollability()
     case 'selectability':
       return selectability()
+    case 'shadow_dom':
+      return shadowDom()
     case 'spread':
       return spread()
     case 'submitability':

diff --git a/lib/tags/timeouts.js b/lib/tags/timeouts.js
@@ -44,6 +44,14 @@ module.exports = function yields (hexo, args) {
     </ul>`)
   }
 
+  const shadowDomExistence = () => {
+    return render(`<ul>
+      <li><p>${cmd} can time out waiting for the element(s) to ${urls.exist}.</p></li>
+      <li><p>${cmd} can time out waiting for the element(s) to host a shadow root.</p></li>
+      <li><p>${assertion}.</p></li>
+    </ul>`)
+  }
+
   const automation = () => {
     return render(`<ul>
       <li><p>${cmd} should never time out.</p></li>
@@ -124,6 +132,8 @@ module.exports = function yields (hexo, args) {
       return actions()
     case 'existence':
       return existence()
+    case 'shadow_dom_existence':
+      return shadowDomExistence()
     case 'automation':
       return automation()
     case 'its':
Original file line number	Diff line number	Diff line change
Expand Up		@@ -7,4 +7,3 @@ exports['lib/helpers addPageAnchors is noop if no headings found 1'] = '<p>foo</
		exports['lib/helpers addPageAnchors does not wrap with <html> 1'] = '<h1 id="bar" class="article-heading">foo<a class="article-anchor" href="#bar" aria-hidden="true"></a></h1>'

		exports['lib/helpers addPageAnchors does not wrap fragment in html tag 1'] = '<p>foo</p>'
Original file line number	Diff line number	Diff line change
Expand Up		@@ -5,4 +5,3 @@ exports['lib/url_generator .getLocalFile throws when cannot find file 1'] = `Con
		> Could not find a valid doc file in the sidebar.yml for: "foo"
		the full url was "foo"
		`