octokit 1.18.0 → 1.19.0

data/spec/fixtures/repository_notifications.json

@@ -0,0 +1,32 @@
+[
+  {
+    "id": 1,
+    "repository": {
+      "id": 1296269,
+      "owner": {
+        "login": "octocat",
+        "id": 1,
+        "avatar_url": "https://github.com/images/error/octocat_happy.gif",
+        "gravatar_id": "somehexcode",
+        "url": "https://api.github.com/users/octocat"
+      },
+      "name": "Hello-World",
+      "full_name": "octocat/Hello-World",
+      "description": "This your first repo!",
+      "private": false,
+      "fork": false,
+      "url": "https://api.github.com/repos/octocat/Hello-World",
+      "html_url": "https://github.com/octocat/Hello-World"
+    },
+    "subject": {
+      "title": "Greetings",
+      "url": "https://api.github.com/repos/pengwynn/octokit/issues/123",
+      "latest_comment_url": "https://api.github.com/repos/pengwynn/octokit/issues/comments/123"
+    },
+    "reason": "subscribed",
+    "unread": true,
+    "updated_at": "2012-09-25T07:54:41-07:00",
+    "last_read_at": "2012-09-25T07:54:41-07:00",
+    "url": "https://api.github.com/notifications/threads/1"
+  }
+]

data/spec/fixtures/say.txt

@@ -0,0 +1,22 @@
+
+           MMM.           .MMM
+           MMMMMMMMMMMMMMMMMMM
+           MMMMMMMMMMMMMMMMMMM      _____________________________________________
+          MMMMMMMMMMMMMMMMMMMMM    |                                             |
+         MMMMMMMMMMMMMMMMMMMMMMM   | Half measures are as bad as nothing at all. |
+        MMMMMMMMMMMMMMMMMMMMMMMM   |_   _________________________________________|
+        MMMM::- -:::::::- -::MMMM    |/
+         MM~:~   ~:::::~   ~:~MM
+    .. MMMMM::. .:::+:::. .::MMMMM ..
+          .MM::::: ._. :::::MM.
+             MMMM;:::::;MMMM
+      -MM        MMMMMMM
+      ^  M+     MMMMMMMMM
+          MMMMMMM MM MM MM
+               MM MM MM MM
+               MM MM MM MM
+            .~~MM~MM~MM~MM~~.
+         ~~~~MM:~MM~~~MM~:MM~~~~
+        ~~~~~~==~==~~~==~==~~~~~~
+         ~~~~~~==~==~==~==~~~~~~
+             :~==~==~==~==~~

data/spec/fixtures/say_custom.txt

@@ -0,0 +1,22 @@
+
+           MMM.           .MMM
+           MMMMMMMMMMMMMMMMMMM
+           MMMMMMMMMMMMMMMMMMM      ______________________________
+          MMMMMMMMMMMMMMMMMMMMM    |                              |
+         MMMMMMMMMMMMMMMMMMMMMMM   | There is no need to be upset |
+        MMMMMMMMMMMMMMMMMMMMMMMM   |_   __________________________|
+        MMMM::- -:::::::- -::MMMM    |/
+         MM~:~   ~:::::~   ~:~MM
+    .. MMMMM::. .:::+:::. .::MMMMM ..
+          .MM::::: ._. :::::MM.
+             MMMM;:::::;MMMM
+      -MM        MMMMMMM
+      ^  M+     MMMMMMMMM
+          MMMMMMM MM MM MM
+               MM MM MM MM
+               MM MM MM MM
+            .~~MM~MM~MM~MM~~.
+         ~~~~MM:~MM~~~MM~:MM~~~~
+        ~~~~~~==~==~~~==~==~~~~~~
+         ~~~~~~==~==~==~==~~~~~~
+             :~==~==~==~==~~

data/spec/fixtures/subscribers.json

@@ -0,0 +1,9 @@
+[
+  {
+    "url": "https://api.github.com/users/pengwynn",
+    "login": "pengwynn",
+    "avatar_url": "https://secure.gravatar.com/avatar/7e19cd5486b5d6dc1ef90e671ba52ae0?d=https://a248.e.akamai.net/assets.github.com%2Fimages%2Fgravatars%2Fgravatar-user-420.png",
+    "gravatar_id": "7e19cd5486b5d6dc1ef90e671ba52ae0",
+    "id": 865
+  }
+]

data/spec/fixtures/subscription.json

