octokit 1.18.0 → 1.19.0

data/spec/octokit/client/contents_spec.rb

@@ -11,7 +11,7 @@ describe Octokit::Client::Contents do
 
     it "returns the default readme" do
       stub_get("/repos/pengwynn/octokit/readme").
-        to_return(:body => fixture("v3/readme.json"))
+        to_return(json_response("readme.json"))
       readme = @client.readme('pengwynn/octokit')
       expect(readme.encoding).to eq("base64")
       expect(readme.type).to eq("file")
@@ -23,7 +23,7 @@ describe Octokit::Client::Contents do
 
     it "returns the contents of a file" do
       stub_get("/repos/pengwynn/octokit/contents/lib/octokit.rb").
-        to_return(:body => fixture("v3/contents.json"))
+        to_return(json_response("contents.json"))
       contents = @client.contents('pengwynn/octokit', :path => "lib/octokit.rb")
       expect(contents.path).to eq("lib/octokit.rb")
       expect(contents.name).to eq("lib/octokit.rb")
@@ -36,9 +36,12 @@ describe Octokit::Client::Contents do
   describe ".archive_link" do
 
     it "returns the headers of the request" do
-      stub_get("/repos/pengwynn/octokit/tarball/master").
+      stub_head("/repos/pengwynn/octokit/tarball/master").
         to_return(:status => 302, :body => '', :headers =>
           { 'location' => "https://nodeload.github.com/repos/pengwynn/octokit/tarball/"})
+      stub_head("https://nodeload.github.com/repos/pengwynn/octokit/tarball/").
+        to_return(:status => 200)
+
       archive_link = @client.archive_link('pengwynn/octokit', :ref => "master")
       expect(archive_link).to eq("https://nodeload.github.com/repos/pengwynn/octokit/tarball/")
     end

data/spec/octokit/client/downloads_spec.rb

@@ -11,7 +11,7 @@ describe Octokit::Client::Downloads do
 
     it "lists available downloads" do
       stub_get("/repos/github/hubot/downloads").
-        to_return(:body => fixture("v3/downloads.json"))
+        to_return(json_response("downloads.json"))
       downloads = @client.downloads("github/hubot")
       expect(downloads.first.description).to eq("Robawt")
     end
@@ -22,7 +22,7 @@ describe Octokit::Client::Downloads do
 
     it "gets a single download" do
       stub_get("/repos/github/hubot/downloads/165347").
-        to_return(:body => fixture("v3/download.json"))
+        to_return(json_response("download.json"))
       download = @client.download("github/hubot", 165347)
       expect(download.id).to eq(165347)
       expect(download.name).to eq('hubot-2.1.0.tar.gz')
@@ -36,7 +36,7 @@ describe Octokit::Client::Downloads do
         with(:body => {:name => "download_create.json", :size => 690,
                        :description => "Description of your download",
                        :content_type => "text/plain" }).
-        to_return(:body => fixture("v3/download_create.json"))
+        to_return(json_response("download_create.json"))
     end
     it "creates a download resource" do
       resource = @client.send(:create_download_resource, "octocat/Hello-World", "download_create.json", 690, {:description => "Description of your download", :content_type => "text/plain"})
@@ -46,7 +46,7 @@ describe Octokit::Client::Downloads do
     it "posts to an S3 url" do
       stub_post("https://github.s3.amazonaws.com/").
         to_return(:status => 201)
-      file_path = File.expand_path 'spec/fixtures/v3/download_create.json'
+      file_path = File.expand_path 'spec/fixtures/download_create.json'
       expect(@client.create_download("octocat/Hello-World", file_path, {:description => "Description of your download", :content_type => "text/plain"})).to eq(true)
     end
   end
@@ -55,9 +55,8 @@ describe Octokit::Client::Downloads do
 
     it "deletes a download" do
       stub_request(:delete, "https://api.github.com/repos/octocat/Hellow-World/downloads/165347").
-        with(:headers => {'Accept'=>'*/*'}).
         to_return(:status => 204, :body => "", :headers => {})
-      expect(@client.delete_download('octocat/Hellow-World', 165347).status).to eq(204)
+      expect(@client.delete_download('octocat/Hellow-World', 165347)).to be_true
     end
   end
 

data/spec/octokit/client/emojis_spec.rb

@@ -9,7 +9,7 @@ describe Octokit::Client::Emojis do
   describe ".emojis" do
     it "returns all github emojis" do
       stub_get("/emojis").
