Merge branch 'dev'

Author: levy

README.md

@@ -40,6 +40,7 @@ Create an enterprise nuxt app in seconds.
 - [x] [PWA](https://pwa.nuxtjs.org) Nuxt Progressive Web Apps solution
 - [x] [API Manage](https://github.com/FEMessage/create-nuxt-app/blob/dev/docs/api.md) RESTful API management
 - [x] [breadcrumb](https://www.yuque.com/docs/share/2fb86219-e8be-4007-a2b8-39641d5e79df)
+- [x] [Cypress](https://www.cypress.io/)
 
 [⬆ Back to Top](#table-of-contents)
 

template/framework-base/_.gitignore

@@ -85,3 +85,8 @@ dist
 sw.*
 
 package-lock.json
+
+# cypress
+test/e2e/screenshots/
+test/e2e/videos/
+

template/modules/cypress/_package.json

@@ -5,7 +5,7 @@
   },
 
   "devDependencies": {
-    "cypress": "5.6.0",
+    "cypress": "^6.0.1",
     "eslint-plugin-cypress": "^2.11.2"
   }
 }

template/modules/cypress/cypress.json

@@ -4,5 +4,7 @@
   "pluginsFile": "test/e2e/plugins/index.js",
   "screenshotsFolder": "test/e2e/screenshots",
   "supportFile": "test/e2e/support/index.js",
-  "videosFolder": "test/e2e/videos"
+  "videosFolder": "test/e2e/videos",
+  "viewportWidth": 1280,
+  "viewportHeight": 800
 }

template/modules/cypress/test/e2e/integration/login/login.spec.js

@@ -1,23 +1,26 @@
 /**
- * @FYI https://deepexi.yuque.com/docs/share/6537d0c9-6d70-4302-a37d-ba388fd74a15?# 《Cypress 实战》
+ * @FYI https://deepexi.yuque.com/docs/share/6537d0c9-6d70-4302-a37d-ba388fd74a15?# 《Cypress 实战总结》
  */
 describe('login', function () {
   before(() => {
     cy.fixture('user').as('user')
 
     cy.visit('/')
-    cy.viewport(600, 800)
   })
 
   it('login', function () {
     const {code, username, password} = this.user
 
-    cy.hash().should('eq', '#/login?redirect=%2F')
-
     cy.get('input[placeholder=租户Id]').type(code)
     cy.get('input[placeholder="用户名 / 邮箱"]').fill(username)
-    cy.get('input[placeholder=密码]').fill(`${password}{enter}`)
-    // cy.contains('登录').click() // enter 代替 click
+    cy.get('input[placeholder=密码]').fill(`${password}`)
+
+    cy.contains('登录')
+      .then($el => {
+        $el.on('click', e => e.preventDefault())
+      })
+      .click()
+
     cy.hash().should('eq', '#/')
   })
 })

template/modules/cypress/test/e2e/plugins/index.js

@@ -1,10 +1,13 @@
+/**
+ * https://docs.cypress.io/api/plugins/configuration-api.html#Switch-between-multiple-configuration-files
+ */
 const path = require('path')
-const fs = require('fs-extra')
+const fs = require('fs')
 
-function getConfigurationByFile(file) {
+async function getConfigurationByFile(file) {
   const pathToConfigFile = path.resolve(__dirname, '../config', `${file}.json`)
 
-  return fs.readJson(pathToConfigFile)
+  return JSON.parse(await fs.promises.readFile(pathToConfigFile, 'utf-8'))
 }
 
 /**
@@ -15,4 +18,4 @@ module.exports = (_on, config) => {
   const file = config.env.config || 'local'
 
   return getConfigurationByFile(file)
-}
+}

template/modules/gitlab-ci/.gitlab-ci.yml

@@ -1,5 +1,10 @@
-image: node:10
+image: node:14
+stages:
+  - deploy
+  - e2e
+
 pages:
+  stage: deploy
   cache:
     paths:
     - node_modules/
@@ -12,3 +17,19 @@ pages:
     - public
   only:
   - master
+
+cypress:
+  image:
+    name: cypress/included:6.0.1
+    entrypoint: [""]
+  stage: e2e
+  when: manual
+  tags:
+    - docker
+  script:
+    - cypress run --env config=dev
+  artifacts:
+    paths:
+      - test/e2e/screenshots
+      - test/e2e/video
+    expire_in: 3 day

test/snapshots/cypress.test.js.md

@@ -332,7 +332,7 @@ Generated by [AVA](https://ava.li).
         'babel-plugin-import': '1.13.0',
         'core-js': '3.7.0',
         'cross-env': '5.2.1',
-        cypress: '5.6.0',
+        cypress: '^6.0.1',
         eslint: '7.13.0',
         'eslint-config-prettier': '6.15.0',
         'eslint-friendly-formatter': '4.0.1',