8000 Re-record and re-write Repository.merge test · pythonthings/github3.py@9b1cb50 · GitHub
[go: up one dir, main page]
Skip to content

Commit 9b1cb50

Browse files
sigmavirus24sigmavirus24
committed
Re-record and re-write Repository.merge test
1 parent 1f64f3a commit 9b1cb50

File tree

2 files changed

+4
-7
lines changed

2 files changed

+4
-7
lines changed

‎tests/cassettes/Repository_merge.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"http_interactions": [{"recorded_at": "2017-02-25T21:51:12", "request": {"uri": "https://api.github.com/repos/github3py/github3.py", "method": "GET", "headers": {"User-Agent": "github3.py/1.0.0a4", "Connection": "keep-alive", "Accept-Charset": "utf-8", "Authorization": "token <AUTH_TOKEN>", "Accept-Encoding": "gzip, deflate", "Accept": "application/vnd.github.drax-preview+json", "Content-Type": "application/json"}, "body": {"encoding": "utf-8", "string": ""}}, "response": {"url": "https://api.github.com/repos/github3py/github3.py", "status": {"message": "Moved Permanently", "code": 301}, "headers": {"X-Frame-Options": "deny", "Content-Length": "153", "X-Accepted-OAuth-Scopes": "admin:repo_hook, delete_repo, read:repo_hook, repo, repo:status, repo_deployment, write:repo_hook", "Access-Control-Expose-Headers": "ETag, Link, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval", "Server": "GitHub.com", "X-RateLimit-Limit": "5000", "X-Content-Type-Options": "nosniff", "Date": "Sat, 25 Feb 2017 21:51:12 GMT", "Access-Control-Allow-Origin": "*", "X-OAuth-Scopes": "admin:gpg_key, admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user", "Content-Security-Policy": "default-src 'none'", "X-Served-By": "cee4c0729c8e9147e7abcb45b9d69689", "Status": "301 Moved Permanently", "X-GitHub-Media-Type": "github.drax-preview; format=json", "X-RateLimit-Reset": "1488062405", "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload", "X-XSS-Protection": "1; mode=block", "X-RateLimit-Remaining": "4942", "X-GitHub-Request-Id": "87FD:7C0D:DD586C:119908B:58B1FC4F", "Vary": "Accept-Encoding", "Location": "https://api.github.com/repositories/4464822", "Content-Type": "application/json; charset=utf-8"}, "body": {"encoding": "utf-8", "string": "{\"message\":\"Moved Permanently\",\"url\":\"https://api.github.com/repositories/4464822\",\"documentation_url\":\"https://developer.github.com/v3/#http-redirects\"}"}}}, {"recorded_at": "2017-02-25T21:51:12", "request": {"uri": "https://api.github.com/repositories/4464822", "method": "GET", "headers": {"User-Agent": "github3.py/1.0.0a4", "Connection": "keep-alive", "Accept-Charset": "utf-8", "Authorization": "token <AUTH_TOKEN>", "Accept-Encoding": "gzip, deflate", "Accept": "application/vnd.github.drax-preview+json"}, "body": {"encoding": "utf-8", "string": ""}}, "response": {"url": "https://api.github.com/repositories/4464822", "status": {"message": "OK", "code": 200}, "headers": {"X-Frame-Options": "deny", "Transfer-Encoding": "chunked", "Access-Control-Expose-Headers": "ETag, Link, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval", "X-Content-Type-Options": "nosniff", "X-RateLimit-Limit": "5000", "Vary": "Accept, Authorization, Cookie, X-GitHub-OTP", "Cache-Control": "private, max-age=60, s-maxage=60", "X-XSS-Protection": "1; mode=block", "Date": "Sat, 25 Feb 2017 21:51:12 GMT", "Access-Control-Allow-Origin": "*", "X-OAuth-Scopes": "admin:gpg_key, admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user", "Content-Security-Policy": "default-src 'none'", "X-Served-By": "4c8b2d4732c413f4b9aefe394bd65569", "ETag": "W/\"48da90dd8786ad1d573e6d4b768f2425\"", "Content-Encoding": "gzip", "Status": "200 OK", "X-GitHub-Media-Type": "github.drax-preview; format=json", "X-RateLimit-Reset": "1488062405", "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload", "X-Accepted-OAuth-Scopes": "repo", "Last-Modified": "Sat, 25 Feb 2017 21:50:55 GMT", "X-RateLimit-Remaining": "4941", "X-GitHub-Request-Id": "87FD:7C0D:DD5870:119908F:58B1FC50", "Server": "GitHub.com", "Content-Type": "application/json; charset=utf-8"}, "body": {"encoding": "utf-8", "base64_string": "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", "string": ""}}}, {"recorded_at": "2017-02-25T21:51:12", "request": {"uri": "https://api.github.com/repos/github3py/github3py/merges", "method": "POST", "headers": {"Content-Length": "46", "User-Agent": "github3.py/1.0.0a4", "Connection": "keep-alive", "Accept-Charset": "utf-8", "Authorization": "token <AUTH_TOKEN>", "Accept-Encoding": "gzip, deflate", "Accept": "application/vnd.github.v3.full+json", "Content-Type": "application/json"}, "body": {"encoding": "utf-8", "string": "{\"base\": \"base_branch\", \"head\": \"head_branch\"}"}}, "response": {"url": "https://api.github.com/repos/github3py/github3py/merges", "status": {"message": "Not Found", "code": 404}, "headers": {"Access-Control-Expose-Headers": "ETag, Link, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval", "X-Frame-Options": "deny", "Transfer-Encoding": "chunked", "Content-Security-Policy": "default-src 'none'", "Content-Encoding": "gzip", "Status": "404 Not Found", "X-GitHub-Media-Type": "github.v3; param=full; format=json", "X-RateLimit-Reset": "1488062405", "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload", "Access-Control-Allow-Origin": "*", "X-OAuth-Scopes": "admin:gpg_key, admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user", "Server": "GitHub.com", "X-RateLimit-Limit": "5000", "X-GitHub-Request-Id": "87FD:7C0D:DD587A:119909A:58B1FC50", "X-Content-Type-Options": "nosniff", "X-XSS-Protection": "1; mode=block", "Date": "Sat, 25 Feb 2017 21:51:12 GMT", "X-Accepted-OAuth-Scopes": "", "X-RateLimit-Remaining": "4940", "Content-Type": "application/json; charset=utf-8"}, "body": {"encoding": "utf-8", "base64_string": "H4sIAAAAAAAAAxXKMQ7CMAwF0KtEZqX1wNaRi6DQfNJIdRzFToWEuDtlfXofEpjFDFroHg0hKSxU9YB3MacrJV2HoHr0ovUx+n7Ozb3ZwpxwYNeGPufi23jOqwofN+5oaizoudTMlzO8tMsUpz+Bvj/Kc9tWdgAAAA==", "string": ""}}}], "recorded_with": "betamax/0.8.0"}
1+
{"http_interactions": [{"request": {"body": {"encoding": "utf-8", "string": ""}, "headers": {"User-Agent": "github3.py/1.0.0a4", "Accept-Encoding": "gzip, deflate", "Accept": "application/vnd.github.drax-preview+json", "Connection": "keep-alive", "Accept-Charset": "utf-8", "Content-Type": "application/json", "Authorization": "token <AUTH_TOKEN>"}, "method": "GET", "uri": "https://api.github.com/repos/github3py/fork_this"}, "response": {"body": {"encoding": "utf-8", "base64_string": "H4sIAAAAAAAAA+1YwXKrOBD8lRTXdSLjOO8lVG293S/YS057cckgG20AsZKwy6Hy79sjgQHX2nHkay4uLNRNazQjzUwbySxKnp7jHy/Py1lU8VJESbRR+m1lc2miWbRpimLVjW+lzZv1Y31g4xlqXwkdJW1UqK2sAD9OA5zo45/Pi/jpxyziO265XjW6wKzc2tokjPlBM3/wsMYInarKiso+pKpkDevgv3a/L0G41R0LMUcYOGGrZUfk0WAzbCwot2VxosC/dvPHMzeqKNQe+FPBFz8B03QwMp57ltU2hAKwlimbC1gMy/igxUtjvyjHQVoszNiVzIjEYA+0yL4mqQNBEO32R8u0qJVja9Ym1bK2UlVflDaBgkrpLa/kOw+gApSclUR9UYSDACp28LgvYj2mZbWWO54eyBxapELuYN0QvhMw6OyhpoD8a2QZsrm0YsWzkqJtwwsjPmaR02Ax2Q3MEF5X+fkkkjNx3Ep89M87ZxtplT7cWXVnhbF3FPhwzDu1gQ76c/zgxTh0TEN0Tb5KLJ8Y/izcEdH2vYlDMAdhW4bfLkBSRC1fK82x8mDSCUnLxn/JT6zgZTC3A4MkVyrccg4MEmlMI65y1/O74DgM6+Ohasq1P7CuiYLztB4NjdwYua2ECLbYkaBl/Vm61rxK83DKHt8y/+R2lW+DJRIWFOtCrYM5cH0xR9Ayk3N/Y9jVLaqIkfATQi02N0kk/JHQ6hv21ckjgiMdLiqLLQ7W1+NZ21mw4NW24dtwxiMBdpeu0S1//zSpOB8TAwPoKFHSct3cdlANHKTQ3+eI33ATDhQDoUsQLuccFxY9SjLcsstSfnZZn2fr4BOXvpGS/PCUlv5/nlNclkn4lg3nqT+sO+ZQa3anda9vzN9l3sFb3+NZ+1vNbU4nED5Tcy1CxXZw1q458pyHh4c2F9zlsaXQN0SlR4OG6zRHxhaqr+3xyERKbl1mvCF5GTLlQvEs2JZHApD5LQvV6NHjfa5R1QULc+AxWykL5IaqCj8jB4Yxb6Ws3Mj0moLgfBhNSNpfRlapmPGimMErrUwl/BQJLe0Ykj4RbhWPhnzU0L4SKARcNtjKWnh8y3zZlom6UIebTpQRBQWmFigYshW3SPYX83hxP3+5j59e54tkOU8eH//GnKbOJnOW93F8v1i+zh+T+CV5WtKcujH5iObnPZjiH6/zeTKPk8ULTcHx2PkunlDz/1/FPdQEVMADZEw+gP4YIIl/nLQhOkhawAlPouS6b+1O76bLMMjLVSlq5AVRUiEeqCh7x3M8ueNT1VSw7nwW7blFsok7dRjq84KeIOdm5SM1SqxuqIbDSK3VPyK1Zjw2nAyjiXv5JidAylmO1ZkvsrqPQ2QptVZdK8br784xdFW6ClLVouoE9arRwylkKipzXLWvv2jZo+lRgon9it3yM7HhTWFXPlWGv5XcWHSN4D1Cl1g1dQ+oh9RVtX795Fn9kujQ8c8odhG+ar8y/zYcPuJO8n6af+OGIJrShOkbLegemWLGfYfvPtbQ4vvuY/Utyssdv+8+1rTLigxo0gRDlF/fx6qE3VP7eTiqxhVJP/rxHx6VOIG5FgAA", "string": ""}, "headers": {"Server": "GitHub.com", "Date": "Sat, 16 Dec 2017 00:02:07 GMT", "Content-Type": "application/json; charset=utf-8", "Transfer-Encoding": "chunked", "Status": "200 OK", "X-RateLimit-Limit": "5000", "X-RateLimit-Remaining": "4999", "X-RateLimit-Reset": "1513386127", "Cache-Control": "private, max-age=60, s-maxage=60", "Vary": "Accept, Authorization, Cookie, X-GitHub-OTP", "ETag": "W/\"b443ea7008ed748cb0f0506e515ee882\"", "Last-Modified": "Mon, 24 Nov 2014 03:19:54 GMT", "X-OAuth-Scopes": "admin:gpg_key, admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user", "X-Accepted-OAuth-Scopes": "repo", "X-GitHub-Media-Type": "github.v3; param=drax-preview; format=json", "Access-Control-Expose-Headers": "ETag, Link, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval", "Access-Control-Allow-Origin": "*", "Content-Security-Policy": "default-src 'none'", "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload", "X-Content-Type-Options": "nosniff", "X-Frame-Options": "deny", "X-XSS-Protection": "1; mode=block", "X-Runtime-rack": "0.056379", "Content-Encoding": "gzip", "X-GitHub-Request-Id": "C300:18C03:37CDC8:73E27A:5A34627E"}, "status": {"code": 200, "message": "OK"}, "url": "https://api.github.com/repos/github3py/fork_this"}, "recorded_at": "2017-12-16T00:02:07"}, {"request": {"body": {"encoding": "utf-8", "string": "{\"base\": \"master\", \"head\": \"new-branch\"}"}, "headers": {"User-Agent": "github3.py/1.0.0a4", "Accept-Encoding": "gzip, deflate", "Accept": "application/vnd.github.v3.full+json", "Connection": "keep-alive", "Accept-Charset": "utf-8", "Content-Type": "application/json", "Authorization": "token <AUTH_TOKEN>", "Content-Length": "40"}, "method": "POST", "uri": "https://api.github.com/repos/github3py/fork_this/merges"}, "response": {"body": {"encoding": "utf-8", "string": "{\"sha\":\"646fc846229268a14f4510480614f395de5cdcbc\",\"commit\":{\"author\":{\"name\":\"Ian Stapleton Cordasco\",\"email\":\"graffatcolmingov@gmail.com\",\"date\":\"2017-12-16T00:02:07Z\"},\"committer\":{\"name\":\"GitHub\",\"email\":\"noreply@github.com\",\"date\":\"2017-12-16T00:02:07Z\"},\"message\":\"Merge new-branch into master\",\"tree\":{\"sha\":\"7ca028b0ac7934f097f6c2c25400c0a27f3b5706\",\"url\":\"https://api.github.com/repos/github3py/fork_this/git/trees/7ca028b0ac7934f097f6c2c25400c0a27f3b5706\"},\"url\":\"https://api.github.com/repos/github3py/fork_this/git/commits/646fc846229268a14f4510480614f395de5cdcbc\",\"comment_count\":0,\"verification\":{\"verified\":false,\"reason\":\"unsigned\",\"signature\":null,\"payload\":null}},\"url\":\"https://api.github.com/repos/github3py/fork_this/commits/646fc846229268a14f4510480614f395de5cdcbc\",\"html_url\":\"https://github.com/github3py/fork_this/commit/646fc846229268a14f4510480614f395de5cdcbc\",\"comments_url\":\"https://api.github.com/repos/github3py/fork_this/commits/646fc846229268a14f4510480614f395de5cdcbc/comments\",\"author\":{\"login\":\"sigmavirus24\",\"id\":240830,\"avatar_url\":\"https://avatars3.githubusercontent.com/u/240830?v=4\",\"gravatar_id\":\"\",\"url\":\"https://api.github.com/users/sigmavirus24\",\"html_url\":\"https://github.com/sigmavirus24\",\"followers_url\":\"https://api.github.com/users/sigmavirus24/followers\",\"following_url\":\"https://api.github.com/users/sigmavirus24/following{/other_user}\",\"gists_url\":\"https://api.github.com/users/sigmavirus24/gists{/gist_id}\",\"starred_url\":\"https://api.github.com/users/sigmavirus24/starred{/owner}{/repo}\",\"subscriptions_url\":\"https://api.github.com/users/sigmavirus24/subscriptions\",\"organizations_url\":\"https://api.github.com/users/sigmavirus24/orgs\",\"repos_url\":\"https://api.github.com/users/sigmavirus24/repos\",\"events_url\":\"https://api.github.com/users/sigmavirus24/events{/privacy}\",\"received_events_url\":\"https://api.github.com/users/sigmavirus24/received_events\",\"type\":\"User\",\"site_admin\":false},\"committer\":{\"login\":\"web-flow\",\"id\":19864447,\"avatar_url\":\"https://avatars3.githubusercontent.com/u/19864447?v=4\",\"gravatar_id\":\"\",\"url\":\"https://api.github.com/users/web-flow\",\"html_url\":\"https://github.com/web-flow\",\"followers_url\":\"https://api.github.com/users/web-flow/followers\",\"following_url\":\"https://api.github.com/users/web-flow/following{/other_user}\",\"gists_url\":\"https://api.github.com/users/web-flow/gists{/gist_id}\",\"starred_url\":\"https://api.github.com/users/web-flow/starred{/owner}{/repo}\",\"subscriptions_url\":\"https://api.github.com/users/web-flow/subscriptions\",\"organizations_url\":\"https://api.github.com/users/web-flow/orgs\",\"repos_url\":\"https://api.github.com/users/web-flow/repos\",\"events_url\":\"https://api.github.com/users/web-flow/events{/privacy}\",\"received_events_url\":\"https://api.github.com/users/web-flow/received_events\",\"type\":\"User\",\"site_admin\":false},\"parents\":[{\"sha\":\"5145c9682d46d714c31ae0b5fbe30a83039a96e5\",\"url\":\"https://api.github.com/repos/github3py/fork_this/commits/5145c9682d46d714c31ae0b5fbe30a83039a96e5\",\"html_url\":\"https://github.com/github3py/fork_this/commit/5145c9682d46d714c31ae0b5fbe30a83039a96e5\"},{\"sha\":\"e71da495d42970c603371517a1422fbf21a5fc1c\",\"url\":\"https://api.github.com/repos/github3py/fork_this/commits/e71da495d42970c603371517a1422fbf21a5fc1c\",\"html_url\":\"https://github.com/github3py/fork_this/commit/e71da495d42970c603371517a1422fbf21a5fc1c\"}]}"}, "headers": {"Server": "GitHub.com", "Date": "Sat, 16 Dec 2017 00:02:07 GMT", "Content-Type": "application/json; charset=utf-8", "Content-Length": "3354", "Status": "201 Created", "X-RateLimit-Limit": "5000", "X-RateLimit-Remaining": "4998", "X-RateLimit-Reset": "1513386127", "Cache-Control": "private, max-age=60, s-maxage=60", "Vary": "Accept, Authorization, Cookie, X-GitHub-OTP", "ETag": "\"d47648ae7ee29d57ff0f1d982a376812\"", "X-OAuth-Scopes": "admin:gpg_key, admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user", "X-Accepted-OAuth-Scopes": "", "Location": "https://api.github.com/repos/github3py/fork_this/commits/646fc846229268a14f4510480614f395de5cdcbc", "X-GitHub-Media-Type": "github.v3; param=full; format=json", "Access-Control-Expose-Headers": "ETag, Link, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval", "Access-Control-Allow-Origin": "*", "Content-Security-Policy": "default-src 'none'", "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload", "X-Content-Type-Options": "nosniff", "X-Frame-Options": "deny", "X-XSS-Protection": "1; mode=block", "X-Runtime-rack": "0.763738", "X-GitHub-Request-Id": "C300:18C03:37CDD1:73E283:5A34627F"}, "status": {"code": 201, "message": "Created"}, "url": "https://api.github.com/repos/github3py/fork_this/merges"}, "recorded_at": "2017-12-16T00:02:08"}], "recorded_with": "betamax/0.8.0"}

‎tests/integration/test_repos_repo.py‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -838,10 +838,7 @@ def test_license(self):
838838
assert isinstance(license, github3.licenses.License)
839839

840840
def test_mark_notifications(self):
841-
"""
842-
Test the ability to mark all notifications on a repository
843-
as read.
844-
"""
841+
"""Verify we can mark all notifications on a repository as read."""
845842
self.token_login()
846843
cassette_name = self.cassette_name('mark_notifications')
847844
with self.recorder.use_cassette(cassette_name):
@@ -854,8 +851,8 @@ def test_merge(self):
854851
self.token_login()
855852
cassette_name = self.cassette_name('merge')
856853
with self.recorder.use_cassette(cassette_name):
857-
repository = self.gh.repository('github3py', 'github3.py')
858-
commit = repository.merge('base_branch', 'head_branch')
854+
repository = self.gh.repository('github3py', 'fork_this')
855+
commit = repository.merge('master', 'new-branch')
859856
assert isinstance(commit, github3.repos.commit.RepoCommit)
860857

861858
def test_milestone(self):

0 commit comments

Comments
 (0)
0