-        to_return(:body => fixture("v3/emojis.json"))
+        to_return(json_response("emojis.json"))
       emojis = @client.emojis
       expect(emojis[:metal]).to eq('https://a248.e.akamai.net/assets.github.com/images/icons/emoji/metal.png?v5')
     end

data/spec/octokit/client/events_spec.rb

@@ -9,7 +9,7 @@ describe Octokit::Client::Events do
   describe ".public_events" do
     it "returns all public events" do
       stub_get("/events").
-        to_return(:body => fixture("v3/public_events.json"))
+        to_return json_response("public_events.json")
       public_events = @client.public_events
       expect(public_events.first.id).to eq('1513284759')
     end
@@ -18,7 +18,7 @@ describe Octokit::Client::Events do
   describe ".user_events" do
     it "returns all user events" do
       stub_get("/users/sferik/events").
-        to_return(:body => fixture("v3/user_events.json"))
+        to_return json_response("user_events.json")
       user_events = @client.user_events('sferik')
       expect(user_events.first.id).to eq('1525888969')
     end
@@ -27,7 +27,7 @@ describe Octokit::Client::Events do
   describe ".received_events" do
     it "returns all user received events" do
       stub_get("/users/sferik/received_events").
-        to_return(:body => fixture("v3/user_events.json"))
+        to_return json_response("user_events.json")
       received_events = @client.received_events('sferik')
       expect(received_events.first.type).to eq('PushEvent')
     end
@@ -36,10 +36,10 @@ describe Octokit::Client::Events do
   describe ".repository_events" do
     it "returns events for a repository" do
       stub_get("/repos/sferik/rails_admin/events").
-        to_return(:body => fixture("v3/repo_events.json"))
+        to_return json_response("repo_events.json")
       repo_events = @client.repository_events("sferik/rails_admin")
       expect(repo_events.first.type).to eq("IssuesEvent")
     end
-    
+
   end
 end

data/spec/octokit/client/gists_spec.rb

@@ -10,7 +10,7 @@ describe Octokit::Client::Gists do
 
   describe ".public_gists" do
     it "returns public gists" do
-      stub_get("/gists/public").to_return(:body => fixture("v3/public_gists.json"))
+      stub_get("/gists/public").to_return(json_response("public_gists.json"))
       gists = @client.public_gists
       expect(gists).not_to be_empty
     end
@@ -20,7 +20,7 @@ describe Octokit::Client::Gists do
     context "with username passed" do
       it "returns a list of gists" do
         stub_get("/users/#{@username}/gists").
-          to_return(:body => fixture("v3/gists.json"))
+          to_return(json_response("gists.json"))
         gists = @client.gists(@username)
         expect(gists.first.user.login).to eq(@username)
       end
@@ -28,7 +28,7 @@ describe Octokit::Client::Gists do
 
     context "without a username passed" do
       it "returns a list of gists" do
-        stub_get("/gists").to_return(:body => fixture("v3/gists.json"))
+        stub_get("/gists").to_return(json_response("gists.json"))
         gists = @client.gists
         expect(gists.first.user.login).to eq(@username)
       end
@@ -37,7 +37,7 @@ describe Octokit::Client::Gists do
 
   describe ".starred_gists" do
     it "returns the user's starred gists" do
-      stub_get("/gists/starred").to_return(:body => fixture("v3/starred_gists.json"))
+      stub_get("/gists/starred").to_return(json_response("starred_gists.json"))
       gists = @client.starred_gists
       expect(gists).not_to be_empty
     end
@@ -45,7 +45,7 @@ describe Octokit::Client::Gists do
 
   describe ".gist" do
     it "returns the gist by ID" do
-      stub_get("/gists/1").to_return(:body => fixture("v3/gist.json"))
+      stub_get("/gists/1").to_return(json_response("gist.json"))
       gist = @client.gist(1)
       expect(gist.user.login).to eq(@username)
     end
@@ -53,7 +53,7 @@ describe Octokit::Client::Gists do
 
   describe ".create_gist" do
     it "creates a new gist" do
-      gist_content = JSON.parse(fixture("v3/gist.json").read)
+      gist_content = JSON.parse(fixture("gist.json").read)
       new_gist = {
         :description => gist_content['description'],
         :public      => gist_content['public'],
@@ -61,7 +61,7 @@ describe Octokit::Client::Gists do
       }
 
       stub_post("/gists").with(new_gist).
