Merge pull request #348 from shine2lay/fix-for-2.0

shine2lay · web-flow · commit 1af662df9859 · 2020-08-01T20:37:56.000-07:00
fix: push event + add fix docs for mergeable 2.0
diff --git a/docs/actions/check.rst b/docs/actions/check.rst
@@ -65,9 +65,8 @@ You can pass in Handlebars template to show the details result of the run.
 .. note::
     if any of required fields ``title``, ``summary`` or ``status`` is missing, default values will be used
 
-.. warning::
-    if you have have ``checks`` action only for some of the outcome, you may end up in a state where checks are never finished.
-    So be sure to have ``checks`` for all outcome (``pass``, ``fail``, and ``error``)
+.. note::
+    checks will automatically re-run if the base branch has a modified config file
 
 Supported Events:
 ::
diff --git a/docs/configuration.rst b/docs/configuration.rst
@@ -92,6 +92,7 @@ Actions that mergeable is currently able to perform.
     actions/check.rst
     actions/close.rst
     actions/comment.rst
+    actions/merge.rst
     actions/label.rst
     actions/request_review.rst
 
diff --git a/docs/validators/approval.rst b/docs/validators/approval.rst
@@ -21,13 +21,8 @@ Approvals
         owners: true # Optional boolean. When true, the file .github/CODEOWNER is read and only owners approval will count
 
 .. note::
-    ``owners`` file now support option, make sure to use `@organization/team-slug` format.
+    ``owners`` file now support teams as well, make sure to use `@organization/team-slug` format.
 
-.. warning::
-    ``owners`` sub-option only works in public repos right now, we have plans to enable it for private repos in the future.
-
-.. warning::
-    ``teams`` (both through limit.teams and inside owners file) will not work right now, it require `team:read` permission which mergeable doesn't have, we have plans to request it in the near future.
 
 Supported Events:
 ::
diff --git a/docs/validators/contents.rst b/docs/validators/contents.rst
@@ -20,9 +20,6 @@ Contents
          match: 'A String' # or array of strings
          message: 'Come message...'
 
-.. warning::
-    ``merge`` action will not work currently as it require ``contents`` ``read:write`` permission which the mergeable doesn't have. We have plans to enable it in the near future
-
 Supported Events:
 ::
 
diff --git a/lib/actions/checks.js b/lib/actions/checks.js
@@ -73,7 +73,8 @@ class Checks extends Action {
       'pull_request.assigned',
       'pull_request.unassigned',
       'pull_request.unlabeled',
-      'pull_request.synchronize'
+      'pull_request.synchronize',
+      'pull_request.push_synchronize'
     ]
     this.checkRunResult = new Map()
   }
diff --git a/lib/interceptors/push.js b/lib/interceptors/push.js
@@ -31,7 +31,6 @@ class Push extends Interceptor {
     }))
 
     const pulls = res.data
