octokit 1.18.0 → 1.19.0

data/spec/octokit/client/pub_sub_hubbub_spec.rb

@@ -6,7 +6,7 @@ describe Octokit::Client::PubSubHubbub do
 
   describe ".subscribe" do
     it "subscribes to pull events" do
-      stub_post("/hub?access_token=myfaketoken").
+      stub_post("/hub").
         with({
           :"hub.callback" => 'github://Travis?token=travistoken',
           :"hub.mode" => 'subscribe',
@@ -18,7 +18,7 @@ describe Octokit::Client::PubSubHubbub do
     end
 
     it "raises an error if the topic is not recognized" do
-      stub_post("/hub?access_token=myfaketoken").
+      stub_post("/hub").
         with({
           :"hub.callback" => 'github://Travis?token=travistoken',
           :"hub.mode" => 'subscribe',
@@ -34,7 +34,7 @@ describe Octokit::Client::PubSubHubbub do
 
   describe ".unsubscribe" do
     it "unsubscribes from pull events" do
-      stub_post("/hub?access_token=myfaketoken").
+      stub_post("/hub").
       with({
         :"hub.callback" => 'github://Travis?token=travistoken',
         :"hub.mode" => 'unsubscribe',

data/spec/octokit/client/pulls_spec.rb

@@ -12,7 +12,7 @@ describe Octokit::Client::Pulls do
     it "creates a pull request" do
       stub_post("https://api.github.com/repos/pengwynn/octokit/pulls").
         with(:pull => {:base => "master", :head => "pengwynn:master", :title => "Title", :body => "Body"}).
-        to_return(:body => fixture("v3/pull_created.json"))
+        to_return(json_response("pull_created.json"))
       pull = @client.create_pull_request("pengwynn/octokit", "master", "pengwynn:master", "Title", "Body")
       expect(pull.number).to eq(15)
       expect(pull.title).to eq("Pull this awesome v3 stuff")
@@ -25,7 +25,7 @@ describe Octokit::Client::Pulls do
     it "updates a pull request" do
       stub_post("https://api.github.com/repos/pengwynn/octokit/pulls/67").
         with(:pull => { :title => "New title", :body => "Updated body", :state => "closed"}).
-          to_return(:body => fixture('v3/pull_update.json'))
+          to_return(json_response('pull_update.json'))
       pull = @client.update_pull_request('pengwynn/octokit', 67, 'New title', 'Updated body', 'closed')
       expect(pull.title).to eq('New title')
       expect(pull.body).to eq('Updated body')
@@ -39,7 +39,7 @@ describe Octokit::Client::Pulls do
     it "creates a pull request and attach it to an existing issue" do
       stub_post("https://api.github.com/repos/pengwynn/octokit/pulls").
         with(:pull => {:base => "master", :head => "pengwynn:octokit", :issue => "15"}).
-        to_return(:body => fixture("v3/pull_created.json"))
+        to_return(json_response("pull_created.json"))
       pull = @client.create_pull_request_for_issue("pengwynn/octokit", "master", "pengwynn:octokit", "15")
       expect(pull.number).to eq(15)
     end
@@ -50,7 +50,7 @@ describe Octokit::Client::Pulls do
 
     it "returns all pull requests" do
       stub_get("https://api.github.com/repos/pengwynn/octokit/pulls?state=open").
-        to_return(:body => fixture("v3/pull_requests.json"))
+        to_return(json_response("pull_requests.json"))
       pulls = @client.pulls("pengwynn/octokit")
       expect(pulls.first.number).to eq(928)
     end
@@ -61,7 +61,7 @@ describe Octokit::Client::Pulls do
 
     it "returns a pull request" do
       stub_get("https://api.github.com/repos/pengwynn/octokit/pulls/67").
-        to_return(:body => fixture("v3/pull_request.json"))
+        to_return(json_response("pull_request.json"))
       pull = @client.pull("pengwynn/octokit", 67)
       expect(pull.number).to eq(67)
     end
@@ -72,7 +72,7 @@ describe Octokit::Client::Pulls do
 
     it "returns the commits for a pull request" do
       stub_get("https://api.github.com/repos/pengwynn/octokit/pulls/67/commits").
-        to_return(:body => fixture("v3/pull_request_commits.json"))
+        to_return(json_response("pull_request_commits.json"))
       commits = @client.pull_commits("pengwynn/octokit", 67)
       expect(commits.first["sha"]).to eq("2097821c7c5aa4dc02a2cc54d5ca51968b373f95")
     end
@@ -83,18 +83,89 @@ describe Octokit::Client::Pulls do
 
     it "returns the comments for a pull request" do
       stub_get("https://api.github.com/repos/pengwynn/octokit/pulls/67/comments").
-        to_return(:body => fixture("v3/pull_request_comments.json"))
+        to_return(json_response("pull_request_comments.json"))
       commits = @client.pull_comments("pengwynn/octokit", 67)
       expect(commits.first["id"]).to eq(401530)
     end
 
   end
 
+  describe ".pull_request_comment" do
+
+    it "returns a comment on a pull request" do
+      stub_get("https://api.github.com/repos/pengwynn/octokit/pulls/comments/1903950").
+        to_return(json_response("pull_request_comment.json"))
+      comment = @client.pull_request_comment("pengwynn/octokit", 1903950)
+      expect(comment.id).to eq(1903950)
+      expect(comment.body).to include("Tests FTW.")
+    end
+
+  end
+
+  describe ".create_pull_request_comment" do
+
+    it "creates a new comment on a pull request" do
+      comment_content = JSON.parse(fixture("pull_request_comment_create.json").read)
+      new_comment = {
+        :body => comment_content['body'],
+        :commit_id => comment_content['commit_id'],
+        :path => comment_content['path'],
+        :position => comment_content['position']
+      }
+      stub_post("https://api.github.com/repos/pengwynn/octokit/pulls/163/comments").
+        with(:body => new_comment).
+          to_return(json_response("pull_request_comment_create.json"))
+      comment = @client.create_pull_request_comment("pengwynn/octokit", 163, new_comment[:body], new_comment[:commit_id], new_comment[:path], new_comment[:position])
+      expect(comment).to eq(comment_content)
+    end
+
+  end
+
+  describe ".create_pull_request_comment_reply" do
+
+    it "creates a new reply to a pull request comment" do
+      new_comment = {
+        :body => "done.",
+        :in_reply_to => 1903950
+      }
+      stub_post("https://api.github.com/repos/pengwynn/octokit/pulls/163/comments").
+        with(:body => new_comment).
+          to_return(json_response("pull_request_comment_reply.json"))
+      reply = @client.create_pull_request_comment_reply("pengwynn/octokit", 163, new_comment[:body], new_comment[:in_reply_to])
+      expect(reply.id).to eq(1907270)
+      expect(reply.body).to eq(new_comment[:body])
+    end
+
+  end
+
+  describe ".update_pull_request_comment" do
+
+    it "updates a pull request comment" do
+      stub_patch("https://api.github.com/repos/pengwynn/octokit/pulls/comments/1907270").
+        with(:body => { :body => ":shipit:"}).
+          to_return(json_response("pull_request_comment_update.json"))
+      comment = @client.update_pull_request_comment("pengwynn/octokit", 1907270, ":shipit:")
+      expect(comment.body).to eq(":shipit:")
+    end
+
+  end
+
+  describe ".delete_pull_request_comment" do
+
+    it "deletes a pull request comment" do
+      stub_delete("https://api.github.com/repos/pengwynn/octokit/pulls/comments/1907270").
+        to_return(:status => 204)
+      result = @client.delete_pull_request_comment("pengwynn/octokit", 1907270)
+      expect(result).to be_true
+    end
+
+  end
+
   describe ".merge_pull_request" do
 
     it "merges the pull request" do
       stub_put("https://api.github.com/repos/pengwynn/octokit/pulls/67/merge").
-        to_return(:body => fixture("v3/pull_request_merged.json"))
+        to_return(json_response("pull_request_merged.json"))
       response = @client.merge_pull_request("pengwynn/octokit", 67)
       expect(response["sha"]).to eq("2097821c7c5aa4dc02a2cc54d5ca51968b373f95")
     end
@@ -105,7 +176,7 @@ describe Octokit::Client::Pulls do
 
     it "lists files for a pull request" do
       stub_get("https://api.github.com/repos/pengwynn/octokit/pulls/142/files").
-        to_return(:body => fixture("v3/pull_request_files.json"))
+        to_return(json_response("pull_request_files.json"))
 
       files = @client.pull_request_files("pengwynn/octokit", 142)
       file = files.first
@@ -118,7 +189,7 @@ describe Octokit::Client::Pulls do
   describe ".pull_merged?" do
 
     it "returns whether the pull request has been merged" do
-      stub_get("https://api.github.com/repos/pengwynn/octokit/pulls/67/merged").
+      stub_get("https://api.github.com/repos/pengwynn/octokit/pulls/67/merge").
         to_return(:status => 204)
       merged = @client.pull_merged?("pengwynn/octokit", 67)
       expect(merged).to be_true

data/spec/octokit/client/refs_spec.rb

@@ -11,14 +11,14 @@ describe Octokit::Client::Refs do
 
     it "returns all refs" do
       stub_get("/repos/sferik/rails_admin/git/refs/").
-        to_return(:body => fixture("v3/refs.json"))
+        to_return(json_response("refs.json"))
       refs = @client.refs("sferik/rails_admin")
       expect(refs.first.ref).to eq("refs/heads/actions")
     end
 
     it "returns all tag refs" do
       stub_get("/repos/sferik/rails_admin/git/refs/tags").
-        to_return(:body => fixture("v3/refs_tags.json"))
+        to_return(json_response("refs_tags.json"))
       refs = @client.refs("sferik/rails_admin","tags")
       expect(refs.first.ref).to eq("refs/tags/v0.0.1")
     end
@@ -29,7 +29,7 @@ describe Octokit::Client::Refs do
 
     it "returns the tags/v0.0.3 ref" do
       stub_get("/repos/sferik/rails_admin/git/refs/tags/v0.0.3").
-        to_return(:body => fixture("v3/ref.json"))
+        to_return(json_response("ref.json"))
       ref = @client.ref("sferik/rails_admin","tags/v0.0.3")
       expect(ref.object.type).to eq("tag")
       expect(ref.ref).to eq("refs/tags/v0.0.3")
@@ -44,7 +44,7 @@ describe Octokit::Client::Refs do
       stub_post("/repos/octocat/Hello-World/git/refs").
         with(:body => { "ref" => "refs/heads/master", "sha" => "827efc6d56897b048c772eb4087f854f46256132" },
              :headers => {'Content-Type'=>'application/json'}).
-        to_return(:body => fixture("v3/ref_create.json"))
+        to_return(json_response("ref_create.json"))
       ref = @client.create_ref("octocat/Hello-World","heads/master", "827efc6d56897b048c772eb4087f854f46256132")
       expect(ref.first.ref).to eq("refs/heads/master")
     end
@@ -57,7 +57,7 @@ describe Octokit::Client::Refs do
       stub_patch("/repos/octocat/Hello-World/git/refs/heads/sc/featureA").
         with(:body => { "sha" => "aa218f56b14c9653891f9e74264a383fa43fefbd", "force" => true },
              :headers => {'Content-Type'=>'application/json'}).
-        to_return(:body => fixture("v3/ref_update.json"))
+        to_return(json_response("ref_update.json"))
       refs = @client.update_ref("octocat/Hello-World","heads/sc/featureA", "aa218f56b14c9653891f9e74264a383fa43fefbd", true)
       expect(refs.first.ref).to eq("refs/heads/sc/featureA")
       expect(refs.first.object.sha).to eq("aa218f56b14c9653891f9e74264a383fa43fefbd")
@@ -69,8 +69,8 @@ describe Octokit::Client::Refs do
     it "deletes an existing ref" do
       stub_delete("/repos/octocat/Hello-World/git/refs/heads/feature-a").
         to_return(:status => 204)
-      ref = @client.delete_ref("octocat/Hello-World", "heads/feature-a")
-      expect(ref.status).to eq(204)
+      result = @client.delete_ref("octocat/Hello-World", "heads/feature-a")
+      expect(result).to be_true
     end
 
   end

data/spec/octokit/client/repositories_spec.rb

@@ -11,7 +11,7 @@ describe Octokit::Client::Repositories do
 
     it "returns matching repositories" do
       stub_get("https://api.github.com/legacy/repos/search/One40Proof").
-        to_return(:body => fixture("legacy/repositories.json"))
+        to_return(json_response("legacy/repositories.json"))
       repositories = @client.search_repositories("One40Proof")
       expect(repositories.first.name).to eq("One40Proof")
     end
@@ -22,7 +22,7 @@ describe Octokit::Client::Repositories do
 
     it "returns the matching repository" do
       stub_get("/repos/sferik/rails_admin").
-        to_return(:body => fixture("v3/repository.json"))
+        to_return(json_response("repository.json"))
       repository = @client.repository("sferik/rails_admin")
       expect(repository.name).to eq("rails_admin")
     end
@@ -35,7 +35,7 @@ describe Octokit::Client::Repositories do
       description = "RailsAdmin is a Rails 3 engine that provides an easy-to-use interface for managing your data"
       stub_patch("/repos/sferik/rails_admin").
         with(:body => {:description => description}).
-        to_return(:body => fixture("v3/repository.json"))
+        to_return(json_response("repository.json"))
       repository = @client.edit_repository("sferik/rails_admin", :description => description)
       expect(repository.description).to eq(description)
     end
@@ -48,7 +48,7 @@ describe Octokit::Client::Repositories do
 
       it "returns user's repositories" do
         stub_get("/users/sferik/repos").
-          to_return(:body => fixture("v3/repositories.json"))
+          to_return(json_response("repositories.json"))
         repositories = @client.repositories("sferik")
         expect(repositories.first.name).to eq("merb-admin")
       end
@@ -59,7 +59,7 @@ describe Octokit::Client::Repositories do
 
       it "returns authenticated user's repositories" do
         stub_get("/user/repos").
-          to_return(:body => fixture("v3/repositories.json"))
+          to_return(json_response("repositories.json"))
         repositories = @client.repositories
         expect(repositories.first.name).to eq("merb-admin")
       end
@@ -112,7 +112,7 @@ describe Octokit::Client::Repositories do
 
     it "forks a repository" do
       stub_post("/repos/sferik/rails_admin/forks").
-        to_return(:body => fixture("v3/repository.json"))
+        to_return(json_response("repository.json"))
       repository = @client.fork("sferik/rails_admin")
       expect(repository.name).to eq("rails_admin")
     end
@@ -124,7 +124,7 @@ describe Octokit::Client::Repositories do
     it "creates a repository" do
       stub_post("/user/repos").
         with(:name => "rails_admin").
-        to_return(:body => fixture("v3/repository.json"))
+        to_return(json_response("repository.json"))
       repository = @client.create_repository("rails_admin")
       expect(repository.name).to eq("rails_admin")
     end
@@ -132,7 +132,7 @@ describe Octokit::Client::Repositories do
     it "creates a repository for an organization" do
       stub_post("/orgs/comorichwebgroup/repos").
         with(:name => "demo").
-        to_return(:body => fixture("v3/organization-repository.json"))
+        to_return(json_response("organization-repository.json"))
       repository = @client.create_repository("demo", {:organization => 'comorichwebgroup'})
       expect(repository.name).to eq("demo")
       expect(repository.organization.login).to eq("CoMoRichWebGroup")
@@ -156,7 +156,7 @@ describe Octokit::Client::Repositories do
     it "sets a repository private" do
       stub_patch("/repos/sferik/rails_admin").
         with({ :name => "rails_admin", :private => false }).
-        to_return(:body => fixture("v3/repository.json"))
+        to_return(json_response("repository.json"))
       repository = @client.set_private("sferik/rails_admin")
       expect(repository.name).to eq("rails_admin")
     end
@@ -168,7 +168,7 @@ describe Octokit::Client::Repositories do
     it "sets a repository public" do
       stub_patch("/repos/sferik/rails_admin").
         with({ :name => "rails_admin", :private => true }).
-        to_return(:body => fixture("v3/repository.json"))
+        to_return(json_response("repository.json"))
       repository = @client.set_public("sferik/rails_admin")
       expect(repository.name).to eq("rails_admin")
       expect(repository.private).to eq(false)
@@ -180,7 +180,7 @@ describe Octokit::Client::Repositories do
 
     it "returns a repository's deploy keys" do
       stub_get("/repos/sferik/rails_admin/keys").
-        to_return(:body => fixture("v3/public_keys.json"))
+        to_return(json_response("public_keys.json"))
       public_keys = @client.deploy_keys("sferik/rails_admin")
       expect(public_keys.first.id).to eq(103205)
     end
@@ -192,7 +192,7 @@ describe Octokit::Client::Repositories do
     it "adds a repository deploy keys" do
       stub_post("/repos/sferik/rails_admin/keys").
         with(:body => { :title => "Moss", :key => "ssh-dss AAAAB3NzaC1kc3MAAACBAJz7HanBa18ad1YsdFzHO5Wy1/WgXd4BV+czbKq7q23jungbfjN3eo2a0SVdxux8GG+RZ9ia90VD/X+PE4s3LV60oXZ7PDAuyPO1CTF0TaDoKf9mPaHcPa6agMJVocMsgBgwviWT1Q9VgN1SccDsYVDtxkIAwuw25YeHZlG6myx1AAAAFQCgW+OvXWUdUJPBGkRJ8ML7uf0VHQAAAIAlP5G96tTss0SKYVSCJCyocn9cyGQdNjxah4/aYuYFTbLI1rxk7sr/AkZfJNIoF2UFyO5STbbratykIQGUPdUBg1a2t72bu31x+4ZYJMngNsG/AkZ2oqLiH6dJKHD7PFx2oSPalogwsUV7iSMIZIYaPa03A9763iFsN0qJjaed+gAAAIBxz3Prxdzt/os4XGXSMNoWcS03AFC/05NOkoDMrXxQnTTpp1wrOgyRqEnKz15qC5dWk1ynzK+LJXHDZGA8lXPfCjHpJO3zrlZ/ivvLhgPdDpt13MAhIJFH06hTal0woxbk/fIdY71P3kbgXC0Ppx/0S7BC+VxqRCA4/wcM+BoDbA== host" }).
-        to_return(:body => fixture("v3/public_key.json"))
+        to_return(json_response("public_key.json"))
       public_key = @client.add_deploy_key("sferik/rails_admin", "Moss", "ssh-dss AAAAB3NzaC1kc3MAAACBAJz7HanBa18ad1YsdFzHO5Wy1/WgXd4BV+czbKq7q23jungbfjN3eo2a0SVdxux8GG+RZ9ia90VD/X+PE4s3LV60oXZ7PDAuyPO1CTF0TaDoKf9mPaHcPa6agMJVocMsgBgwviWT1Q9VgN1SccDsYVDtxkIAwuw25YeHZlG6myx1AAAAFQCgW+OvXWUdUJPBGkRJ8ML7uf0VHQAAAIAlP5G96tTss0SKYVSCJCyocn9cyGQdNjxah4/aYuYFTbLI1rxk7sr/AkZfJNIoF2UFyO5STbbratykIQGUPdUBg1a2t72bu31x+4ZYJMngNsG/AkZ2oqLiH6dJKHD7PFx2oSPalogwsUV7iSMIZIYaPa03A9763iFsN0qJjaed+gAAAIBxz3Prxdzt/os4XGXSMNoWcS03AFC/05NOkoDMrXxQnTTpp1wrOgyRqEnKz15qC5dWk1ynzK+LJXHDZGA8lXPfCjHpJO3zrlZ/ivvLhgPdDpt13MAhIJFH06hTal0woxbk/fIdY71P3kbgXC0Ppx/0S7BC+VxqRCA4/wcM+BoDbA== host")
       expect(public_key.id).to eq(103205)
     end
@@ -205,7 +205,7 @@ describe Octokit::Client::Repositories do
       stub_delete("/repos/sferik/rails_admin/keys/#{103205}").
         to_return(:status => 204)
       result = @client.remove_deploy_key("sferik/rails_admin", 103205)
-      expect(result).to be_nil
+      expect(result).to be_true
     end
 
   end
@@ -214,7 +214,7 @@ describe Octokit::Client::Repositories do
 
     it "returns a repository's collaborators" do
       stub_get("/repos/sferik/rails_admin/collaborators").
-        to_return(:body => fixture("v3/collaborators.json"))
+        to_return(json_response("collaborators.json"))
       collaborators = @client.collaborators("sferik/rails_admin")
       expect(collaborators.first.login).to eq("sferik")
     end
@@ -227,7 +227,7 @@ describe Octokit::Client::Repositories do
       stub_put("/repos/sferik/rails_admin/collaborators/sferik").
         to_return(:status => 204)
       result = @client.add_collaborator("sferik/rails_admin", "sferik")
-      expect(result).to be_nil
+      expect(result).to be_true
     end
 
   end
@@ -238,7 +238,7 @@ describe Octokit::Client::Repositories do
       stub_delete("/repos/sferik/rails_admin/collaborators/sferik").
         to_return(:status => 204)
       result = @client.remove_collaborator("sferik/rails_admin", "sferik")
-      expect(result).to be_nil
+      expect(result).to be_true
     end
 
   end
@@ -247,7 +247,7 @@ describe Octokit::Client::Repositories do
 
     it "returns all repository teams" do
       stub_get("/repos/codeforamerica/open311/teams").
-        to_return(:body => fixture("v3/teams.json"))
+        to_return(json_response("teams.json"))
       teams = @client.repository_teams("codeforamerica/open311")
       expect(teams.first.name).to eq("Fellows")
     end
@@ -260,7 +260,7 @@ describe Octokit::Client::Repositories do
 
       it "returns all repository contributors" do
         stub_get("/repos/sferik/rails_admin/contributors?anon=true").
-          to_return(:body => fixture("v3/contributors.json"))
+          to_return(json_response("contributors.json"))
         contributors = @client.contributors("sferik/rails_admin", true)
         expect(contributors.first.login).to eq("sferik")
       end
@@ -271,7 +271,7 @@ describe Octokit::Client::Repositories do
 
       it "returns all repository contributors" do
         stub_get("/repos/sferik/rails_admin/contributors?anon=false").
-          to_return(:body => fixture("v3/contributors.json"))
+          to_return(json_response("contributors.json"))
         contributors = @client.contributors("sferik/rails_admin")
         expect(contributors.first.login).to eq("sferik")
       end
@@ -284,7 +284,7 @@ describe Octokit::Client::Repositories do
 
     it "returns all repository stargazers" do
       stub_get("/repos/sferik/rails_admin/stargazers").
-        to_return(:body => fixture("v3/stargazers.json"))
+        to_return(json_response("stargazers.json"))
       stargazers = @client.stargazers("sferik/rails_admin")
       expect(stargazers.first.login).to eq("sferik")
     end
@@ -295,7 +295,7 @@ describe Octokit::Client::Repositories do
 
     it "returns all repository watchers" do
       stub_get("/repos/sferik/rails_admin/watchers").
-        to_return(:body => fixture("v3/watchers.json"))
+        to_return(json_response("watchers.json"))
       watchers = @client.watchers("sferik/rails_admin")
       expect(watchers.first.login).to eq("sferik")
     end
@@ -306,7 +306,7 @@ describe Octokit::Client::Repositories do
 
     it "returns a repository's network" do
       stub_get("/repos/sferik/rails_admin/forks").
-        to_return(:body => fixture("v3/forks.json"))
+        to_return(json_response("forks.json"))
       network = @client.network("sferik/rails_admin")
       expect(network.first.owner.login).to eq("digx")
     end
@@ -317,7 +317,7 @@ describe Octokit::Client::Repositories do
 
     it "returns a repository's languages" do
       stub_get("/repos/sferik/rails_admin/languages").
-        to_return(:body => fixture("v3/languages.json"))
+        to_return(json_response("languages.json"))
       languages = @client.languages("sferik/rails_admin")
       expect(languages["Ruby"]).to eq(345701)
     end
@@ -328,7 +328,7 @@ describe Octokit::Client::Repositories do
 
     it "returns a repository's tags" do
       stub_get("/repos/pengwynn/octokit/tags").
-        to_return(:body => fixture("v3/tags.json"))
+        to_return(json_response("tags.json"))
       tags = @client.tags("pengwynn/octokit")
       v0_6_4 = tags.find { |tag| tag.name == "v0.6.4" }
       expect(v0_6_4.commit.sha).to eq("09bcc30e7286eeb1bbde68d0ace7a6b90b1a84a2")
@@ -340,14 +340,14 @@ describe Octokit::Client::Repositories do
 
     it "returns a repository's branches" do
       stub_get("/repos/pengwynn/octokit/branches").
-        to_return(:body => fixture("v3/branches.json"))
+        to_return(json_response("branches.json"))
       branches = @client.branches("pengwynn/octokit")
       master = branches.find { |branch| branch.name == "master" }
       expect(master.commit.sha).to eq("88553a397f7293b3ba176dc27cd1ab6bb93d5d14")
     end
 
     it "returns a single branch" do
-      branch = JSON.parse(fixture("v3/branches.json").read).last
+      branch = JSON.parse(fixture("branches.json").read).last
       stub_get("/repos/pengwynn/octokit/branches/master").
         to_return(:body => branch)
       branch = @client.branch("pengwynn/octokit", "master")
@@ -360,7 +360,7 @@ describe Octokit::Client::Repositories do
 
     it "returns a repository's hooks" do
       stub_get("/repos/railsbp/railsbp.com/hooks").
-        to_return(:body => fixture("v3/hooks.json"))
+        to_return(json_response("hooks.json"))
       hooks = @client.hooks("railsbp/railsbp.com")
       hook = hooks.find { |hook| hook.name == "railsbp" }
       expect(hook.config.token).to eq("xAAQZtJhYHGagsed1kYR")
@@ -372,7 +372,7 @@ describe Octokit::Client::Repositories do
 
     it "returns a repository's single hook" do
       stub_get("/repos/railsbp/railsbp.com/hooks/154284").
-        to_return(:body => fixture("v3/hook.json"))
+        to_return(json_response("hook.json"))
       hook = @client.hook("railsbp/railsbp.com", 154284)
       expect(hook.config.token).to eq("xAAQZtJhYHGagsed1kYR")
     end
@@ -384,7 +384,7 @@ describe Octokit::Client::Repositories do
     it "creates a hook" do
       stub_post("/repos/railsbp/railsbp.com/hooks").
         with(:body => {:name => "railsbp", :config => {:railsbp_url => "http://railsbp.com", :token => "xAAQZtJhYHGagsed1kYR"}, :events => ["push"], :active => true}).
-        to_return(:body => fixture("v3/hook.json"))
+        to_return(json_response("hook.json"))
       hook = @client.create_hook("railsbp/railsbp.com", "railsbp", {:railsbp_url => "http://railsbp.com", :token => "xAAQZtJhYHGagsed1kYR"})
       expect(hook.id).to eq(154284)
     end
@@ -396,7 +396,7 @@ describe Octokit::Client::Repositories do
     it "edits a hook" do
       stub_patch("/repos/railsbp/railsbp.com/hooks/154284").
         with(:body => {:name => "railsbp", :config => {:railsbp_url => "http://railsbp.com", :token => "xAAQZtJhYHGagsed1kYR"}, :events => ["push"], :active => true}).
-        to_return(:body => fixture("v3/hook.json"))
+        to_return(json_response("hook.json"))
       hook = @client.edit_hook("railsbp/railsbp.com", 154284, "railsbp", {:railsbp_url => "http://railsbp.com", :token => "xAAQZtJhYHGagsed1kYR"})
       expect(hook.id).to eq(154284)
       expect(hook.config.token).to eq("xAAQZtJhYHGagsed1kYR")
@@ -409,7 +409,7 @@ describe Octokit::Client::Repositories do
     it "removes a hook" do
       stub_delete("/repos/railsbp/railsbp.com/hooks/154284").
         to_return(:status => 204)
-      expect(@client.remove_hook("railsbp/railsbp.com", 154284)).to be_nil
+      expect(@client.remove_hook("railsbp/railsbp.com", 154284)).to be_true
     end
 
   end
@@ -419,7 +419,7 @@ describe Octokit::Client::Repositories do
     it "tests a hook" do
       stub_post("/repos/railsbp/railsbp.com/hooks/154284/test").
         to_return(:status => 204)
-      expect(@client.test_hook("railsbp/railsbp.com", 154284)).to be_nil
+      expect(@client.test_hook("railsbp/railsbp.com", 154284)).to be_true
     end
 
   end
@@ -428,7 +428,7 @@ describe Octokit::Client::Repositories do
 
     it "lists events for all issues in a repository" do
       stub_get("/repos/pengwynn/octokit/issues/events").
-      to_return(:body => fixture("v3/repo_issues_events.json"))
+      to_return(json_response("repo_issues_events.json"))
       events = @client.repo_issue_events("pengwynn/octokit")
       expect(events.first.actor.login).to eq("ctshryock")
       expect(events.first.event).to eq("subscribed")
@@ -440,11 +440,63 @@ describe Octokit::Client::Repositories do
 
     it "lists all the available assignees (owner + collaborators)" do
       stub_get("/repos/pengwynn/octokit/assignees").
-      to_return(:body => fixture("v3/repo_assignees.json"))
+      to_return(json_response("repo_assignees.json"))
       assignees = @client.repo_assignees("pengwynn/octokit")
       expect(assignees.first.login).to eq("adamstac")
     end
 
   end
 
+  describe ".subscribers" do
+
+    it "lists all the users watching the repository" do
+      stub_get("/repos/pengwynn/octokit/subscribers").
+        to_return(json_response("subscribers.json"))
+      subscribers = @client.subscribers("pengwynn/octokit")
+      expect(subscribers.first.id).to eq(865)
+      expect(subscribers.first.login).to eq("pengwynn")
+    end
+
+  end
+
+  describe ".subscription" do
+
+    it "returns a repository subscription" do
+      stub_get("/repos/pengwynn/octokit/subscription").
+        to_return(json_response("subscription.json"))
+      subscription = @client.subscription("pengwynn/octokit")
+      expect(subscription.subscribed).to be_true
+    end
+
+  end
+
+  describe ".update_subscription" do
+
+    it "updates a repository subscription" do
+      stub_put("/repos/pengwynn/octokit/subscription").
+        to_return(json_response("subscription_update.json"))
+      subscription = @client.update_subscription("pengwynn/octokit", :subscribed => false)
+      expect(subscription.subscribed).to be_false
+    end
+
+  end
+
+  describe ".delete_subscription" do
+
+    it "returns true when repo subscription deleted" do
+      stub_delete("/repos/pengwynn/octokit/subscription").
+        to_return(:status => 204)
+      result = @client.delete_subscription("pengwynn/octokit")
+      expect(result).to be_true
+    end
+
+    it "returns false when delete repo subscription fails" do
+      stub_delete("/repos/pengwynn/octokit/subscription").
+        to_return(:status => 500)
+      result = @client.delete_subscription("pengwynn/octokit")
+      expect(result).to be_false
+    end
+
+  end
+
 end