@toptal/davinci-ci 1.15.1-alpha-fx-2724-prepare-a-davinci-codemod-package.28 → 2.0.0

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Change Log
 
+## 2.0.0
+
+### Major Changes
+
+- [#1326](https://github.com/toptal/davinci/pull/1326) [`77adee1f`](https://github.com/toptal/davinci/commit/77adee1f003f6336279ca4ac24476bdece8d9828) Thanks [@augustobmoura](https://github.com/augustobmoura)! - - rename the command `davinci qa e2e` to `davinci qa integration`
+
 ## 1.15.0
 
 ### Minor Changes

package/dist-package/package.json

@@ -0,0 +1,39 @@
+{
+  "name": "@toptal/davinci-ci",
+  "version": "2.0.0",
+  "description": "Continuos integrations tools for frontend projects",
+  "publishConfig": {
+    "access": "public"
+  },
+  "keywords": [
+    "jenkins",
+    "docker",
+    "ci"
+  ],
+  "author": "Toptal",
+  "homepage": "https://github.com/toptal/davinci/tree/master/packages/ci#readme",
+  "license": "ISC",
+  "bin": {
+    "davinci-code": "./bin/davinci-ci.js"
+  },
+  "main": "./src/index.js",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/toptal/davinci.git"
+  },
+  "scripts": {
+    "build:package": "../../bin/build-package.js",
+    "prepublishOnly": "../../bin/prepublish.js",
+    "test": "echo \"Error: run tests from root\" && exit 1"
+  },
+  "bugs": {
+    "url": "https://github.com/toptal/davinci/issues"
+  },
+  "dependencies": {
+    "@commitlint/cli": "^16.2.4",
+    "@commitlint/config-conventional": "^16.0.0",
+    "@toptal/davinci-cli-shared": "1.5.1",
+    "danger": "^11.0.5",
+    "markdown-table": "^2.0.0"
+  }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@toptal/davinci-ci",
-  "version": "1.15.1-alpha-fx-2724-prepare-a-davinci-codemod-package.28+50775c42",
+  "version": "2.0.0",
   "description": "Continuos integrations tools for frontend projects",
   "publishConfig": {
     "access": "public"
@@ -32,9 +32,8 @@
   "dependencies": {
     "@commitlint/cli": "^16.2.4",
     "@commitlint/config-conventional": "^16.0.0",
-    "@toptal/davinci-cli-shared": "1.5.2-alpha-fx-2724-prepare-a-davinci-codemod-package.113+50775c42",
+    "@toptal/davinci-cli-shared": "1.5.1",
     "danger": "^11.0.5",
     "markdown-table": "^2.0.0"
-  },
-  "gitHead": "50775c42637e6c0a896030c2cfe34aa80900f515"
+  }
 }

package/src/configs/danger/toptal/plugins/toptal-commits/toptal-commits.test.js

@@ -0,0 +1,128 @@
+const { toptalCommits } = require('.')
+
+const prepareCommitsWithMessages = (messages = []) => ({
+  commits: messages.map(message => ({
+    message,
+    sha: '123'
+  }))
+})
+
+describe('commit danger plugin', () => {
+  beforeEach(() => {
+    global.fail = jest.fn()
+    global.danger = {
+      github: {
+        pr: {
+          user: {
+            login: 'user'
+          }
+        }
+      }
+    }
+  })
+
+  afterEach(() => {
+    global.fail = undefined
+    global.danger = undefined
+  })
+
+  test('commit with title only', () => {
+    global.danger.git = prepareCommitsWithMessages(['Hello world'])
+    toptalCommits()
+
+    expect(global.fail).toHaveBeenCalledTimes(0)
+  })
+
+  test('commit with title and body', () => {
+    global.danger.git = prepareCommitsWithMessages([
+      'Hello world\n\nSome commit body here.'
+    ])
+    toptalCommits()
+
+    expect(global.fail).toHaveBeenCalledTimes(0)
+  })
+
+  test('commit with multi-line body', () => {
+    global.danger.git = prepareCommitsWithMessages([
+      'Hello world\n\nFirst line of commit body\nSecond line of commit body'
+    ])
+    toptalCommits()
+
+    expect(global.fail).toHaveBeenCalledTimes(0)
+  })
+
+  test('commit with title longer than allowed', () => {
+    global.danger.git = prepareCommitsWithMessages([
+      'This commit message is a teeny tiny bit longer than allowed length of 79 characters'
+    ])
+    toptalCommits()
+
+    expect(global.fail).toHaveBeenCalledTimes(1)
+  })
+
+  test('commit with body lines longer than allowed', () => {
+    global.danger.git = prepareCommitsWithMessages([
+      'Short commit title\n\nBut this body line commit message is a bit longer than allowed length of 79 characters\nAnd this one is fine again.'
+    ])
+    toptalCommits()
+
+    expect(global.fail).toHaveBeenCalledTimes(1)
+  })
+
+  test('commit message not starting with an uppercase letter', () => {
+    global.danger.git = prepareCommitsWithMessages([
+      '23432 starts with a number',
+      'starts with a lowercase letter',
+      '* starts with a symbol',
+      ' starts with a space'
+    ])
+    toptalCommits()
+
+    expect(global.fail).toHaveBeenCalledTimes(4)
+  })
+
+  test('commit message ending with a period in title', () => {
+    global.danger.git = prepareCommitsWithMessages([
+      'Commit title ending with period.',
+    ])
+    toptalCommits()
+
+    expect(global.fail).toHaveBeenCalledTimes(1)
+  })
+
+  test('commit without a blank line between title and body', () => {
+    global.danger.git = prepareCommitsWithMessages([
+      'Commit title\nBody without a blank line after title'
+    ])
+    toptalCommits()
+
+    expect(global.fail).toHaveBeenCalledTimes(1)
+  })
+
+  test('valid commit titles', () => {
+    global.danger.git = prepareCommitsWithMessages([
+      'Regular commit title',
+      'Commit with sentence. But does not end with a full-stop',
+      '[FOO-1234] Commit with prefix',
+      '[FOO] Prefix numbers can be omitted',
+      '[FOO][BAR] Prefixes can couple',
+      '[FOO-1234][BAR] Mixed prefixes',
+      '[FOO-1234][BAR-123][BAZ] Everything. Together',
+    ])
+    toptalCommits()
+
+    expect(global.fail).toHaveBeenCalledTimes(0)
+  })
+
+  test('invalid commit title prefixes', () => {
+    global.danger.git = prepareCommitsWithMessages([
+      '[FOO-1234] commit with lowercase',
+      '[FOO-BAR] Prefix with letter after dash',
+      '[FOO] [BAR] Prefixes with space between',
+      '[FOO]Prefix without space',
+    ])
+    toptalCommits()
+
+    expect(global.fail).toHaveBeenCalledTimes(4)
+  })
+})

