Increases max viewport from 3000 to 4000 px

.gitignore

@@ -30,4 +30,5 @@ source/_data/banners.yml
 #
 source/ja
 source/zh-cn
+source/pt-br
 

.textlintrc

@@ -54,6 +54,7 @@
         "Sinon–Chai",
         "TypeScript",
         "YouTube",
+        ["VSCode", "VS Code"],
         ["^Vue", "Vue.JS"],
         "webpack",
         ["WebSocket(s?)", "WebSocket$1"],

CONTRIBUTING.md

@@ -202,3 +202,15 @@ After making a [pull request](#pull-requests), the CLA assistant will add a revi
 ## Deployment
 
 We will try to review and merge pull requests as fast as possible. After merging, we will deploy it to the staging environment, run E2E tests (using Cypress itself of course!), and then merge it into `master`, which will deploy it to the official [https://docs.cypress.io](https://docs.cypress.io) website. If you want to know our deploy process, read [DEPLOY.md](DEPLOY.md).
+
+### Trigger workflow build
+
+Due to CircleCI API limitations (even after 2 years), you cannot trigger a workflow build using the API. Thus if you need to build, test and deploy `develop` branch for example, your best bet is to create an empty GitHub commit in the [cypress-io/cypress-documentation](https://github.com/cypress-io/cypress-documentation) repository in the `develop` branch. We have added [make-empty-github-commit](https://github.com/bahmutov/make-empty-github-commit) as a dev dependency and set it as `make-empty-commit` NPM script in the [package.json](package.json).
+
+To trigger production rebuild and redeploy, use personal GitHub token and run:
+
+```shell
+GITHUB_TOKEN=<your token> npm run make-empty-commit -- --message "trigger deploy" --branch master
+```
+
+As always, using [as-a](https://github.com/bahmutov/as-a) is recommended for storing and using sensitive environment variables.

_config.yml

@@ -13,6 +13,7 @@ language:
   - en
   - zh-cn
   - ja
+  - pt-br
 
 # URL
 ## If your site is put in a subdirectory, set url as 'http://yoursite.com/child' and root as '/child/'

circle.yml

@@ -1,4 +1,5 @@
-version: 2
+# let's try using orbs, jobs, commands
+version: 2.1
 
 env_defaults: &env_defaults
   ## this enables colors + fixes failing unit tests
@@ -159,8 +160,8 @@ workflows:
       - docs-tests:
           requires:
             - build
-      # we can deploy development docs in parallel with
-      # unit testining them.
+      # we can deploy development docs in parallel
+      # with unit testing them.
       - deploy-docs-staging:
           filters:
             branches:

copy-english-docs.js

@@ -15,6 +15,7 @@ const getLanguageName = (short) => {
   const names = {
     ja: 'Japanese',
     'zh-cn': 'Chinese',
+    'pt-br': 'Portuguese Brazil',
   }
 
   if (!names[short]) {
@@ -48,8 +49,9 @@ const findAllDocs = () => {
 
 const isJapaneseDoc = R.test(/\/ja\//)
 const isChineseDoc = R.test(/\/zh-cn\//)
+const isPortugueseDoc = R.test(/\/pt-br\//)
 const isImage = R.test(/\/img\//)
-const isTranslation = R.anyPass([isJapaneseDoc, isChineseDoc, isImage])
+const isTranslation = R.anyPass([isJapaneseDoc, isChineseDoc, isPortugueseDoc, isImage])
 
 const translationsFilter = R.reject(isTranslation)
 
@@ -60,7 +62,7 @@ const findAllEnglishDocs = () => {
 }
 
 /**
- * @param {("ja" | "zh-cn")} shortName The short language name
+ * @param {("ja" | "zh-cn" | "pt-br")} shortName The short language name
  */
 const findAllDocsFor = (shortName) => {
   const relativeSourceFolder = `source/${shortName}`
@@ -69,7 +71,7 @@ const findAllDocsFor = (shortName) => {
 }
 
 /**
- * @param {("ja" | "zh-cn")} targetLanguage
+ * @param {("ja" | "zh-cn" | "pt-br")} targetLanguage
  */
 const copyAllEnglishDocsNotTranslatedTo = (targetLanguage) => {
   return Promise.all([
@@ -107,6 +109,8 @@ const copyUntranslatedDocs = () => {
   return copyAllEnglishDocsNotTranslatedTo('ja')
   .then(() => {
     return copyAllEnglishDocsNotTranslatedTo('zh-cn')
+  }).then(() => {
+    return copyAllEnglishDocsNotTranslatedTo('pt-br')
   })
 
 }

cypress/integration/contentful_banners_spec.js

@@ -14,7 +14,7 @@ function removeNonAscii (string) {
   .replace(/  +/gim, ' ')
 }
 
-describe('stripEmoji is working', () => {
+describe('removeNonAscii is working', () => {
   const allEmoji = `
   😀 😁 😂 🤣 😃 😄 😅 😆 😉 😊 😋 😎 😍 😘 🥰 😗 😙 😚 ☺️ 🙂 🤗 🤩 🤔 🤨 😐 😑 😶 🙄 😏 😣 😥 😮 🤐 😯 😪 😫 😴 😌 😛 😜 😝 🤤 😒 😓 😔 😕 🙃 🤑 😲 ☹️ 🙁 😖 😞 😟 😤 😢 😭 😦 😧 😨 😩 🤯 😬 😰 😱 🥵 🥶 😳 🤪 😵 😡 😠 🤬 😷 🤒 🤕 🤢 🤮 🤧 😇 🤠 🤡 🥳 🥴 🥺 🤥 🤫 🤭 🧐 🤓 😈 👿 👹 👺 💀 👻 👽 🤖 💩 😺 😸 😹 😻 😼 😽 🙀 😿 😾
   People and Fantasy
@@ -100,17 +100,19 @@ describe('stripEmoji is working', () => {
 })
 
 describe('Contentful driven banners', () => {
-  it('displays all current banners with proper info', function () {
+  before(() => cy.visit('/'))
+
+  it('Should display all current banners with proper info', function () {
     cy.task('readFileMaybe', allBannersYaml)
     .then((yamlString) => {
       if (typeof yamlString === 'undefined' || yamlString === null) return this.skip()
 
-      const yamlObject = YAML.parse(yamlString)
+      const yamlArray = YAML.parse(yamlString) || []
 
       // remove all outdated or future banners
       const setMyTimezoneToDate = (date) => new Date(Date.parse(date))
 
-      return yamlObject.filter((banner) => {
+      return yamlArray.filter((banner) => {
         const now = new Date()
         const startDate = setMyTimezoneToDate(banner.startDate)
         const endDate = setMyTimezoneToDate(banner.endDate)
@@ -119,14 +121,14 @@ describe('Contentful driven banners', () => {
       })
     })
     .then((banners) => {
-      if (typeof banners === 'undefined' || !banners || !banners.length) return this.skip()
-
-      cy.visit('/')
+      if (typeof banners === 'undefined' || !banners || !banners.length) {
+        return this.skip()
+      }
 
-      cy.get('#header .top-banners_item')
+      cy.get('#header').find('.top-banners-item')
       .each((banner, i) => {
         cy.wrap(banner)
-        .find('.top-banners_item--body')
+        .find('.top-banners-item__body__text')
         .invoke('text').invoke('trim')
         .should((bannerText) => {
           const htmlText = removeNonAscii(regexpTrim(bannerText))
@@ -156,4 +158,133 @@ describe('Contentful driven banners', () => {
       })
     })
   })
+
+  it('Should close individual banner', function () {
+    cy.task('readFileMaybe', allBannersYaml)
+    .then((yamlString) => {
+      if (typeof yamlString === 'undefined' || yamlString === null) return this.skip()
+
+      const yamlArray = YAML.parse(yamlString) || []
+
+      // remove all outdated or future banners
+      const setMyTimezoneToDate = (date) => new Date(Date.parse(date))
+
+      return yamlArray.filter((banner) => {
+        const now = new Date()
+        const startDate = setMyTimezoneToDate(banner.startDate)
+        const endDate = setMyTimezoneToDate(banner.endDate)
+
+        return startDate <= now && now <= endDate
+      })
+    })
+    .then((banners) => {
+      if (typeof banners === 'undefined' || !banners || !banners.length) {
+        return this.skip()
+      }
+
+      const banner = banners[0]
+      const notUniquerBanner = banners.splice(1).map((b) => b.id)
+
+      cy.get(`.top-banners-item[data-id="${banner.id}"]`)
+      .find('.top-banners-item__btn_close')
+      .first()
+      .click()
+
+      cy.get(`.top-banners_item[data-id="${banner.id}"]`).should('not.exist').then(() => {
+        const closedBanners = window.localStorage.getItem('cypress_docs_closed_banners') !== null ?
+          JSON.parse(window.localStorage.getItem('cypress_docs_closed_banners'))
+          : []
+
+        expect(closedBanners).to.include(banner.id)
+
+        if (notUniquerBanner.length) {
+          expect(closedBanners).not.have.members(notUniquerBanner)
+          cy.get('#header').find('.top-banners-item:not(.top-banners-item_is-closed)').each(($banner) => {
+            expect(notUniquerBanner).have.members([$banner.data('id')])
+          })
+        }
+      })
+    })
+  })
+
+  it('Should close each banner with a close button', function () {
+    window.localStorage.removeItem('cypress_docs_closed_banners')
+
+    cy.visit('/')
+
+    cy.get('#header')
+    .then((header) => {
+      const bannerItems = header.find('.top-banners-item')
+
+      if (!bannerItems.length) {
+        return this.skip()
+      }
+
+      cy.get(bannerItems).each(($banner) => {
+        cy.get($banner.find('.top-banners-item__btn_close')).as('closeBtn')
+
+        cy.get('@closeBtn').click().then(() => {
+          const id = $banner.data('id')
+
+          cy.get(`.top-banners-item[data-id="${id}"]`).should('not.exist')
+
+          const closedBanners = window.localStorage.getItem('cypress_docs_closed_banners') !== null ?
+            JSON.parse(window.localStorage.getItem('cypress_docs_closed_banners'))
+            : []
+
+          expect(closedBanners).to.include(id)
+        })
+      })
+    })
+  })
+
+  it('Displays Algolia dropdown on focus after close all banners', function () {
+    cy.server()
+
+    cy.route({
+      method: 'POST',
+      url: /algolia/,
+      response: {
+        'results': [
+          {
+            'hits': [
+              {
+                'hierarchy': { 'lvl2': null, 'lvl3': null, 'lvl0': 'Known Issues', 'lvl1': null, 'lvl6': null, 'lvl4': null, 'lvl5': null },
+                'url': 'https://docs-staging.cypress.io/guides/appendices/known-issues.html#content-inner', 'content': 'cy.get', 'anchor': 'content-inner', 'objectID': '15872310', '_snippetResult': { 'content': { 'value': 'to implement in Cypress.  Right <span class="algolia-docsearch-suggestion--highlight">click Issue #53</span>  Workaround  Oftentimes', 'matchLevel': 'full' } }, '_highlightResult': { 'hierarchy': { 'lvl0': { 'value': 'Known Issues', 'matchLevel': 'none', 'matchedWords': [] } }, 'content': { 'value': 'cy.get', 'matchLevel': 'full', 'fullyHighlighted': false, 'matchedWords': ['click', 'issue', '53'] }, 'hierarchy_camel': [{ 'lvl0': { 'value': 'Known Issues', 'matchLevel': 'none', 'matchedWords': [] } }] },
+              },
+            ], 'nbHits': 1, 'page': 0, 'nbPages': 1, 'hitsPerPage': 5, 'processingTimeMS': 1, 'exhaustiveNbHits': true, 'query': '"click Issue #53" ', 'params': 'query=%22click%20Issue%20%2353%22%20&hitsPerPage=5', 'index': 'cypress',
+          },
+        ],
+      },
+    }).as('postAlgolia')
+
+    cy.get('.ds-dropdown-menu').should('not.be.visible')
+    cy.get('#search-input').type('g')
+    cy.wait('@postAlgolia')
+    cy.get('.ds-dropdown-menu').should('be.visible')
+  })
+
+  it('Collapse sidebar links', function () {
+    cy.window().then((win) => {
+      if (win.innerWidth < 768) {
+        return this.skip()
+      }
+
+      cy.get('#collapse-sidebar').click()
+      cy.get('.sidebar-title').each(($sidebar) => cy.get($sidebar).should('have.class', 'is-collapsed'))
+    })
+  })
+
+  it('Expand sidebar links', function () {
+    cy.window().then((win) => {
+      if (win.innerWidth < 768) {
+        return this.skip()
+      }
+
+      cy.get('#expand-sidebar').click()
+      cy.get('.sidebar-title').each(($sidebar) => cy.get($sidebar).should('not.have.class', 'is-collapsed'))
+    })
+  })
+
+  after(() => window.localStorage.removeItem('cypress_docs_closed_banners'))
 })

cypress/integration/main_spec.js

@@ -15,6 +15,7 @@ describe('Main', () => {
         cy.request('/robots.txt').its('body')
         .should('include', 'Disallow: /ja/')
         .and('include', 'Disallow: /zh-cn/')
+        .and('include', 'Disallow: /pt-br/')
       })
     }
   })

cypress/integration/mobile_spec.js

@@ -40,5 +40,7 @@ context('Mobile', () => {
         })
       })
     })
+
+    require('./contentful_banners_spec')
   })
 })

index.js

@@ -100,19 +100,20 @@ function initHexo () {
   return new Promise((resolve, reject) => {
     const space = hexo.env.GATSBY_CONTENTFUL_SPACE_ID || process.env.GATSBY_CONTENTFUL_SPACE_ID
     const accessToken = hexo.env.GATSBY_CONTENTFUL_ACCESS_TOKEN || process.env.GATSBY_CONTENTFUL_ACCESS_TOKEN
+    const environment = env !== 'production' ? 'staging' : 'master'
 
     if (typeof space === 'undefined' || typeof accessToken === 'undefined') {
       return reject({
         message: 'No Contentful space variables.',
       })
     }
 
-    return Contentful.createClient({ space, accessToken })
+    return Contentful.createClient({ space, accessToken, environment })
     .getEntries({ content_type: 'topBanner' })
     .then(({ items }) => {
-      const data = items.reduce((filtered, option) => {
-        if (moment(option.fields.endDate).isSameOrAfter(moment())) {
-          filtered.push({ ...option.fields, text: documentToHtmlString(option.fields.text) })
+      const data = items.reduce((filtered, { sys: { id }, fields }) => {
+        if (moment(fields.endDate).isSameOrAfter(moment())) {
+          filtered.push({ id, ...fields, text: documentToHtmlString(fields.text) })
         }
 
         return filtered