-        to_return(:body => fixture("v3/gist.json"))
+        to_return(json_response("gist.json"))
 
       gist = @client.create_gist(new_gist)
       expect(gist).to eq(gist_content)
@@ -70,7 +70,7 @@ describe Octokit::Client::Gists do
 
   describe ".edit_gist" do
     it "edit an existing gist" do
-      gist_content = JSON.parse(fixture("v3/gist.json").read)
+      gist_content = JSON.parse(fixture("gist.json").read)
       gist_id = gist_content['id']
       updated_gist = gist_content.merge('description' => 'updated')
 
@@ -115,7 +115,7 @@ describe Octokit::Client::Gists do
   describe ".fork_gist" do
     it "forks an existing gist" do
       stub_post("/gists/12345/fork").
-        to_return(:body => fixture("v3/gist.json"))
+        to_return(json_response("gist.json"))
 
       gist = @client.fork_gist(12345)
       expect(gist.user.login).to eq(@username)
@@ -133,7 +133,7 @@ describe Octokit::Client::Gists do
   describe ".gist_comments" do
     it "returns the list of gist comments" do
       stub_get("/gists/12345/comments").
-        to_return(:body => fixture("v3/gist_comments.json"))
+        to_return(json_response("gist_comments.json"))
       comments = @client.gist_comments(12345)
       expect(comments.first.id).to eq(451398)
     end
@@ -141,9 +141,9 @@ describe Octokit::Client::Gists do
 
   describe ".gist_comment" do
     it "returns a gist comment" do
-      stub_get("/gists/comments/12345").
-        to_return(:body => fixture("v3/gist_comment.json"))
-      comment = @client.gist_comment(12345)
+      stub_get("/gists/4bcad24/comments/12345").
+        to_return(json_response("gist_comment.json"))
+      comment = @client.gist_comment("4bcad24", 12345)
       expect(comment.id).to eq(451398)
     end
   end
@@ -151,8 +151,8 @@ describe Octokit::Client::Gists do
   describe ".create_gist_comment" do
     it "creates a gist comment" do
       stub_post("/gists/12345/comments").
-        to_return(:body => fixture("v3/gist_comment_create.json"))
-      comment = @client.create_gist_comment(12345, "This is very helpful.")
+        to_return(json_response("gist_comment_create.json"))
+      comment = @client.create_gist_comment('12345', "This is very helpful.")
       expect(comment.id).to eq(586399)
       expect(comment.body).to eq("This is very helpful.")
     end
@@ -160,17 +160,17 @@ describe Octokit::Client::Gists do
 
   describe ".update_gist_comment" do
     it "updates a gist comment" do
-      stub_patch("/gists/comments/12345").
-        to_return(:body => fixture("v3/gist_comment_update.json"))
-      comment = @client.update_gist_comment(12345, ":heart:")
+      stub_patch("/gists/4bcad24/comments/12345").
+        to_return(json_response("gist_comment_update.json"))
+      comment = @client.update_gist_comment("4bcad24", 12345, ":heart:")
       expect(comment.body).to eq(":heart:")
     end
   end
 
   describe ".delete_gist_comment" do
     it "deletes a gist comment" do
-      stub_delete("/gists/comments/12345").to_return(:status => 204)
-      result = @client.delete_gist_comment(12345)
+      stub_delete("/gists/4bcad24/comments/12345").to_return(:status => 204)
+      result = @client.delete_gist_comment("4bcad24", 12345)
       expect(result).to be_true
     end
   end

data/spec/octokit/client/issue_events_spec.rb

@@ -11,7 +11,7 @@ describe Octokit::Client::Issues do
 
     it "lists events for an issue" do
       stub_get("/repos/pengwynn/octokit/issues/38/events").
-      to_return(:body => fixture("v3/issue_events.json"))
+      to_return(json_response("issue_events.json"))
       events = @client.issue_events("pengwynn/octokit", 38)
       expect(events.first.event).to eq("mentioned")
       expect(events.last.actor.login).to eq("ctshryock")
@@ -19,7 +19,7 @@ describe Octokit::Client::Issues do
 
     it "gets a single event" do
       stub_get("/repos/pengwynn/octokit/issues/events/3094334").
-      to_return(:body => fixture("v3/issue_event.json"))
+      to_return(json_response("issue_event.json"))
       events = @client.issue_event("pengwynn/octokit", 3094334)
       expect(events.actor.login).to eq("sferik")
       expect(events.event).to eq("closed")

