-
-
Notifications
You must be signed in to change notification settings - Fork 4
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
test: verify unknown merge error behavior
- Loading branch information
Showing
8 changed files
with
294 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,56 @@ | ||
| { | ||
| "name": "status", | ||
| "type": "event", | ||
| "payload": { | ||
| "sha": "53e4600f2c01d18a8005f0f3e857c701fed8a9e0", | ||
| "name": "nikku/testtest", | ||
| "context": "continuous-integration/travis-ci/push", | ||
| "state": "success", | ||
| "commit": { | ||
| "sha": "53e4600f2c01d18a8005f0f3e857c701fed8a9e0", | ||
| "commit": { | ||
| "author": { | ||
| "name": "Nico Rehwaldt" | ||
| }, | ||
| "committer": { | ||
| "name": "GitHub" | ||
| }, | ||
| "message": "Update test.txt", | ||
| "tree": { | ||
| "sha": "911f57504612def9e96f0991fc84d59e078ec674" | ||
| }, | ||
| "comment_count": 0 | ||
| }, | ||
| "author": { | ||
| "login": "nikku", | ||
| "type": "User" | ||
| }, | ||
| "committer": { | ||
| "login": "web-flow", | ||
| "type": "User" | ||
| }, | ||
| "parents": [ | ||
| { | ||
| "sha": "c5de67566cca3f699aab82e92dc930d964587f2a" | ||
| } | ||
| ] | ||
| }, | ||
| "branches": [ | ||
| { | ||
| "name": "nikku-patch-1", | ||
| "commit": { | ||
| "sha": "53e4600f2c01d18a8005f0f3e857c701fed8a9e0" | ||
| } | ||
| } | ||
| ], | ||
| "repository": { | ||
| "name": "testtest", | ||
| "full_name": "nikku/testtest", | ||
| "owner": { | ||
| "login": "nikku", | ||
| "type": "User" | ||
| }, | ||
| "default_branch": "master" | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,65 @@ | ||
| { | ||
| "name": "pulls.list", | ||
| "type": "api-call", | ||
| "args": { | ||
| "owner": "nikku", | ||
| "repo": "testtest", | ||
| "state": "open", | ||
| "head": "nikku:nikku-patch-1" | ||
| }, | ||
| "result": { | ||
| "data": [ | ||
| { | ||
| "number": 29, | ||
| "state": "open", | ||
| "title": "Update test.txt", | ||
| "user": { | ||
| "login": "nikku", | ||
| "type": "User" | ||
| }, | ||
| "merge_commit_sha": "2c249293b68269d009b489c978653101d055301e", | ||
| "assignees": [], | ||
| "requested_reviewers": [], | ||
| "requested_teams": [], | ||
| "labels": [], | ||
| "head": { | ||
| "label": "nikku:nikku-patch-1", | ||
| "ref": "nikku-patch-1", | ||
| "sha": "53e4600f2c01d18a8005f0f3e857c701fed8a9e0", | ||
| "user": { | ||
| "login": "nikku", | ||
| "type": "User" | ||
| }, | ||
| "repo": { | ||
| "name": "testtest", | ||
| "full_name": "nikku/testtest", | ||
| "owner": { | ||
| "login": "nikku", | ||
| "type": "User" | ||
| }, | ||
| "default_branch": "master" | ||
| } | ||
| }, | ||
| "base": { | ||
| "label": "nikku:master", | ||
| "ref": "master", | ||
| "sha": "c5de67566cca3f699aab82e92dc930d964587f2a", | ||
| "user": { | ||
| "login": "nikku", | ||
| "type": "User" | ||
| }, | ||
| "repo": { | ||
| "name": "testtest", | ||
| "full_name": "nikku/testtest", | ||
| "owner": { | ||
| "login": "nikku", | ||
| "type": "User" | ||
| }, | ||
| "default_branch": "master" | ||
| } | ||
| }, | ||
| "author_association": "OWNER" | ||
| } | ||
| ] | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,66 @@ | ||
| { | ||
| "name": "pulls.get", | ||
| "type": "api-call", | ||
| "args": { | ||
| "owner": "nikku", | ||
| "repo": "testtest", | ||
| "pull_number": 29 | ||
| }, | ||
| "result": { | ||
| "data": { | ||
| "rebaseable": true, | ||
| "mergeable": true, | ||
| "merged": false, | ||
| "draft": false, | ||
| "number": 29, | ||
| "state": "open", | ||
| "title": "Update test.txt", | ||
| "user": { | ||
| "login": "nikku", | ||
| "type": "User" | ||
| }, | ||
| "merge_commit_sha": "2c249293b68269d009b489c978653101d055301e", | ||
| "assignees": [], | ||
| "requested_reviewers": [], | ||
| "requested_teams": [], | ||
| "labels": [], | ||
| "head": { | ||
| "label": "nikku:nikku-patch-1", | ||
| "ref": "nikku-patch-1", | ||
| "sha": "53e4600f2c01d18a8005f0f3e857c701fed8a9e0", | ||
| "user": { | ||
| "login": "nikku", | ||
| "type": "User" | ||
| }, | ||
| "repo": { | ||
| "name": "testtest", | ||
| "full_name": "nikku/testtest", | ||
| "owner": { | ||
| "login": "nikku", | ||
| "type": "User" | ||
| }, | ||
| "default_branch": "master" | ||
| } | ||
| }, | ||
| "base": { | ||
| "label": "nikku:master", | ||
| "ref": "master", | ||
| "sha": "c5de67566cca3f699aab82e92dc930d964587f2a", | ||
| "user": { | ||
| "login": "nikku", | ||
| "type": "User" | ||
| }, | ||
| "repo": { | ||
| "name": "testtest", | ||
| "full_name": "nikku/testtest", | ||
| "owner": { | ||
| "login": "nikku", | ||
| "type": "User" | ||
| }, | ||
| "default_branch": "master" | ||
| } | ||
| }, | ||
| "author_association": "OWNER" | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| { | ||
| "name": "config.get", | ||
| "type": "api-call", | ||
| "args": { | ||
| "owner": "nikku", | ||
| "repo": "testtest", | ||
| "path": ".github/merge-me.yml" | ||
| }, | ||
| "result": { | ||
| "config": { } | ||
| } | ||
| } |
20 changes: 20 additions & 0 deletions
20
test/fixtures/merge_error/006_repos.getBranchProtection.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,20 @@ | ||
| { | ||
| "name": "repos.getBranchProtection", | ||
| "type": "api-call", | ||
| "args": { | ||
| "owner": "nikku", | ||
| "repo": "testtest", | ||
| "branch": "master" | ||
| }, | ||
| "result": { | ||
| "data": { | ||
| "required_status_checks": { | ||
| "contexts": [ | ||
| "Travis CI - Pull Request" | ||
| ] | ||
| }, | ||
| "required_pull_request_reviews": {}, | ||
| "enforce_admins": {} | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,16 @@ | ||
| { | ||
| "name": "pulls.merge", | ||
| "type": "api-call", | ||
| "args": { | ||
| "owner": "nikku", | ||
| "repo": "testtest", | ||
| "pull_number": 29, | ||
| "sha": "53e4600f2c01d18a8005f0f3e857c701fed8a9e0", | ||
| "merge_method": "rebase" | ||
| }, | ||
| "result": { | ||
| "error": { | ||
| "message": "intended failure" | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,56 @@ | ||
| { | ||
| "name": "status", | ||
| "type": "event", | ||
| "payload": { | ||
| "sha": "53e4600f2c01d18a8005f0f3e857c701fed8a9e0", | ||
| "name": "nikku/testtest", | ||
| "context": "continuous-integration/travis-ci/pr", | ||
| "state": "pending", | ||
| "commit": { | ||
| "sha": "53e4600f2c01d18a8005f0f3e857c701fed8a9e0", | ||
| "commit": { | ||
| "author": { | ||
| "name": "Nico Rehwaldt" | ||
| }, | ||
| "committer": { | ||
| "name": "GitHub" | ||
| }, | ||
| "message": "Update test.txt", | ||
| "tree": { | ||
| "sha": "911f57504612def9e96f0991fc84d59e078ec674" | ||
| }, | ||
| "comment_count": 0 | ||
| }, | ||
| "author": { | ||
| "login": "nikku", | ||
| "type": "User" | ||
| }, | ||
| "committer": { | ||
| "login": "web-flow", | ||
| "type": "User" | ||
| }, | ||
| "parents": [ | ||
| { | ||
| "sha": "c5de67566cca3f699aab82e92dc930d964587f2a" | ||
| } | ||
| ] | ||
| }, | ||
| "branches": [ | ||
| { | ||
| "name": "nikku-patch-1", | ||
| "commit": { | ||
| "sha": "53e4600f2c01d18a8005f0f3e857c701fed8a9e0" | ||
| } | ||
| } | ||
| ], | ||
| "repository": { | ||
| "name": "testtest", | ||
| "full_name": "nikku/testtest", | ||
| "owner": { | ||
| "login": "nikku", | ||
| "type": "User" | ||
| }, | ||
| "default_branch": "master" | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters