Skip to content

Commit c04c3fb

Browse files
nikkunikku
committed
test: verify unknown merge error behavior
1 parent f398cce commit c04c3fb

File tree

8 files changed

+294
-0
lines changed

8 files changed

+294
-0
lines changed

‎test/fixtures/merge_error/004_status.json‎

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
{
2+
"name": "status",
3+
"type": "event",
4+
"payload": {
5+
"sha": "53e4600f2c01d18a8005f0f3e857c701fed8a9e0",
6+
"name": "nikku/testtest",
7+
"context": "continuous-integration/travis-ci/push",
8+
"state": "success",
9+
"commit": {
10+
"sha": "53e4600f2c01d18a8005f0f3e857c701fed8a9e0",
11+
"commit": {
12+
"author": {
13+
"name": "Nico Rehwaldt"
14+
},
15+
"committer": {
16+
"name": "GitHub"
17+
},
18+
"message": "Update test.txt",
19+
"tree": {
20+
"sha": "911f57504612def9e96f0991fc84d59e078ec674"
21+
},
22+
"comment_count": 0
23+
},
24+
"author": {
25+
"login": "nikku",
26+
"type": "User"
27+
},
28+
"committer": {
29+
"login": "web-flow",
30+
"type": "User"
31+
},
32+
"parents": [
33+
{
34+
"sha": "c5de67566cca3f699aab82e92dc930d964587f2a"
35+
}
36+
]
37+
},
38+
"branches": [
39+
{
40+
"name": "nikku-patch-1",
41+
"commit": {
42+
"sha": "53e4600f2c01d18a8005f0f3e857c701fed8a9e0"
43+
}
44+
}
45+
],
46+
"repository": {
47+
"name": "testtest",
48+
"full_name": "nikku/testtest",
49+
"owner": {
50+
"login": "nikku",
51+
"type": "User"
52+
},
53+
"default_branch": "master"
54+
}
55+
}
56+
}

‎test/fixtures/merge_error/005_pulls.list.json‎

Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
1+
{
2+
"name": "pulls.list",
3+
"type": "api-call",
4+
"args": {
5+
"owner": "nikku",
6+
"repo": "testtest",
7+
"state": "open",
8+
"head": "nikku:nikku-patch-1"
9+
},
10+
"result": {
11+
"data": [
12+
{
13+
"number": 29,
14+
"state": "open",
15+
"title": "Update test.txt",
16+
"user": {
17+
"login": "nikku",
18+
"type": "User"
19+
},
20+
"merge_commit_sha": "2c249293b68269d009b489c978653101d055301e",
21+
"assignees": [],
22+
"requested_reviewers": [],
23+
"requested_teams": [],
24+
"labels": [],
25+
"head": {
26+
"label": "nikku:nikku-patch-1",
27+
"ref": "nikku-patch-1",
28+
"sha": "53e4600f2c01d18a8005f0f3e857c701fed8a9e0",
29+
"user": {
30+
"login": "nikku",
31+
"type": "User"
32+
},
33+
"repo": {
34+
"name": "testtest",
35+
"full_name": "nikku/testtest",
36+
"owner": {
37+
"login": "nikku",
38+
"type": "User"
39+
},
40+
"default_branch": "master"
41+
}
42+
},
43+
"base": {
44+
"label": "nikku:master",
45+
"ref": "master",
46+
"sha": "c5de67566cca3f699aab82e92dc930d964587f2a",
47+
"user": {
48+
"login": "nikku",
49+
"type": "User"
50+
},
51+
"repo": {
52+
"name": "testtest",
53+
"full_name": "nikku/testtest",
54+
"owner": {
55+
"login": "nikku",
56+
"type": "User"
57+
},
58+
"default_branch": "master"
59+
}
60+
},
61+
"author_association": "OWNER"
62+
}
63+
]
64+
}
65+
}

‎test/fixtures/merge_error/005a_pulls.get.json‎