data/spec/octokit/client/issues_spec.rb

@@ -11,7 +11,7 @@ describe Octokit::Client::Issues do
 
     it "returns matching issues" do
       stub_get("https://api.github.com/legacy/issues/search/sferik/rails_admin/open/activerecord").
-      to_return(:body => fixture("legacy/issues.json"))
+      to_return(json_response("legacy/issues.json"))
       issues = @client.search_issues("sferik/rails_admin", "activerecord")
       expect(issues.first.number).to eq(105)
     end
@@ -22,14 +22,14 @@ describe Octokit::Client::Issues do
 
     it "returns issues for a repository" do
       stub_get("/repos/sferik/rails_admin/issues").
-        to_return(:body => fixture("v3/issues.json"))
+        to_return(json_response("issues.json"))
       issues = @client.issues("sferik/rails_admin")
       expect(issues.first.number).to eq(388)
     end
 
     it "returns issues for the authenticated user" do
       stub_get("/issues").
-        to_return(:body => fixture("v3/issues.json"))
+        to_return(json_response("issues.json"))
       issues = @client.issues
       expect(issues.first.number).to eq(388)
     end
@@ -42,7 +42,7 @@ describe Octokit::Client::Issues do
       stub_post("/repos/ctshryock/octokit/issues").
         with(:body => {"title" => "Migrate issues to v3", "body" => "Move all Issues calls to v3 of the API"},
              :headers => {'Content-Type'=>'application/json'}).
-        to_return(:body => fixture("v3/issue.json"))
+        to_return(json_response("issue.json"))
       issue = @client.create_issue("ctshryock/octokit", "Migrate issues to v3", "Move all Issues calls to v3 of the API")
       expect(issue.number).to eq(12)
     end
@@ -53,11 +53,22 @@ describe Octokit::Client::Issues do
 
     it "returns an issue" do
       stub_get("/repos/ctshryock/octokit/issues/12").
-        to_return(:body => fixture("v3/issue.json"))
+        to_return(json_response("issue.json"))
       issue = @client.issue("ctshryock/octokit", 12)
       expect(issue.number).to eq(12)
     end
 
+    context "with media_type param full" do
+
+      it "returns an issue" do
+        stub_get("/repos/pengwynn/octokit/issues/1").
+          to_return(json_response('issue_full.json'))
+        issue = @client.issue("pengwynn/octokit", 1, :accept => 'application/vnd.github.full+json')
+        expect(issue.body_html).to include('<p>Create, Edit, Delete missing')
+        expect(issue.body_text).to include('Create, Edit, Delete missing')
+      end
+    end
+
   end
 
   describe ".close_issue" do
@@ -66,7 +77,7 @@ describe Octokit::Client::Issues do
       stub_post("/repos/ctshryock/octokit/issues/12").
         with(:body => {"state" => "closed"},
              :headers => {'Content-Type'=>'application/json'}).
-        to_return(:body => fixture("v3/issue_closed.json"))
+        to_return(json_response("issue_closed.json"))
       issue = @client.close_issue("ctshryock/octokit", 12)
       expect(issue.number).to eq(12)
       expect(issue).to include :closed_at
@@ -81,7 +92,7 @@ describe Octokit::Client::Issues do
       stub_post("/repos/ctshryock/octokit/issues/12").
         with(:body => {"state" => "open"},
              :headers => {'Content-Type'=>'application/json'}).
-        to_return(:body => fixture("v3/issue.json"))
+        to_return(json_response("issue.json"))
       issue = @client.reopen_issue("ctshryock/octokit", 12)
       expect(issue.number).to eq(12)
       expect(issue.state).to eq("open")
@@ -95,7 +106,7 @@ describe Octokit::Client::Issues do
       stub_post("/repos/ctshryock/octokit/issues/12").
         with(:body => {"title" => "Use all the v3 api!", "body" => ""},
              :headers => {'Content-Type'=>'application/json'}).
-        to_return(:body => fixture("v3/issue.json"))
+        to_return(json_response("issue.json"))
       issue = @client.update_issue("ctshryock/octokit", 12, "Use all the v3 api!", "")
       expect(issue.number).to eq(12)
     end
@@ -106,7 +117,7 @@ describe Octokit::Client::Issues do
 
     it "returns comments for an issue" do
       stub_get("/repos/pengwynn/octokit/issues/25/comments").