@@ -0,0 +1,8 @@
+{
+  "url": "https://api.github.com/repos/pengwynn/octokit/subscription",
+  "reason": null,
+  "created_at": "2012-10-13T02:21:53Z",
+  "subscribed": true,
+  "repository_url": "https://api.github.com/repos/pengwynn/octokit",
+  "ignored": false
+}

data/spec/fixtures/subscription_update.json

@@ -0,0 +1,8 @@
+{
+  "url": "https://api.github.com/repos/pengwynn/octokit/subscription",
+  "reason": null,
+  "created_at": "2012-10-13T02:21:53Z",
+  "subscribed": false,
+  "repository_url": "https://api.github.com/repos/pengwynn/octokit",
+  "ignored": false
+}

data/spec/fixtures/subscriptions.json

@@ -0,0 +1,39 @@
+[
+  {
+    "watchers": 12,
+    "url": "https://api.github.com/repos/pengwynn/ujs_sort_helper",
+    "svn_url": "https://github.com/pengwynn/ujs_sort_helper",
+    "watchers_count": 12,
+    "owner": {
+      "url": "https://api.github.com/users/pengwynn",
+      "avatar_url": "https://secure.gravatar.com/avatar/7e19cd5486b5d6dc1ef90e671ba52ae0?d=https://a248.e.akamai.net/assets.github.com%2Fimages%2Fgravatars%2Fgravatar-user-420.png",
+      "gravatar_id": "7e19cd5486b5d6dc1ef90e671ba52ae0",
+      "login": "pengwynn",
+      "id": 865
+    },
+    "language": "JavaScript",
+    "has_wiki": true,
+    "description": "Unobtrusive sort helper for Rails",
+    "clone_url": "https://github.com/pengwynn/ujs_sort_helper.git",
+    "open_issues_count": 1,
+    "updated_at": "2012-09-10T04:46:49Z",
+    "html_url": "https://github.com/pengwynn/ujs_sort_helper",
+    "open_issues": 1,
+    "ssh_url": "git@github.com:pengwynn/ujs_sort_helper.git",
+    "size": 140,
+    "fork": false,
+    "pushed_at": "2011-10-14T13:14:06Z",
+    "full_name": "pengwynn/ujs_sort_helper",
+    "name": "ujs_sort_helper",
+    "forks": 8,
+    "has_issues": true,
+    "has_downloads": true,
+    "forks_count": 8,
+    "mirror_url": null,
+    "private": false,
+    "id": 11560,
+    "created_at": "2008-04-21T15:55:02Z",
+    "git_url": "git://github.com/pengwynn/ujs_sort_helper.git",
+    "homepage": ""
+  }
+]

data/spec/fixtures/thread_subscription.json

@@ -0,0 +1,8 @@
+{
+  "subscribed": true,
+  "ignored": false,
+  "reason": null,
+  "created_at": "2012-10-06T21:34:12Z",
+  "url": "https://api.github.com/notifications/threads/1/subscription",
+  "thread_url": "https://api.github.com/notifications/threads/1"
+}

data/spec/fixtures/thread_subscription_update.json

@@ -0,0 +1,8 @@
+{
+  "subscribed": true,
+  "ignored": false,
+  "reason": null,
+  "created_at": "2012-10-06T21:34:12Z",
+  "url": "https://api.github.com/notifications/threads/1/subscription",
+  "thread_url": "https://api.github.com/notifications/threads/1"
+}

data/spec/fixtures/validation_failed.json

@@ -0,0 +1,11 @@
+{
+  "errors": [
+    {
+      "field": "name",
+      "message": "name is too short (minimum is 1 characters)",
+      "code": "custom",
+      "resource": "Repository"
+    }
+  ],
+  "message": "Validation Failed"
+}

data/spec/helper.rb

@@ -43,6 +43,10 @@ def stub_get(url)
   stub_request(:get, github_url(url))
 end
 
+def stub_head(url)
+  stub_request(:head, github_url(url))
+end
+
 def stub_patch(url)
   stub_request(:patch, github_url(url))
 end
@@ -63,13 +67,20 @@ def fixture(file)
   File.new(fixture_path + '/' + file)
 end
 
+def json_response(file)
+  {
+    :body => fixture(file),
+    :headers => {
+      :content_type => 'application/json; charset=utf-8'
+    }
+  }
+end
+
 def github_url(url)
   if url =~ /^http/
     url
   elsif @client && @client.authenticated?
     "https://#{@client.login}:#{@client.password}@api.github.com#{url}"
-  elsif @client && @client.oauthed?
-    "https://api.github.com#{url}?access_token=#{@client.oauth_token}"
   else
     "https://api.github.com#{url}"
   end

data/spec/octokit/client/authorizations_spec.rb

@@ -10,14 +10,14 @@ describe Octokit::Client::Authorizations do
 
   it "lists existing authorizations" do
     stub_get("/authorizations").
-      to_return(:body => fixture("v3/authorizations.json"))
+      to_return(json_response("authorizations.json"))
     authorizations = @client.authorizations
     expect(authorizations.first.app.name).to eq("Calendar About Nothing" )
   end
 
   it "returns a single authorization" do
     stub_get("/authorizations/999999").
-      to_return(:body => fixture("v3/authorization.json"))
+      to_return(json_response("authorization.json"))
     authorization = @client.authorization(999999)
     expect(authorization.app.name).to eq("Travis" )
   end
@@ -26,7 +26,7 @@ describe Octokit::Client::Authorizations do
     stub_post('/authorizations').
       with(:body => {"scopes" => ""},
            :headers => {'Content-Type'=>'application/json'}).
-      to_return(:body => fixture("v3/authorization.json"))
+      to_return(json_response("authorization.json"))
     authorization = @client.create_authorization
     expect(authorization.app.name).to eq("Travis" )
   end
@@ -35,7 +35,7 @@ describe Octokit::Client::Authorizations do
     stub_post('/authorizations').
       with(:body => {"scopes" => ["public_repo"],"note" => "admin script", "note_url" => "https://github.com/pengwynn/octokit"},
            :headers => {'Content-Type'=>'application/json'}).
-      to_return(:body => fixture("v3/authorization.json"))
+      to_return(json_response("authorization.json"))
     authorization = @client.create_authorization({:scopes => ["public_repo"], :note => "admin script", :note_url => "https://github.com/pengwynn/octokit"})
     expect(authorization.scopes).to include("public_repo")
   end
@@ -44,7 +44,7 @@ describe Octokit::Client::Authorizations do
     stub_patch('/authorizations/999999').
       with(:body => {"scopes"=>"", "add_scopes" => ["public_repo", "gist"]},
            :headers => {'Content-Type'=>'application/json'}).
-      to_return(:body => fixture("v3/authorization.json"))
+      to_return(json_response("authorization.json"))
     authorization = @client.update_authorization(999999, {:add_scopes => ['public_repo', 'gist']})
     expect(authorization.scopes).to include("public_repo")
   end
@@ -52,8 +52,45 @@ describe Octokit::Client::Authorizations do
   it "deletes an existing authorization" do
     stub_delete('/authorizations/999999').
       to_return(:status => 204)
-    authorization = @client.delete_authorization(999999)
-    expect(authorization.status).to eq(204)
+    result = @client.delete_authorization(999999)
+    expect(result).to be_true
+  end
+
+  context "when working with tokens" do
+    before(:each) do
+      Octokit.reset
+    end
+
+    it "checks the scopes on a token" do
+      stub_get("https://api.github.com/user").
+        to_return \
+          :status => 200,
+          :body => fixture('user.json'),
+          :headers => {
+            :content_type => 'application/json; charset=utf-8',
+            :x_oauth_scopes => 'user, gist'
+          }
+
+      client = Octokit::Client.new :oauth_token => 'abcdabcdabcdabcdabcdabcdabcdabcdabcd'
+      scopes = Octokit.scopes
+      expect(scopes).to eq(['gist', 'user'])
+    end
+
+    it "checks the scopes on a one-off token" do
+      stub_get("https://api.github.com/user").
+        to_return \
+          :status => 200,
+          :body => fixture('user.json'),
+          :headers => {
+            :content_type => 'application/json; charset=utf-8',
+            :x_oauth_scopes => 'user, gist, repo'
+          }
+
+      client = Octokit::Client.new
+      scopes = Octokit.scopes('abcdabcdabcdabcdabcdabcdabcdabcdabcd')
+      expect(scopes).to eq(['gist', 'repo', 'user'])
+    end
+
   end
 
 end

data/spec/octokit/client/commits_spec.rb

@@ -1,6 +1,10 @@
 # -*- encoding: utf-8 -*-
 require 'helper'
 