package/src/configs/danger/toptal/plugins/toptal-pr-title/toptal-pr-title.test.js

@@ -0,0 +1,66 @@
+const { toptalPRTitle } = require('.')
+const {
+  MISSING_TICKET_CODE_ERROR_MESSAGE,
+  DEFAULT_PR_TITLE_ERROR_MESSAGE
+} = require('../../config')
+
+const VALID_PR_TITLE = '[ASD-123] Hello world'
+const INVALID_PR_TITLE = '[ASD-123] hello world'
+const NO_TICKET_CODE_PR_TITLE = 'Hello world'
+
+describe('commit danger plugin', () => {
+  beforeEach(() => {
+    global.fail = jest.fn()
+    global.danger = {
+      github: {
+        issue: {
+          labels: [
+            { name: 'My Team' }
+          ]
+        },
+        pr: {
+          title: '',
+          user: {
+            login: 'user'
+          }
+        }
+      }
+    }
+  })
+
+  afterEach(() => {
+    global.fail = undefined
+    global.danger = undefined
+  })
+
+  test('should pass valid PR title', () => {
+    global.danger.github.pr.title = VALID_PR_TITLE
+
+    toptalPRTitle()
+    expect(global.fail).toHaveBeenCalledTimes(0)
+  })
+
+  test('should fail PR title with missing ticket code', () => {
+    global.danger.github.pr.title = NO_TICKET_CODE_PR_TITLE
+
+    toptalPRTitle()
+    expect(global.fail).toHaveBeenCalledTimes(1)
+    expect(global.fail).toHaveBeenCalledWith(MISSING_TICKET_CODE_ERROR_MESSAGE)
+  })
+
+  test('should pass valid PR title with missing ticket code and no-jira label', () => {
+    global.danger.github.pr.title = NO_TICKET_CODE_PR_TITLE
+    global.danger.github.issue.labels = [{ name: 'no-jira' }]
+
+    toptalPRTitle()
+    expect(global.fail).toHaveBeenCalledTimes(0)
+  })
+
+  test('should fail invalid PR title', () => {
+    global.danger.github.pr.title = INVALID_PR_TITLE
+
+    toptalPRTitle()
+    expect(global.fail).toHaveBeenCalledTimes(1)
+    expect(global.fail).toHaveBeenCalledWith(DEFAULT_PR_TITLE_ERROR_MESSAGE)
+  })
+})

package/src/configs/jobs/build-image/Jenkinsfile

@@ -4,6 +4,7 @@ image = null
 
 repositoryName =  REPOSITORY_NAME
 repositorySSHUrl = "git@github.com:toptal/${repositoryName}.git"
+env.REPO_NAME_FOR_COMMIT = "toptal/${repositoryName}"
 
 pipeline {
   agent { label 'slave_aws' }
@@ -47,6 +48,7 @@ pipeline {
                 additionalBehaviours: [
                   cleanBeforeCheckout: true
                 ])
+              script { env.COMMIT_FOR_ANVIL = gitCommit() }
               success "== Checked out ${BRANCH} at ${gitCommit()}"
             }
           }