-        to_return(:status => 200, :body => fixture('v3/comments.json'))
+        to_return(json_response('comments.json'))
       comments = @client.issue_comments("pengwynn/octokit", 25)
       expect(comments.first.user.login).to eq("ctshryock")
     end
@@ -117,7 +128,7 @@ describe Octokit::Client::Issues do
 
     it "returns a single comment for an issue" do
       stub_get("/repos/pengwynn/octokit/issues/comments/25").
-        to_return(:status => 200, :body => fixture('v3/comment.json'))
+        to_return(json_response('comment.json'))
       comments = @client.issue_comment("pengwynn/octokit", 25)
       expect(comments.user.login).to eq("ctshryock")
       expect(comments.url).to eq("https://api.github.com/repos/pengwynn/octokit/issues/comments/1194690")
@@ -130,7 +141,7 @@ describe Octokit::Client::Issues do
     it "adds a comment" do
       stub_post("/repos/pengwynn/octokit/issues/25/comments").
         with(:body => {"body" => "A test comment"}).
-        to_return(:status => 201, :body => fixture('v3/comment.json'))
+        to_return(json_response('comment.json'))
       comment = @client.add_comment("pengwynn/octokit", 25, "A test comment")
       expect(comment.user.login).to eq("ctshryock")
     end
@@ -142,7 +153,7 @@ describe Octokit::Client::Issues do
     it "updates an existing comment" do
       stub_post("/repos/pengwynn/octokit/issues/comments/1194549").
         with(:body => {"body" => "A test comment update"}).
-        to_return(:status => 200, :body => fixture('v3/comment.json'))
+        to_return(json_response('comment.json'))
       comment = @client.update_comment("pengwynn/octokit", 1194549, "A test comment update")
       expect(comment.user.login).to eq("ctshryock")
     end
@@ -154,8 +165,8 @@ describe Octokit::Client::Issues do
     it "deletes an existing comment" do
       stub_delete("/repos/pengwynn/octokit/issues/comments/1194549").
         to_return(:status => 204)
-      comment = @client.delete_comment("pengwynn/octokit", 1194549)
-      expect(comment.status).to eq(204)
+      result = @client.delete_comment("pengwynn/octokit", 1194549)
+      expect(result).to be_true
     end
 
   end

data/spec/octokit/client/labels_spec.rb

@@ -11,7 +11,7 @@ describe Octokit::Client::Labels do
 
     it "returns labels" do
       stub_get("/repos/pengwynn/octokit/labels").
-        to_return(:body => fixture("v3/labels.json"))
+        to_return(json_response("labels.json"))
       labels = @client.labels("pengwynn/octokit")
       expect(labels.first.name).to eq("V3 Transition")
     end
@@ -22,7 +22,7 @@ describe Octokit::Client::Labels do
 
     it "returns a single labels" do
       stub_get("/repos/pengwynn/octokit/labels/V3+Addition").
-        to_return(:status => 200, :body => fixture('v3/label.json'))
+        to_return(json_response('label.json'))
       label = @client.label("pengwynn/octokit", "V3 Addition")
       expect(label.name).to eq("V3 Addition")
     end
@@ -33,9 +33,8 @@ describe Octokit::Client::Labels do
 
     it "adds a label with a color" do
       stub_post("/repos/pengwynn/octokit/labels").
-        with(:body => {"name" => "a significant bug", "color" => "ededed"},
-             :headers => {'Content-Type'=>'application/json'}).
-        to_return(:status => 201, :body => fixture('v3/label.json'))
+        with(:body => {"name" => "a significant bug", "color" => "ededed"}).
+        to_return(json_response('label.json'))
       labels = @client.add_label("pengwynn/octokit", "a significant bug", 'ededed')
       expect(labels.color).to eq("ededed")
       expect(labels.name).to  eq("V3 Addition")
@@ -43,9 +42,8 @@ describe Octokit::Client::Labels do
 
     it "adds a label with default color" do
       stub_post("/repos/pengwynn/octokit/labels").
-        with(:body => {"name" => "another significant bug", "color" => "ffffff"},
-             :headers => {'Content-Type'=>'application/json'}).
-        to_return(:status => 201, :body => fixture('v3/label.json'))
+        with(:body => {"name" => "another significant bug", "color" => "ffffff"}).
+        to_return(json_response('label.json'))
       labels = @client.add_label("pengwynn/octokit", "another significant bug")
       expect(labels.color).to eq("ededed")
       expect(labels.name).to  eq("V3 Addition")