-
     await Promise.all(pulls.map(pullRequest => {
       const newContext = _.cloneDeep(context)
       newContext.event = 'pull_request'
diff --git a/lib/validators/approvals.js b/lib/validators/approvals.js
@@ -25,7 +25,8 @@ class Approvals extends Validator {
       'pull_request.assigned',
       'pull_request.unassigned',
       'pull_request.unlabeled',
-      'pull_request.synchronize'
+      'pull_request.synchronize',
+      'pull_request.push_synchronize'
     ]
 
     this.supportedSettings = {
diff --git a/lib/validators/assignee.js b/lib/validators/assignee.js
@@ -16,6 +16,7 @@ class Assignee extends Validator {
       'pull_request.unassigned',
       'pull_request.unlabeled',
       'pull_request.synchronize',
+      'pull_request.push_synchronize',
       'issues.*'
     ]
 
diff --git a/lib/validators/changeset.js b/lib/validators/changeset.js
@@ -15,7 +15,8 @@ class Changeset extends Validator {
       'pull_request.assigned',
       'pull_request.unassigned',
       'pull_request.unlabeled',
-      'pull_request.synchronize'
+      'pull_request.synchronize',
+      'pull_request.push_synchronize'
     ]
     this.supportedSettings = {
       no_empty: {
diff --git a/lib/validators/commit.js b/lib/validators/commit.js
@@ -24,7 +24,8 @@ class Commit extends Validator {
       'pull_request.assigned',
       'pull_request.unassigned',
       'pull_request.unlabeled',
-      'pull_request.synchronize'
+      'pull_request.synchronize',
+      'pull_request.push_synchronize'
     ]
     this.supportedSettings = {
       message: {
diff --git a/lib/validators/dependent.js b/lib/validators/dependent.js
@@ -20,7 +20,8 @@ class Dependent extends Validator {
       'pull_request.assigned',
       'pull_request.unassigned',
       'pull_request.unlabeled',
-      'pull_request.synchronize'
+      'pull_request.synchronize',
+      'pull_request.push_synchronize'
     ]
     this.supportedSettings = {
       files: 'array',
diff --git a/lib/validators/description.js b/lib/validators/description.js
@@ -16,6 +16,7 @@ class Description extends Validator {
       'pull_request.unassigned',
       'pull_request.unlabeled',
       'pull_request.synchronize',
+      'pull_request.push_synchronize',
       'issues.*'
     ]
     this.supportedSettings = {
diff --git a/lib/validators/label.js b/lib/validators/label.js
@@ -16,6 +16,7 @@ class Label extends Validator {
       'pull_request.unassigned',
       'pull_request.unlabeled',
       'pull_request.synchronize',
+      'pull_request.push_synchronize',
       'issues.*'
     ]
     this.supportedSettings = {
diff --git a/lib/validators/milestone.js b/lib/validators/milestone.js
@@ -17,6 +17,7 @@ class Milestone extends Validator {
       'pull_request.unassigned',
       'pull_request.unlabeled',
       'pull_request.synchronize',
+      'pull_request.push_synchronize',
       'issues.*'
     ]
     this.supportedSettings = {
diff --git a/lib/validators/options_processor/teams.js b/lib/validators/options_processor/teams.js
@@ -4,6 +4,9 @@ const _ = require('lodash')
 class Teams {
   static async extractTeamMembers (context, teams) {
     let teamMembers = []
+
+    if (!teams || teams.length === 0) return teamMembers
+
     for (let team of teams) {
       let members = []
       try {
diff --git a/lib/validators/project.js b/lib/validators/project.js
@@ -20,6 +20,7 @@ class Project extends Validator {
       'pull_request.unassigned',
       'pull_request.unlabeled',
       'pull_request.synchronize',
+      'pull_request.push_synchronize',
       'issues.*'
     ]
     this.supportedSettings = {
diff --git a/lib/validators/size.js b/lib/validators/size.js
@@ -39,7 +39,8 @@ class Size extends Validator {
       'pull_request.assigned',
       'pull_request.unassigned',
       'pull_request.unlabeled',
-      'pull_request.synchronize'
+      'pull_request.synchronize',
+      'pull_request.push_synchronize'
     ]
     this.supportedSettings = {
       ignore: 'array',
diff --git a/lib/validators/title.js b/lib/validators/title.js
@@ -16,6 +16,7 @@ class Title extends Validator {
       'pull_request.unassigned',
       'pull_request.unlabeled',
       'pull_request.synchronize',
+      'pull_request.push_synchronize',
       'issues.*'
     ]
     this.supportedSettings = {

Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,8 @@ class Checks extends Action {`
`73`	`73`	`'pull_request.assigned',`
`74`	`74`	`'pull_request.unassigned',`
`75`	`75`	`'pull_request.unlabeled',`
`76`		`- 'pull_request.synchronize'`
	`76`	`+ 'pull_request.synchronize',`
	`77`	`+ 'pull_request.push_synchronize'`
`77`	`78`	`]`
`78`	`79`	`this.checkRunResult = new Map()`
`79`	`80`	`}`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,8 @@ class Approvals extends Validator {`
`25`	`25`	`'pull_request.assigned',`
`26`	`26`	`'pull_request.unassigned',`
`27`	`27`	`'pull_request.unlabeled',`
`28`		`- 'pull_request.synchronize'`
	`28`	`+ 'pull_request.synchronize',`
	`29`	`+ 'pull_request.push_synchronize'`
`29`	`30`	`]`
`30`	`31`
`31`	`32`	`this.supportedSettings = {`
Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,7 @@ class Assignee extends Validator {`
`16`	`16`	`'pull_request.unassigned',`
`17`	`17`	`'pull_request.unlabeled',`
`18`	`18`	`'pull_request.synchronize',`
	`19`	`+ 'pull_request.push_synchronize',`
`19`	`20`	`'issues.*'`
`20`	`21`	`]`
`21`	`22`