octokit 0.6.4 → 0.6.5

data/spec/octokit/client/pub_sub_hubbub/service_hooks_spec.rb

@@ -14,7 +14,7 @@ describe Octokit::Client::PubSubHubbub::ServiceHooks do
       }
     }
     it "subscribes to pull events on specified topic" do
-      stub_post("https://api.github.com/hub?access_token=myfaketoken").
+      stub_post("/hub?access_token=myfaketoken").
         with(subscribe_request_body).
         to_return(:body => nil)
 
@@ -33,7 +33,7 @@ describe Octokit::Client::PubSubHubbub::ServiceHooks do
     }
 
     it "unsubscribes to stop receiving events on specified topic" do
-      stub_post("https://api.github.com/hub?access_token=myfaketoken").
+      stub_post("/hub?access_token=myfaketoken").
         with(unsubscribe_request_body).
         to_return(:body => nil)
 

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("https://api.github.com/hub?access_token=myfaketoken").
+      stub_post("/hub?access_token=myfaketoken").
         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("https://api.github.com/hub?access_token=myfaketoken").
+      stub_post("/hub?access_token=myfaketoken").
         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("https://api.github.com/hub?access_token=myfaketoken").
+      stub_post("/hub?access_token=myfaketoken").
       with({
         :"hub.callback" => 'github://Travis?token=travistoken',
         :"hub.mode" => 'unsubscribe',

data/spec/octokit/client/pulls_spec.rb

@@ -10,7 +10,7 @@ describe Octokit::Client::Pulls do
   describe ".create_pull_request" do
 
     it "should create a pull request" do
-      stub_post("/api/v2/json/pulls/sferik/rails_admin").
+      stub_post("https://github.com/api/v2/json/pulls/sferik/rails_admin").
         with(:pull => {:base => "master", :head => "pengwynn:master", :title => "Title", :body => "Body"}).
         to_return(:body => fixture("v2/pulls.json"))
       issues = @client.create_pull_request("sferik/rails_admin", "master", "pengwynn:master", "Title", "Body")
@@ -22,7 +22,7 @@ describe Octokit::Client::Pulls do
   describe ".create_pull_request_for_issue" do
 
     it "should create a pull request and attach it to an existing issue" do
-      stub_post("/api/v2/json/pulls/pengwynn/octokit").
+      stub_post("https://github.com/api/v2/json/pulls/pengwynn/octokit").
         with(:pull => {:base => "master", :head => "pengwynn:master", :issue => "34"}).
         to_return(:body => fixture("v2/pulls.json"))
       issues = @client.create_pull_request_for_issue("pengwynn/octokit", "master", "pengwynn:master", "34")
@@ -34,7 +34,7 @@ describe Octokit::Client::Pulls do
   describe ".pull_requests" do
 
     it "should return all pull requests" do
-      stub_get("/api/v2/json/pulls/sferik/rails_admin/open").
+      stub_get("https://github.com/api/v2/json/pulls/sferik/rails_admin/open").
         to_return(:body => fixture("v2/pulls.json"))
       pulls = @client.pulls("sferik/rails_admin")
       pulls.first.number.should == 251
@@ -45,7 +45,7 @@ describe Octokit::Client::Pulls do
   describe ".pull_request" do
 
     it "should return a pull request" do
-      stub_get("/api/v2/json/pulls/sferik/rails_admin/251").
+      stub_get("https://github.com/api/v2/json/pulls/sferik/rails_admin/251").
         to_return(:body => fixture("v2/pull.json"))
       pull = @client.pull("sferik/rails_admin", 251)
       pull.number.should == 251

data/spec/octokit/client/repositories_spec.rb

@@ -10,7 +10,7 @@ describe Octokit::Client::Repositories do
   describe ".search_user" do
 
     it "should return matching repositories" do
-      stub_get("/api/v2/json/repos/search/One40Proof").
+      stub_get("https://github.com/api/v2/json/repos/search/One40Proof").
         to_return(:body => fixture("v2/repositories.json"))
       repositories = @client.search_repositories("One40Proof")
       repositories.first.name.should == "One40Proof"
@@ -21,8 +21,8 @@ describe Octokit::Client::Repositories do
   describe ".repository" do
 
     it "should return the matching repository" do
-      stub_get("/api/v2/json/repos/show/sferik/rails_admin").
-        to_return(:body => fixture("v2/repository.json"))
+      stub_get("/repos/sferik/rails_admin").
+        to_return(:body => fixture("v3/repository.json"))
       repository = @client.repository("sferik/rails_admin")
       repository.name.should == "rails_admin"
     end
@@ -33,10 +33,10 @@ describe Octokit::Client::Repositories do
 
     it "should update the matching repository" do
       description = "RailsAdmin is a Rails 3 engine that provides an easy-to-use interface for managing your data"
-      stub_post("/api/v2/json/repos/show/sferik/rails_admin").
-        with(:values => {:description => description}).
-        to_return(:body => fixture("v2/repository.json"))
-      repository = @client.update_repository("sferik/rails_admin", :description => description)
+      stub_patch("/repos/sferik/rails_admin").
+        with(:body => {:description => description}).
+        to_return(:body => fixture("v3/repository.json"))
+      repository = @client.edit_repository("sferik/rails_admin", :description => description)
       repository.description.should == description
     end
 
@@ -47,10 +47,10 @@ describe Octokit::Client::Repositories do
     context "with a username passed" do
 
       it "should return user's repositories" do
-        stub_get("/api/v2/json/repos/show/sferik").
-          to_return(:body => fixture("v2/repositories.json"))
+        stub_get("/users/sferik/repos").
+          to_return(:body => fixture("v3/repositories.json"))
         repositories = @client.repositories("sferik")
-        repositories.first.name.should == "One40Proof"
+        repositories.first.name.should == "merb-admin"
       end
 
     end
@@ -58,10 +58,10 @@ describe Octokit::Client::Repositories do
     context "without a username passed" do
 
       it "should return authenticated user's repositories" do
-        stub_get("/api/v2/json/repos/show/sferik").
-          to_return(:body => fixture("v2/repositories.json"))
+        stub_get("/user/repos").
+          to_return(:body => fixture("v3/repositories.json"))
         repositories = @client.repositories
-        repositories.first.name.should == "One40Proof"
+        repositories.first.name.should == "merb-admin"
       end
 
     end
@@ -71,10 +71,9 @@ describe Octokit::Client::Repositories do
   describe ".watch" do
 
     it "should watch a repository" do
-      stub_post("/api/v2/json/repos/watch/sferik/rails_admin").
-        to_return(:body => fixture("v2/repository.json"))
-      repository = @client.watch("sferik/rails_admin")
-      repository.name.should == "rails_admin"
+      stub_put("/user/watched/sferik/rails_admin").
+        to_return(:status => 204)
+      @client.watch("sferik/rails_admin").should == ''
     end
 
   end
@@ -82,10 +81,9 @@ describe Octokit::Client::Repositories do
   describe ".unwatch" do
 
     it "should unwatch a repository" do
-      stub_post("/api/v2/json/repos/unwatch/sferik/rails_admin").
-        to_return(:body => fixture("v2/repository.json"))
-      repository = @client.unwatch("sferik/rails_admin")
-      repository.name.should == "rails_admin"
+      stub_delete("/user/watched/sferik/rails_admin").
+        to_return(:status => 204)
+      @client.unwatch("sferik/rails_admin").should == ''
     end
 
   end
@@ -93,8 +91,8 @@ describe Octokit::Client::Repositories do
   describe ".fork" do
 
     it "should fork a repository" do
-      stub_post("/api/v2/json/repos/fork/sferik/rails_admin").
-        to_return(:body => fixture("v2/repository.json"))
+      stub_post("/repos/sferik/rails_admin/forks").
+        to_return(:body => fixture("v3/repository.json"))
       repository = @client.fork("sferik/rails_admin")
       repository.name.should == "rails_admin"
     end
@@ -104,9 +102,9 @@ describe Octokit::Client::Repositories do
   describe ".create_repository" do
 
     it "should create a repository" do
-      stub_post("/api/v2/json/repos/create").
+      stub_post("/user/repos").
         with(:name => "rails_admin").
-        to_return(:body => fixture("v2/repository.json"))
+        to_return(:body => fixture("v3/repository.json"))
       repository = @client.create_repository("rails_admin")
       repository.name.should == "rails_admin"
     end
@@ -116,7 +114,7 @@ describe Octokit::Client::Repositories do
   describe ".delete_repository" do
 
     it "should return a delete token" do
-      stub_post("/api/v2/json/repos/delete/sferik/rails_admin").
+      stub_post("https://github.com/api/v2/json/repos/delete/sferik/rails_admin").
         to_return(:body => fixture("v2/delete_token.json"))
       delete_token = @client.delete_repository("sferik/rails_admin")
       delete_token.should == "uhihwkkkzu"
@@ -127,9 +125,9 @@ describe Octokit::Client::Repositories do
   describe ".delete_repository!" do
 
     it "should delete a repository" do
-      stub_post("/api/v2/json/repos/delete/sferik/rails_admin").
+      stub_post("https://github.com/api/v2/json/repos/delete/sferik/rails_admin").
         to_return(:body => fixture("v2/delete_token.json"))
-      stub_post("/api/v2/json/repos/delete/sferik/rails_admin").
+      stub_post("https://github.com/api/v2/json/repos/delete/sferik/rails_admin").
         with(:delete_token => "uhihwkkkzu").
         to_return(:status => 204)
       @client.delete_repo!("sferik/rails_admin")
@@ -140,7 +138,7 @@ describe Octokit::Client::Repositories do
   describe ".delete_repository" do
 
     it "should return an error for non-existant repo" do
-      stub_post("/api/v2/json/repos/delete/sferik/rails_admin_failure").
+      stub_post("https://github.com/api/v2/json/repos/delete/sferik/rails_admin_failure").
         to_return(:body => fixture("v2/delete_failure.json"))
       response = @client.delete_repository("sferik/rails_admin_failure")
       response.error.should == "sferik/rails_admin_failure Repository not found"
@@ -151,8 +149,9 @@ describe Octokit::Client::Repositories do
   describe ".set_private" do
 
     it "should set a repository private" do
-      stub_post("/api/v2/json/repos/set/private/sferik/rails_admin").
-        to_return(:body => fixture("v2/repository.json"))
+      stub_patch("/repos/sferik/rails_admin").
+        with({ :name => "rails_admin", :public => false }).
+        to_return(:body => fixture("v3/repository.json"))
       repository = @client.set_private("sferik/rails_admin")
       repository.name.should == "rails_admin"
     end
@@ -162,8 +161,9 @@ describe Octokit::Client::Repositories do
   describe ".set_public" do
 
     it "should set a repository public" do
-      stub_post("/api/v2/json/repos/set/public/sferik/rails_admin").
-        to_return(:body => fixture("v2/repository.json"))
+      stub_patch("/repos/sferik/rails_admin").
+        with({ :name => "rails_admin", :public => false }).
+        to_return(:body => fixture("v3/repository.json"))
       repository = @client.set_public("sferik/rails_admin")
       repository.name.should == "rails_admin"
     end
@@ -173,8 +173,8 @@ describe Octokit::Client::Repositories do
   describe ".deploy_keys" do
 
     it "should return a repository's deploy keys" do
-      stub_get("/api/v2/json/repos/keys/sferik/rails_admin").
-        to_return(:body => fixture("v2/public_keys.json"))
+      stub_get("/repos/sferik/rails_admin/keys").
+        to_return(:body => fixture("v3/public_keys.json"))
       public_keys = @client.deploy_keys("sferik/rails_admin")
       public_keys.first.id.should == 103205
     end
@@ -184,11 +184,11 @@ describe Octokit::Client::Repositories do
   describe ".add_deploy_key" do
 
     it "should add a repository deploy keys" do
-      stub_post("/api/v2/json/repos/key/sferik/rails_admin/add").
-        with(: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("v2/public_keys.json"))
-      public_keys = @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")
-      public_keys.first.id.should == 103205
+      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"))
+      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")
+      public_key.id.should == 103205
     end
 
   end
@@ -196,11 +196,10 @@ describe Octokit::Client::Repositories do
   describe ".remove_deploy_key" do
 
     it "should remove a repository deploy keys" do
-      stub_post("/api/v2/json/repos/key/sferik/rails_admin/remove").
-        with(:id => 103205).
-        to_return(:body => fixture("v2/public_keys.json"))
-      public_keys = @client.remove_deploy_key("sferik/rails_admin", 103205)
-      public_keys.first.id.should == 103205
+      stub_delete("/repos/sferik/rails_admin/keys/#{103205}").
+        to_return(:status => 204)
+      result = @client.remove_deploy_key("sferik/rails_admin", 103205)
+      result.should == ''
     end
 
   end
@@ -208,10 +207,10 @@ describe Octokit::Client::Repositories do
   describe ".collaborators" do
 
     it "should return a repository's collaborators" do
-      stub_get("/api/v2/json/repos/show/sferik/rails_admin/collaborators").
-        to_return(:body => fixture("v2/collaborators.json"))
+      stub_get("/repos/sferik/rails_admin/collaborators").
+        to_return(:body => fixture("v3/collaborators.json"))
       collaborators = @client.collaborators("sferik/rails_admin")
-      collaborators.first.should == "sferik"
+      collaborators.first.login.should == "sferik"
     end
 
   end
@@ -219,10 +218,10 @@ describe Octokit::Client::Repositories do
   describe ".add_collaborator" do
 
     it "should add a repository collaborators" do
-      stub_post("/api/v2/json/repos/collaborators/sferik/rails_admin/add/sferik").
-        to_return(:body => fixture("v2/collaborators.json"))
-      collaborators = @client.add_collaborator("sferik/rails_admin", "sferik")
-      collaborators.first.should == "sferik"
+      stub_put("/repos/sferik/rails_admin/collaborators/sferik").
+        to_return(:status => 204)
+      result = @client.add_collaborator("sferik/rails_admin", "sferik")
+      result.should == ''
     end
 
   end
@@ -230,10 +229,10 @@ describe Octokit::Client::Repositories do
   describe ".remove_collaborator" do
 
     it "should remove a repository collaborators" do
-      stub_post("/api/v2/json/repos/collaborators/sferik/rails_admin/remove/sferik").
-        to_return(:body => fixture("v2/collaborators.json"))
-      collaborators = @client.remove_collaborator("sferik/rails_admin", "sferik")
-      collaborators.first.should == "sferik"
+      stub_delete("/repos/sferik/rails_admin/collaborators/sferik").
+        to_return(:status => 204)
+      result = @client.remove_collaborator("sferik/rails_admin", "sferik")
+      result.should == ''
     end
 
   end
@@ -241,7 +240,7 @@ describe Octokit::Client::Repositories do
   describe ".pushable" do
 
     it "should return all pushable repositories" do
-      stub_get("/api/v2/json/repos/pushable").
+      stub_get("https://github.com/api/v2/json/repos/pushable").
         to_return(:body => fixture("v2/repositories.json"))
       repositories = @client.pushable
       repositories.first.name.should == "One40Proof"
@@ -252,8 +251,8 @@ describe Octokit::Client::Repositories do
   describe ".repository_teams" do
 
     it "should return all repository teams" do
-      stub_get("/api/v2/json/repos/show/codeforamerica/open311/teams").
-        to_return(:body => fixture("v2/teams.json"))
+      stub_get("/repos/codeforamerica/open311/teams").
+        to_return(:body => fixture("v3/teams.json"))
       teams = @client.repository_teams("codeforamerica/open311")
       teams.first.name.should == "Fellows"
     end
@@ -265,10 +264,10 @@ describe Octokit::Client::Repositories do
     context "with anonymous users" do
 
       it "should return all repository contributors" do
-        stub_get("/api/v2/json/repos/show/sferik/rails_admin/contributors/anon").
-          to_return(:body => fixture("v2/contributors.json"))
+        stub_get("/repos/sferik/rails_admin/contributors?anon=true").
+          to_return(:body => fixture("v3/contributors.json"))
         contributors = @client.contributors("sferik/rails_admin", true)
-        contributors.first.name.should == "Erik Michaels-Ober"
+        contributors.first.login.should == "sferik"
       end
 
     end
@@ -276,10 +275,10 @@ describe Octokit::Client::Repositories do
     context "without anonymous users" do
 
       it "should return all repository contributors" do
-        stub_get("/api/v2/json/repos/show/sferik/rails_admin/contributors").
-          to_return(:body => fixture("v2/contributors.json"))
+        stub_get("/repos/sferik/rails_admin/contributors?anon=false").
+          to_return(:body => fixture("v3/contributors.json"))
         contributors = @client.contributors("sferik/rails_admin")
-        contributors.first.name.should == "Erik Michaels-Ober"
+        contributors.first.login.should == "sferik"
       end
 
     end
@@ -289,10 +288,10 @@ describe Octokit::Client::Repositories do
   describe ".watchers" do
 
     it "should return all repository watchers" do
-      stub_get("/api/v2/json/repos/show/sferik/rails_admin/watchers").
-        to_return(:body => fixture("v2/watchers.json"))
+      stub_get("/repos/sferik/rails_admin/watchers").
+        to_return(:body => fixture("v3/watchers.json"))
       watchers = @client.watchers("sferik/rails_admin")
-      watchers.first.should == "sferik"
+      watchers.first.login.should == "sferik"
     end
 
   end
@@ -300,10 +299,10 @@ describe Octokit::Client::Repositories do
   describe ".network" do
 
     it "should return a repository's network" do
-      stub_get("/api/v2/json/repos/show/sferik/rails_admin/network").
-        to_return(:body => fixture("v2/network.json"))
+      stub_get("/repos/sferik/rails_admin/forks").
+        to_return(:body => fixture("v3/forks.json"))
       network = @client.network("sferik/rails_admin")
-      network.first.owner.should == "sferik"
+      network.first.owner.login.should == "digx"
     end
 
   end
@@ -311,10 +310,10 @@ describe Octokit::Client::Repositories do
   describe ".languages" do
 
     it "should return a repository's languages" do
-      stub_get("/api/v2/json/repos/show/sferik/rails_admin/languages").
-        to_return(:body => fixture("v2/languages.json"))
+      stub_get("/repos/sferik/rails_admin/languages").
+        to_return(:body => fixture("v3/languages.json"))
       languages = @client.languages("sferik/rails_admin")
-      languages["Ruby"].should == 205046
+      languages["Ruby"].should == 345701
     end
 
   end
@@ -322,10 +321,11 @@ describe Octokit::Client::Repositories do
   describe ".tags" do
 
     it "should return a repository's tags" do
-      stub_get("/api/v2/json/repos/show/pengwynn/octokit/tags").
-        to_return(:body => fixture("v2/tags.json"))
+      stub_get("/repos/pengwynn/octokit/tags").
+        to_return(:body => fixture("v3/tags.json"))
       tags = @client.tags("pengwynn/octokit")
-      tags["v0.0.1"].should == "0d7a03f2035ecd74e4d6eb9be58865c2a688ee55"
+      v0_6_4 = tags.find { |tag| tag.name == "v0.6.4" }
+      v0_6_4.commit.sha.should == "09bcc30e7286eeb1bbde68d0ace7a6b90b1a84a2"
     end
 
   end
@@ -333,10 +333,11 @@ describe Octokit::Client::Repositories do
   describe ".branches" do
 
     it "should return a repository's branches" do
-      stub_get("/api/v2/json/repos/show/pengwynn/octokit/branches").
-        to_return(:body => fixture("v2/branches.json"))
+      stub_get("/repos/pengwynn/octokit/branches").
+        to_return(:body => fixture("v3/branches.json"))
       branches = @client.branches("pengwynn/octokit")
-      branches["master"].should == "4d9a9e9ca183bab1c3d0accf1d53edd85bd6200f"
+      master = branches.find { |branch| branch.name == "master" }
+      master.commit.sha.should == "88553a397f7293b3ba176dc27cd1ab6bb93d5d14"
     end
 
   end

data/spec/octokit/client/timelines_spec.rb

@@ -1,7 +1,7 @@
 # -*- encoding: utf-8 -*-
 require 'helper'
 
-describe Octokit::Client::Users do
+describe Octokit::Client::Timelines do
 
   describe ".timeline" do
 
@@ -28,8 +28,8 @@ describe Octokit::Client::Users do
     context "when authenticated" do
 
       it "should return a user timeline" do
-        client = Octokit::Client.new(:login => "sferik", :token => "OU812")
-        stub_get("https://github.com/sferik.private.json?token=OU812").
+        client = Octokit::Client.new(:login => "sferik", :password => "sekret")
+        stub_get("https://github.com/sferik.private.json").
           to_return(:body => fixture("timeline.json"))
         events = client.user_timeline("sferik")
         events.first.repository.name.should == "homebrew"