@@ -59,7 +57,7 @@ describe Octokit::Client::Labels do
       stub_post("/repos/pengwynn/octokit/labels/V3+Addition").
         with(:body => {"color" => "ededed"},
             :headers => {'Content-Type'=>'application/json'}).
-        to_return(:status => 200, :body => fixture('v3/label.json'))
+        to_return(json_response('label.json'))
 
       label = @client.update_label("pengwynn/octokit", "V3 Addition", {:color => 'ededed'})
       expect(label.color).to eq('ededed')
@@ -73,8 +71,8 @@ describe Octokit::Client::Labels do
       stub_delete("/repos/pengwynn/octokit/labels/V3+Transition").
        to_return(:status => 204)
 
-      response = @client.delete_label!("pengwynn/octokit", "V3 Transition")
-      expect(response.status).to eq(204)
+      result = @client.delete_label!("pengwynn/octokit", "V3 Transition")
+      expect(result).to be_true
     end
 
   end
@@ -83,7 +81,7 @@ describe Octokit::Client::Labels do
 
     it "removes a label from the specified issue" do
       stub_delete("/repos/pengwynn/octokit/issues/23/labels/V3+Transition").
-        to_return(:status => 200, :body => fixture('v3/labels.json'), :headers => {})
+        to_return(json_response('labels.json'), :headers => {})
 
       response = @client.remove_label("pengwynn/octokit", 23, "V3 Transition")
       expect(response.last.name).to eq('Bug')
@@ -97,8 +95,8 @@ describe Octokit::Client::Labels do
      stub_delete("/repos/pengwynn/octokit/issues/23/labels").
        to_return(:status => 204)
 
-     response = @client.remove_all_labels('pengwynn/octokit', 23)
-     expect(response.status).to eq(204)
+     result = @client.remove_all_labels('pengwynn/octokit', 23)
+     expect(result).to be_true
     end
 
   end
@@ -106,9 +104,8 @@ describe Octokit::Client::Labels do
   describe ".add_labels_to_an_issue" do
     it "adds labels to a given issue" do
       stub_post("/repos/pengwynn/octokit/issues/42/labels").
-        with(:body => '["V3 Transition","Bug"]',
-            :headers => {'Accept'=>'*/*', 'Content-Type'=>'application/json'}).
-        to_return(:status => 200, :body => fixture('v3/labels.json'), :headers => {})
+        with(:body => '["V3 Transition","Bug"]').
+        to_return(json_response('labels.json'), :headers => {})
 
       labels = @client.add_labels_to_an_issue('pengwynn/octokit', 42, ['V3 Transition', 'Bug'])
       expect(labels.first.name).to eq('V3 Transition')
@@ -119,9 +116,8 @@ describe Octokit::Client::Labels do
   describe ".replace_all_labels" do
     it "replaces all labels for an issue" do
        stub_put("/repos/pengwynn/octokit/issues/42/labels").
-         with(:body => '["V3 Transition","V3 Adding"]',
-              :headers => {'Accept'=>'*/*', 'Content-Type'=>'application/json'}).
-         to_return(:status => 200, :body => fixture('v3/labels.json'), :headers => {})
+         with(:body => '["V3 Transition","V3 Adding"]').
+         to_return(json_response('labels.json'), :headers => {})
 
       labels = @client.replace_all_labels('pengwynn/octokit', 42, ['V3 Transition', 'V3 Adding'])
       expect(labels.first.name).to eq('V3 Transition')
@@ -131,7 +127,7 @@ describe Octokit::Client::Labels do
   describe ".lables_for_milestone" do
     it "returns all labels for a repository" do
       stub_get('/repos/pengwynn/octokit/milestones/2/labels').
-        to_return(:status => 200, :body => fixture('v3/labels.json'), :headers => {})
+        to_return(json_response('labels.json'), :headers => {})
 
       labels = @client.labels_for_milestone('pengwynn/octokit', 2)
       expect(labels.size).to eq(3)
@@ -141,7 +137,7 @@ describe Octokit::Client::Labels do
   describe ".labels_for_issue" do
     it "returns all labels for a given issue" do
       stub_get("/repos/pengwynn/octokit/issues/37/labels").
-        to_return(:status => 200, :body => fixture('v3/labels.json'), :headers => {})
+        to_return(json_response('labels.json'), :headers => {})
 
       labels = @client.labels_for_issue('pengwynn/octokit', 37)
       expect(labels.first.name).to eq('V3 Transition')