+# need this to filter the data
+require 'json'
+require 'date'
+
 describe Octokit::Client::Commits do
 
   before do
@@ -11,18 +15,139 @@ describe Octokit::Client::Commits do
 
     it "returns all commits" do
       stub_get("/repos/sferik/rails_admin/commits?per_page=35&sha=master").
-        to_return(:body => fixture("v3/commits.json"))
+        to_return(json_response("commits.json"))
       commits = @client.commits("sferik/rails_admin")
       expect(commits.first.author.login).to eq("caboteria")
     end
 
   end
 
+  describe ".commits_on" do
+
+    it "returns all commits on the specified date" do
+      stub_http_request(:get, "https://api.github.com/repos/sferik/rails_admin/commits").
+        with(:query=>{"per_page" => 35, "sha" => "master",
+          "since" => "2011-01-20T00:00:00+00:00", "until" => "2011-01-21T00:00:00+00:00"}).
+        to_return json_response('commits.json')
+      commits = @client.commits_on("sferik/rails_admin", "2011-01-20")
+      expect(commits).to be_an(Array)
+    end
+
+    it "returns an empty array if there are no commits on the specified date" do
+      stub_http_request(:get, "https://api.github.com/repos/sferik/rails_admin/commits").
+        with(:query=>{"per_page" => 35, "sha" => "master",
+          "since" => "2011-01-15T00:00:00+00:00",
+          "until" => "2011-01-16T00:00:00+00:00"}).
+        to_return json_response('commits.json')
+      commits = @client.commits_on("sferik/rails_admin", "2011-01-15")
+      expect(commits).to be_an(Array)
+    end
+
+    it "errors if the date is invalid" do
+      expect {@client.commits_on("sferik/rails_admin", "A pear")}.to raise_exception(ArgumentError, "A pear is not a valid date")
+    end
+
+  end
+
+  describe ".commits_since" do
+
+    it "returns all commits after the specified date" do
+      start_date = Date.parse("2011-01-16T00:00:00+00:00")
+      stub_http_request(:get, "https://api.github.com/repos/sferik/rails_admin/commits").
+        with(:query=>{"per_page" => 35, "sha" => "master",
+          "since" => "2011-01-16T00:00:00+00:00"}).
+        to_return json_response('commits.json')
+      commits = @client.commits_since("sferik/rails_admin", "2011-01-16")
+      expect(commits).to be_an(Array)
+    end
+
+    it "returns an empty array if there are no commits after the specified date" do
+      start_date = Date.parse("2011-01-22T00:00:00+00:00")
+      stub_http_request(:get, "https://api.github.com/repos/sferik/rails_admin/commits").
+        with(:query=>{"per_page" => 35, "sha" => "master",
+          "since" => "2011-01-22T00:00:00+00:00"}).
+        to_return json_response('commits.json')
+      commits = @client.commits_since("sferik/rails_admin", "2011-01-22")
+      expect(commits).to be_an(Array)
+    end
+
+    it "errors if the date is invalid" do
+      expect {@client.commits_since("sferik/rails_admin", "A pear")}.to raise_exception(ArgumentError, "A pear is not a valid date")
+    end
+
+  end
+
+  describe ".commits_before" do
+
+    it "returns all commits before the specified date" do
+      end_date = Date.parse("2011-01-17T00:00:00+00:00")
+      stub_http_request(:get, "https://api.github.com/repos/sferik/rails_admin/commits").
+        with(:query=>{"per_page" => 35, "sha" => "master",
+          "until" => "2011-01-17T00:00:00+00:00"}).
+          to_return json_response('commits.json')
+      commits = @client.commits_before("sferik/rails_admin", "2011-01-17")
+      expect(commits).to be_an(Array)
+    end
+
+    it "returns an empty array if there are no commits before the specified date" do
+      end_date = DateTime.parse("2011-01-16T00:00:00%2000:00")
+      stub_http_request(:get, "https://api.github.com/repos/sferik/rails_admin/commits").
+        with(:query=>{"per_page" => 35, "sha" => "master",
+          "until" => "2011-01-16T00:00:00+00:00"}).
+          to_return json_response('commits.json')
+      commits = @client.commits_before("sferik/rails_admin", "2011-01-16")
+      expect(commits).to be_an(Array)
+    end
+
+    it "errors if the date is invalid" do
+      expect {@client.commits_before("sferik/rails_admin", "A pear")}.to raise_exception(ArgumentError, "A pear is not a valid date")
+    end
+
+  end
+
+  describe ".commits_between" do
+
+    it "returns all commits between the specified dates" do
+      start_date = DateTime.parse("2011-01-17T00:00:00+00:00")
+      end_date = DateTime.parse("2011-01-20T00:00:00+00:00")
+      stub_http_request(:get, "https://api.github.com/repos/sferik/rails_admin/commits").
+        with(:query=>{"per_page" => 35, "sha" => "master",
+          "since" => "2011-01-17T00:00:00+00:00", "until" => "2011-01-20T00:00:00+00:00"}).
+          to_return json_response('commits.json')
+      commits = @client.commits_between("sferik/rails_admin", "2011-01-17", "2011-01-20")
+      expect(commits).to be_an(Array)
+    end
+
+    it "returns an empty array if there are no commits between the specified dates" do
+      start_date = Date.parse("2011-01-15T00:00:00+00:00")
+      end_date = Date.parse("2011-01-16T00:00:00+00:00")
+      stub_http_request(:get, "https://api.github.com/repos/sferik/rails_admin/commits").
+        with(:query=>{"per_page" => 35, "sha" => "master",
+          "since" => "2011-01-15T00:00:00+00:00", "until" => "2011-01-16T00:00:00+00:00"}).
+          to_return json_response('commits.json')
+      commits = @client.commits_between("sferik/rails_admin", "2011-01-15", "2011-01-16")
+      expect(commits).to be_an(Array)
+    end
+
+    it "errors if the end_date preceeds the start_date" do
+      expect {@client.commits_between("sferik/rails_admin", "2011-01-16", "2011-01-15")}.to raise_exception(ArgumentError, "Start date 2011-01-16 does not precede 2011-01-15")
+    end
+
+    it "errors if the start date is invalid" do
+      expect {@client.commits_between("sferik/rails_admin", "A pear", "2011-01-15")}.to raise_exception(ArgumentError, "A pear is not a valid date")
+    end
+
+    it "errors if the end date is invalid" do
+      expect {@client.commits_between("sferik/rails_admin", "2011-01-16", "A walrus")}.to raise_exception(ArgumentError, "A walrus is not a valid date")
+    end
+
+  end
+
   describe ".commit" do
 
     it "returns a commit" do
       stub_get("/repos/sferik/rails_admin/commits/3cdfabd973bc3caac209cba903cfdb3bf6636bcd").