package/src/configs/jobs/build-release-image/Jenkinsfile

@@ -8,6 +8,7 @@ release_docker_image = null
 repositoryName = REPOSITORY_NAME
 repositorySSHUrl = "git@github.com:toptal/${repositoryName}.git"
 releaseImageName = "${repositoryName}-release"
+env.REPO_NAME_FOR_COMMIT = "toptal/${repositoryName}"
 
 pipeline {
   agent { label 'slave_aws' }
@@ -47,6 +48,7 @@ pipeline {
                 additionalBehaviours: [
                   cleanBeforeCheckout: true
                 ])
+              script { env.COMMIT_FOR_ANVIL = gitCommit() }
               success "== Checked out ${BRANCH} at ${gitCommit()}"
             }
           }

package/src/configs/jobs/deploy-helm-run-trigger/Jenkinsfile

@@ -13,6 +13,7 @@ repositorySSHUrl = "git@github.com:toptal/${repositoryName}.git"
 targetBranch = "master"
 configDavinciYaml = "davinci.yaml"
 def repoBullhornSlackChannel
+env.REPO_NAME_FOR_COMMIT = "toptal/${repositoryName}"
 
 buildImageJobName = "${repositoryName}-build-image"
 buildReleaseImageJobName = "${repositoryName}-build-release-image"
@@ -96,6 +97,7 @@ pipeline {
 
         info "Git commit: ${gitCommit()}"
         info "Git branch: ${gitBranch()}"
+        script { env.COMMIT_FOR_ANVIL = gitCommit() }
         success 'Checkout finished'
 
         script {

package/src/configs/jobs/master-main/Jenkinsfile

@@ -392,10 +392,14 @@ pipeline {
 
       steps {
         script {
+            def packageJson = readJSON(file: 'package.json', returnPojo: true)
+            def hasIntegrationCmd = 'test:integration:ci' in (packageJson.scripts ?: [:])
+            def testCommand = hasIntegrationCmd ? 'integration' : 'e2e'
+
             sh """
               docker run \
               --user="root" \
-              --rm gcr.io/toptal-hub/${repositoryName}:${commitId} /bin/bash -c "apt update && apt-get -y install libgtk2.0-0 libgtk-3-0 libgbm-dev libnotify-dev libgconf-2-4 libnss3 libxss1 libasound2 libxtst6 xauth xvfb  && yarn cypress install > /dev/null && yarn test:e2e:ci"
+              --rm gcr.io/toptal-hub/${repositoryName}:${commitId} /bin/bash -c "apt update && apt-get -y install libgtk2.0-0 libgtk-3-0 libgbm-dev libnotify-dev libgconf-2-4 libnss3 libxss1 libasound2 libxtst6 xauth xvfb  && yarn cypress install > /dev/null && yarn test:$testCommand:ci"
             """
         }
       } //steps

package/src/configs/jobs/pr-tests/Jenkinsfile

@@ -15,6 +15,9 @@ commitId = params.GITHUB_PR_HEAD_SHA
 repositoryName =  repositoryUrl.tokenize('/').last().split("\\.")[0]
 repositorySSHUrl = "git@github.com:toptal/${repositoryName}.git"
 
+env.COMMIT_FOR_ANVIL = commitId
+env.REPO_NAME_FOR_COMMIT = "toptal/${repositoryName}"
+
 buildImageJobName = "${repositoryName}-build-image"
 buildReleaseImageJobName = "${repositoryName}-build-release-image"
 deployTemployJobName = "${repositoryName}-temploy-helm-run"
@@ -255,10 +258,14 @@ pipeline {
             script {
               ghHelper.notifyPR('Cypress Tests', 'PENDING', 'running', "${commitId}", "${BUILD_URL}", repositoryName)
 
+              def packageJson = readJSON(file: 'package.json', returnPojo: true)
+              def hasIntegrationCmd = 'test:integration:ci' in (packageJson.scripts ?: [:])
+              def testCommand = hasIntegrationCmd ? 'integration' : 'e2e'
+
               sh """
                 docker run \
                 --user="root" \
-                --rm gcr.io/toptal-hub/${repositoryName}:${commitId} /bin/bash -c "apt update && apt-get -y install libgtk2.0-0 libgtk-3-0 libgbm-dev libnotify-dev libgconf-2-4 libnss3 libxss1 libasound2 libxtst6 xauth xvfb  && yarn cypress install > /dev/null && yarn test:e2e:ci"
+                --rm gcr.io/toptal-hub/${repositoryName}:${commitId} /bin/bash -c "apt update && apt-get -y install libgtk2.0-0 libgtk-3-0 libgbm-dev libnotify-dev libgconf-2-4 libnss3 libxss1 libasound2 libxtst6 xauth xvfb  && yarn cypress install > /dev/null && yarn test:$testCommand:ci"
               """
             }
           } //steps