Lines changed: 66 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
1+
{
2+
"name": "pulls.get",
3+
"type": "api-call",
4+
"args": {
5+
"owner": "nikku",
6+
"repo": "testtest",
7+
"pull_number": 29
8+
},
9+
"result": {
10+
"data": {
11+
"rebaseable": true,
12+
"mergeable": true,
13+
"merged": false,
14+
"draft": false,
15+
"number": 29,
16+
"state": "open",
17+
"title": "Update test.txt",
18+
"user": {
19+
"login": "nikku",
20+
"type": "User"
21+
},
22+
"merge_commit_sha": "2c249293b68269d009b489c978653101d055301e",
23+
"assignees": [],
24+
"requested_reviewers": [],
25+
"requested_teams": [],
26+
"labels": [],
27+
"head": {
28+
"label": "nikku:nikku-patch-1",
29+
"ref": "nikku-patch-1",
30+
"sha": "53e4600f2c01d18a8005f0f3e857c701fed8a9e0",
31+
"user": {
32+
"login": "nikku",
33+
"type": "User"
34+
},
35+
"repo": {
36+
"name": "testtest",
37+
"full_name": "nikku/testtest",
38+
"owner": {
39+
"login": "nikku",
40+
"type": "User"
41+
},
42+
"default_branch": "master"
43+
}
44+
},
45+
"base": {
46+
"label": "nikku:master",
47+
"ref": "master",
48+
"sha": "c5de67566cca3f699aab82e92dc930d964587f2a",
49+
"user": {
50+
"login": "nikku",
51+
"type": "User"
52+
},
53+
"repo": {
54+
"name": "testtest",
55+
"full_name": "nikku/testtest",
56+
"owner": {
57+
"login": "nikku",
58+
"type": "User"
59+
},
60+
"default_branch": "master"
61+
}
62+
},
63+
"author_association": "OWNER"
64+
}
65+
}
66+
}

‎test/fixtures/merge_error/005b_config.get.json‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
{
2+
"name": "config.get",
3+
"type": "api-call",
4+
"args": {
5+
"owner": "nikku",
6+
"repo": "testtest",
7+
"path": ".github/merge-me.yml"
8+
},
9+
"result": {
10+
"config": { }
11+
}
12+
}

‎test/fixtures/merge_error/006_repos.getBranchProtection.json‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
{
2+
"name": "repos.getBranchProtection",
3+
"type": "api-call",
4+
"args": {
5+
"owner": "nikku",
6+
"repo": "testtest",
7+
"branch": "master"
8+
},
9+
"result": {
10+
"data": {
11+
"required_status_checks": {
12+
"contexts": [
13+
"Travis CI - Pull Request"
14+
]
15+
},
16+
"required_pull_request_reviews": {},
17+
"enforce_admins": {}
18+
}
19+
}
20+
}

‎test/fixtures/merge_error/007_pulls.merge.json‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
{
2+
"name": "pulls.merge",
3+
"type": "api-call",
4+
"args": {
5+
"owner": "nikku",
6+
"repo": "testtest",
7+
"pull_number": 29,
8+
"sha": "53e4600f2c01d18a8005f0f3e857c701fed8a9e0",
9+
"merge_method": "rebase"
10+
},
11+
"result": {
12+
"error": {
13+
"message": "intended failure"
14+
}
15+
}
16+
}

‎test/fixtures/merge_error/008_status.json‎

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
{
2+
"name": "status",
3+
"type": "event",
4+
"payload": {
5+
"sha": "53e4600f2c01d18a8005f0f3e857c701fed8a9e0",
6+
"name": "nikku/testtest",
7+
"context": "continuous-integration/travis-ci/pr",
8+
"state": "pending",
9+
"commit": {
10+
"sha": "53e4600f2c01d18a8005f0f3e857c701fed8a9e0",
11+
"commit": {
12+
"author": {
13+
"name": "Nico Rehwaldt"
14+
},
15+
"committer": {
16+
"name": "GitHub"
17+
},
18+
"message": "Update test.txt",
19+
"tree": {
20+
"sha": "911f57504612def9e96f0991fc84d59e078ec674"
21+
},
22+
"comment_count": 0
23+
},
24+
"author": {
25+
"login": "nikku",
26+
"type": "User"
27+
},
28+
"committer": {
29+
"login": "web-flow",
30+
"type": "User"
31+
},
32+
"parents": [
33+
{
34+
"sha": "c5de67566cca3f699aab82e92dc930d964587f2a"
35+
}
36+
]
37+
},
38+
"branches": [
39+
{
40+
"name": "nikku-patch-1",
41+
"commit": {
42+
"sha": "53e4600f2c01d18a8005f0f3e857c701fed8a9e0"
43+
}
44+
}
45+
],
46+
"repository": {
47+
"name": "testtest",
48+
"full_name": "nikku/testtest",
49+
"owner": {
50+
"login": "nikku",
51+
"type": "User"
52+
},
53+
"default_branch": "master"
54+
}
55+
}
56+
}

‎test/index.test.js‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,9 @@ describe('bot', function() {
9292
// mergeMethod is <dont-care>
9393
it('should handle config errors', test('config_errors'));
9494

95+
96+
it('should handle merge error', test('merge_error'));
97+
9598
});
9699

97100

0 commit comments

Comments
 (0)