-        to_return(:body => fixture("v3/commit.json"))
+        to_return(json_response("commit.json"))
       commit = @client.commit("sferik/rails_admin", "3cdfabd973bc3caac209cba903cfdb3bf6636bcd")
       expect(commit.author.login).to eq("caboteria")
     end
@@ -35,7 +160,7 @@ describe Octokit::Client::Commits do
       stub_post("/repos/octocat/Hello-World/git/commits").
         with(:body => { :message => "My commit message", :tree => "827efc6d56897b048c772eb4087f854f46256132", :parents => ["7d1b31e74ee336d15cbd21741bc88a537ed063a0"] },
              :headers => { "Content-Type" => "application/json" }).
-        to_return(:body => fixture("v3/commit_create.json"))
+        to_return(json_response("commit_create.json"))
       commit = @client.create_commit("octocat/Hello-World", "My commit message", "827efc6d56897b048c772eb4087f854f46256132", "7d1b31e74ee336d15cbd21741bc88a537ed063a0")
       expect(commit.sha).to eq("7638417db6d59f3c431d3e1f261cc637155684cd")
       expect(commit.message).to eq("My commit message")
@@ -49,7 +174,7 @@ describe Octokit::Client::Commits do
 
     it "returns a list of all commit comments" do
       stub_get("/repos/sferik/rails_admin/comments").
-        to_return(:body => fixture("v3/list_commit_comments.json"))
+        to_return(json_response("list_commit_comments.json"))
       commit_comments = @client.list_commit_comments("sferik/rails_admin")
       expect(commit_comments.first.user.login).to eq("sferik")
     end
@@ -60,7 +185,7 @@ describe Octokit::Client::Commits do
 
     it "returns a list of comments for a specific commit" do
       stub_get("/repos/sferik/rails_admin/commits/629e9fd9d4df25528e84d31afdc8ebeb0f56fbb3/comments").
-        to_return(:body => fixture("v3/commit_comments.json"))
+        to_return(json_response("commit_comments.json"))
       commit_comments = @client.commit_comments("sferik/rails_admin", "629e9fd9d4df25528e84d31afdc8ebeb0f56fbb3")
       expect(commit_comments.first.user.login).to eq("bbenezech")
     end
@@ -71,7 +196,7 @@ describe Octokit::Client::Commits do
 
     it "returns a single commit comment" do
       stub_get("/repos/sferik/rails_admin/comments/861907").
-        to_return(:body => fixture("v3/commit_comment.json"))
+        to_return(json_response("commit_comment.json"))
       commit = @client.commit_comment("sferik/rails_admin", "861907")
       expect(commit.user.login).to eq("bbenezech")
     end
@@ -84,7 +209,7 @@ describe Octokit::Client::Commits do
       stub_post("/repos/sferik/rails_admin/commits/629e9fd9d4df25528e84d31afdc8ebeb0f56fbb3/comments").
         with(:body => { :body => "Hey Eric,\r\n\r\nI think it's a terrible idea: for a number of reasons (dissections, etc.), test suite should stay deterministic IMO.\r\n", :commit_id => "629e9fd9d4df25528e84d31afdc8ebeb0f56fbb3", :line => 1, :path => ".rspec", :position => 4 },
              :headers => { "Content-Type" => "application/json" }).
-        to_return(:body => fixture("v3/commit_comment_create.json"))
+        to_return(json_response("commit_comment_create.json"))
       commit_comment = @client.create_commit_comment("sferik/rails_admin", "629e9fd9d4df25528e84d31afdc8ebeb0f56fbb3", "Hey Eric,\r\n\r\nI think it's a terrible idea: for a number of reasons (dissections, etc.), test suite should stay deterministic IMO.\r\n", ".rspec", 1, 4)
       expect(commit_comment.body).to eq("Hey Eric,\r\n\r\nI think it's a terrible idea: for a number of reasons (dissections, etc.), test suite should stay deterministic IMO.\r\n")
       expect(commit_comment.commit_id).to eq("629e9fd9d4df25528e84d31afdc8ebeb0f56fbb3")
@@ -101,7 +226,7 @@ describe Octokit::Client::Commits do
       stub_patch("/repos/sferik/rails_admin/comments/860296").
         with(:body => { :body => "Hey Eric,\r\n\r\nI think it's a terrible idea. The test suite should stay deterministic IMO.\r\n" },
           :headers => { "Content-Type" => "application/json" }).
-        to_return(:body => fixture("v3/commit_comment_update.json"))
+        to_return(json_response("commit_comment_update.json"))
         commit_comment = @client.update_commit_comment("sferik/rails_admin", "860296", "Hey Eric,\r\n\r\nI think it's a terrible idea. The test suite should stay deterministic IMO.\r\n")
         expect(commit_comment.body).to eq("Hey Eric,\r\n\r\nI think it's a terrible idea. The test suite should stay deterministic IMO.\r\n")
     end
@@ -114,7 +239,7 @@ describe Octokit::Client::Commits do
       stub_delete("/repos/sferik/rails_admin/comments/860296").
         to_return(:status => 204, :body => "")
       commit_comment = @client.delete_commit_comment("sferik/rails_admin", "860296")
-      expect(commit_comment).to be_false
+      expect(commit_comment).to be_true
     end
 
   end
@@ -123,7 +248,7 @@ describe Octokit::Client::Commits do
 
     it "returns a comparison" do
       stub_get("/repos/gvaughn/octokit/compare/0e0d7ae299514da692eb1cab741562c253d44188...b7b37f75a80b8e84061cd45b246232ad958158f5").
-        to_return(:body => fixture("v3/compare.json"))
+        to_return(json_response("compare.json"))
       comparison = @client.compare("gvaughn/octokit", '0e0d7ae299514da692eb1cab741562c253d44188', 'b7b37f75a80b8e84061cd45b246232ad958158f5')
       expect(comparison.base_commit.sha).to eq('0e0d7ae299514da692eb1cab741562c253d44188')
       expect(comparison.merge_base_commit.sha).to eq('b7b37f75a80b8e84061cd45b246232ad958158f5')
@@ -134,7 +259,7 @@ describe Octokit::Client::Commits do
 
     before do
       stub_post("/repos/pengwynn/api-sandbox/merges").
-        to_return(:body => fixture("v3/merge.json"))
+        to_return(json_response("merge.json"))
     end
 
     it "merges a branch into another" do