octokit 0.6.2 → 0.6.3

data/spec/helper.rb

@@ -55,10 +55,10 @@ def github_url(url)
   if url =~ /^http/
     url
   elsif @client && @client.authenticated?
-    "https://pengwynn%2Ftoken:OU812@github.com/api/v#{Octokit.version}/#{Octokit.format}/#{url}"
+    "https://pengwynn%2Ftoken:OU812@github.com/api/v2/json/#{url}"
   elsif @client && @client.oauthed?
-    "https://github.com/api/v#{Octokit.version}/#{Octokit.format}/#{url}?access_token=#{@client.oauth_token}"
+    "https://github.com/api/v2/json/#{url}?access_token=#{@client.oauth_token}"
   else
-    "https://github.com/api/v#{Octokit.version}/#{Octokit.format}/#{url}"
+    "https://github.com/api/v2/json/#{url}"
   end
 end

data/spec/octokit/client/commits_spec.rb

@@ -11,7 +11,7 @@ describe Octokit::Client::Pulls do
 
     it "should return all commits" do
       stub_get("commits/list/sferik/rails_admin/master").
-        to_return(:body => fixture("commits.json"))
+        to_return(:body => fixture("v2/commits.json"))
       commits = @client.commits("sferik/rails_admin")
       commits.first.author.login.should == "caboteria"
     end
@@ -22,7 +22,7 @@ describe Octokit::Client::Pulls do
 
     it "should return a commit" do
       stub_get("commits/show/sferik/rails_admin/3cdfabd973bc3caac209cba903cfdb3bf6636bcd").
-        to_return(:body => fixture("commit.json"))
+        to_return(:body => fixture("v2/commit.json"))
       commit = @client.commit("sferik/rails_admin", "3cdfabd973bc3caac209cba903cfdb3bf6636bcd")
       commit.first.author.login.should == "caboteria"
     end

data/spec/octokit/client/issues_spec.rb

@@ -11,18 +11,19 @@ describe Octokit::Client::Issues do
 
     it "should return matching issues" do
       stub_get("issues/search/sferik/rails_admin/open/activerecord").
-        to_return(:body => fixture("issues.json"))
+      to_return(:body => fixture("v2/issues.json"))
       issues = @client.search_issues("sferik/rails_admin", "activerecord")
       issues.first.number.should == 105
     end
 
   end
 
-  describe ".issues" do
+  describe ".list_issues" do
 
     it "should return issues" do
-      stub_get("issues/list/sferik/rails_admin/open").
-        to_return(:body => fixture("issues.json"))
+
+     stub_get("https://github.com/api/v2/json/issues/list/sferik/rails_admin/open").
+        to_return(:body => fixture("v2/issues.json"))
       issues = @client.issues("sferik/rails_admin")
       issues.first.number.should == 105
     end
@@ -30,13 +31,22 @@ describe Octokit::Client::Issues do
   end
 
   describe ".issues_labeled" do
-
     it "should return issues with a particular label" do
       stub_get("issues/list/sferik/rails_admin/label/bug").
-        to_return(:body => fixture("issues.json"))
+        to_return(:body => fixture("v2/issues.json"))
       issues = @client.issues_labeled("sferik/rails_admin", "bug")
       issues.first.number.should == 105
     end
+  end
+
+  describe ".create_issue" do
+
+    it "should create an issue" do
+      stub_post("issues/open/sferik/rails_admin").
+        to_return(:body => fixture("v2/issue.json"))
+      issue = @client.create_issue("sferik/rails_admin", "Use OrmAdapter instead of talking directly to ActiveRecord", "Hi,\n\nI just tried to play with this in an app with no ActiveRecord.  I was disappointed.  It seems the only reason the engine relies on AR is to provide History functionality.  I would argue that having the History in a database, and therefore tying the app to AR & SQL, isn't worth it.  How about we change it to just dump to a CSV and remove the AR dep?\n\n$0.02")
+      issue.number.should == 105
+    end
 
   end
 
@@ -44,7 +54,7 @@ describe Octokit::Client::Issues do
 
     it "should return an issue" do
       stub_get("issues/show/sferik/rails_admin/105").
-        to_return(:body => fixture("issue.json"))
+        to_return(:body => fixture("v2/issue.json"))
       issue = @client.issue("sferik/rails_admin", 105)
       issue.number.should == 105
     end
@@ -55,29 +65,18 @@ describe Octokit::Client::Issues do
 
     it "should return comments for an issue" do
       stub_get("issues/comments/sferik/rails_admin/105").
-        to_return(:body => fixture("comments.json"))
+        to_return(:body => fixture("v2/comments.json"))
       comments = @client.issue_comments("sferik/rails_admin", 105)
       comments.first.user.should == "jackdempsey"
     end
 
   end
 
-  describe ".create_issue" do
-
-    it "should create an issue" do
-      stub_post("issues/open/sferik/rails_admin").
-        to_return(:body => fixture("issue.json"))
-      issue = @client.create_issue("sferik/rails_admin", "Use OrmAdapter instead of talking directly to ActiveRecord", "Hi,\n\nI just tried to play with this in an app with no ActiveRecord.  I was disappointed.  It seems the only reason the engine relies on AR is to provide History functionality.  I would argue that having the History in a database, and therefore tying the app to AR & SQL, isn't worth it.  How about we change it to just dump to a CSV and remove the AR dep?\n\n$0.02")
-      issue.number.should == 105
-    end
-
-  end
-
   describe ".close_issue" do
 
     it "should close an issue" do
       stub_post("issues/close/sferik/rails_admin/105").
-        to_return(:body => fixture("issue.json"))
+        to_return(:body => fixture("v2/issue.json"))
       issue = @client.close_issue("sferik/rails_admin", 105)
       issue.number.should == 105
     end
@@ -88,7 +87,7 @@ describe Octokit::Client::Issues do
 
     it "should reopen an issue" do
       stub_post("issues/reopen/sferik/rails_admin/105").
-        to_return(:body => fixture("issue.json"))
+        to_return(:body => fixture("v2/issue.json"))
       issue = @client.reopen_issue("sferik/rails_admin", 105)
       issue.number.should == 105
     end
@@ -99,7 +98,7 @@ describe Octokit::Client::Issues do
 
     it "should update an issue" do
       stub_post("issues/edit/sferik/rails_admin/105").
-        to_return(:body => fixture("issue.json"))
+        to_return(:body => fixture("v2/issue.json"))
       issue = @client.update_issue("sferik/rails_admin", 105, "Use OrmAdapter instead of talking directly to ActiveRecord", "Hi,\n\nI just tried to play with this in an app with no ActiveRecord.  I was disappointed.  It seems the only reason the engine relies on AR is to provide History functionality.  I would argue that having the History in a database, and therefore tying the app to AR & SQL, isn't worth it.  How about we change it to just dump to a CSV and remove the AR dep?\n\n$0.02")
       issue.number.should == 105
     end
@@ -110,7 +109,7 @@ describe Octokit::Client::Issues do
 
     it "should return labels" do
       stub_get("issues/labels/sferik/rails_admin").
-        to_return(:body => fixture("labels.json"))
+        to_return(:body => fixture("v2/labels.json"))
       labels = @client.labels("sferik/rails_admin")
       labels.first.should == "bug"
     end
@@ -121,7 +120,7 @@ describe Octokit::Client::Issues do
 
     it "should add a label" do
       stub_post("issues/label/add/sferik/rails_admin/bug").
-        to_return(:body => fixture("labels.json"))
+        to_return(:body => fixture("v2/labels.json"))
       labels = @client.add_label("sferik/rails_admin", "bug")
       labels.first.should == "bug"
     end
@@ -132,7 +131,7 @@ describe Octokit::Client::Issues do
 
     it "should remove a label" do
       stub_post("issues/label/remove/sferik/rails_admin/bug").
-        to_return(:body => fixture("labels.json"))
+        to_return(:body => fixture("v2/labels.json"))
       labels = @client.remove_label("sferik/rails_admin", "bug")
       labels.first.should == "bug"
     end
@@ -144,7 +143,7 @@ describe Octokit::Client::Issues do
     it "should add a comment" do
       stub_post("issues/comment/sferik/rails_admin/105").
         with(:comment => "I don't think I'd like it in a CSV for a variety of reasons, but I do agree that it doesn't have to be AR. I would imagine if there was a patch and work done towards allowing a pluggable History model, it'd be at least considered. I don't have the time at the moment to do this, but I'd imagine you could start with abstracting out the calls to read/write History, ultimately allowing for a drop in of any storage structure. \r\n\r\nIn fact, it might be interesting to leverage wycats moneta towards this end: http://github.com/wycats/moneta").
-        to_return(:body => fixture("comment.json"))
+        to_return(:body => fixture("v2/comment.json"))
       comment = @client.add_comment("sferik/rails_admin", 105, "I don't think I'd like it in a CSV for a variety of reasons, but I do agree that it doesn't have to be AR. I would imagine if there was a patch and work done towards allowing a pluggable History model, it'd be at least considered. I don't have the time at the moment to do this, but I'd imagine you could start with abstracting out the calls to read/write History, ultimately allowing for a drop in of any storage structure. \r\n\r\nIn fact, it might be interesting to leverage wycats moneta towards this end: http://github.com/wycats/moneta")
       comment.user.should == "jackdempsey"
     end

data/spec/octokit/client/network_spec.rb

@@ -11,7 +11,7 @@ describe Octokit::Client::Network do
 
     it "should return network meta" do
       stub_get("https://github.com/sferik/rails_admin/network_meta").
-        to_return(:body => fixture("network_meta.json"))
+        to_return(:body => fixture("v2/network_meta.json"))
       network_meta = @client.network_meta("sferik/rails_admin")
       network_meta.blocks.first.name.should == "sferik"
     end
@@ -22,7 +22,7 @@ describe Octokit::Client::Network do
 
     it "should return network data" do
       stub_get("https://github.com/sferik/rails_admin/network_data_chunk").
-        to_return(:body => fixture("network_data.json"))
+        to_return(:body => fixture("v2/network_data.json"))
       network_data = @client.network_data("sferik/rails_admin")
       network_data.first.login.should == "rosenfeld"
     end

data/spec/octokit/client/objects_spec.rb

@@ -11,7 +11,7 @@ describe Octokit::Client::Objects do
 
     it "should return a tree" do
       stub_get("tree/show/sferik/rails_admin/3cdfabd973bc3caac209cba903cfdb3bf6636bcd").
-        to_return(:body => fixture("tree.json"))
+        to_return(:body => fixture("v2/tree.json"))
       tree = @client.tree("sferik/rails_admin", "3cdfabd973bc3caac209cba903cfdb3bf6636bcd")
       tree.first.name.should == ".gitignore"
     end
@@ -22,7 +22,7 @@ describe Octokit::Client::Objects do
 
     it "should return a blob" do
       stub_get("blob/show/sferik/rails_admin/3cdfabd973bc3caac209cba903cfdb3bf6636bcd/README.mkd").
-        to_return(:body => fixture("blob.json"))
+        to_return(:body => fixture("v2/blob.json"))
       blob = @client.blob("sferik/rails_admin", "3cdfabd973bc3caac209cba903cfdb3bf6636bcd", "README.mkd")
       blob.name.should == "README.mkd"
     end
@@ -33,7 +33,7 @@ describe Octokit::Client::Objects do
 
     it "should return blobs" do
       stub_get("blob/all/sferik/rails_admin/3cdfabd973bc3caac209cba903cfdb3bf6636bcd").
-        to_return(:body => fixture("blobs.json"))
+        to_return(:body => fixture("v2/blobs.json"))
       blobs = @client.blobs("sferik/rails_admin", "3cdfabd973bc3caac209cba903cfdb3bf6636bcd")
       blobs[".gitignore"].should == "5efe0eb47a773fa6ea84a0bf190ee218b6a31ead"
     end
@@ -44,7 +44,7 @@ describe Octokit::Client::Objects do
 
     it "should return blob metadata" do
       stub_get("blob/full/sferik/rails_admin/3cdfabd973bc3caac209cba903cfdb3bf6636bcd").
-        to_return(:body => fixture("blob_metadata.json"))
+        to_return(:body => fixture("v2/blob_metadata.json"))
       blob_metadata = @client.blob_metadata("sferik/rails_admin", "3cdfabd973bc3caac209cba903cfdb3bf6636bcd")
       blob_metadata.first.name.should == ".gitignore"
     end
@@ -55,7 +55,7 @@ describe Octokit::Client::Objects do
 
     it "should return tree metadata" do
       stub_get("tree/full/sferik/rails_admin/3cdfabd973bc3caac209cba903cfdb3bf6636bcd").
-        to_return(:body => fixture("tree_metadata.json"))
+        to_return(:body => fixture("v2/tree_metadata.json"))
       tree_metadata = @client.tree_metadata("sferik/rails_admin", "3cdfabd973bc3caac209cba903cfdb3bf6636bcd")
       tree_metadata.first.name.should == ".gitignore"
     end
@@ -66,14 +66,11 @@ describe Octokit::Client::Objects do
 
     it "should return raw data" do
       stub_get("blob/show/sferik/rails_admin/3cdfabd973bc3caac209cba903cfdb3bf6636bcd").
-        to_return(:body => fixture("raw.txt"))
+        to_return(:body => fixture("v2/raw.txt"))
       raw = @client.raw("sferik/rails_admin", "3cdfabd973bc3caac209cba903cfdb3bf6636bcd")
       lambda {
         ::MultiJson.decode(raw)
       }.should raise_error
-      lambda {
-        ::MultiXml.decode(raw)
-      }.should raise_error
     end
 
   end

data/spec/octokit/client/organizations_spec.rb

@@ -11,7 +11,7 @@ describe Octokit::Client::Organizations do
 
     it "should return an organization" do
       stub_get("organizations/codeforamerica").
-        to_return(:body => fixture("organization.json"))
+        to_return(:body => fixture("v2/organization.json"))
       organization = @client.organization("codeforamerica")
       organization.name.should == "Code For America"
     end
@@ -23,7 +23,7 @@ describe Octokit::Client::Organizations do
     it "should update an organization" do
       stub_put("organizations/codeforamerica").
         with(:name => "Code For America").
-        to_return(:body => fixture("organization.json"))
+        to_return(:body => fixture("v2/organization.json"))
       organization = @client.update_organization("codeforamerica", {:name => "Code For America"})
       organization.name.should == "Code For America"
     end
@@ -36,7 +36,7 @@ describe Octokit::Client::Organizations do
 
       it "should return all organizations for a user" do
         stub_get("user/show/sferik/organizations").
-          to_return(:body => fixture("organizations.json"))
+          to_return(:body => fixture("v2/organizations.json"))
         organizations = @client.organizations("sferik")
         organizations.first.name.should == "Hubcap"
       end
@@ -47,7 +47,7 @@ describe Octokit::Client::Organizations do
 
       it "should return all organizations for a user" do
         stub_get("organizations").
-          to_return(:body => fixture("organizations.json"))
+          to_return(:body => fixture("v2/organizations.json"))
         organizations = @client.organizations
         organizations.first.name.should == "Hubcap"
       end
@@ -62,7 +62,7 @@ describe Octokit::Client::Organizations do
 
       it "should return all public repositories for an organization" do
         stub_get("organizations/codeforamerica/public_repositories").
-          to_return(:body => fixture("repositories.json"))
+          to_return(:body => fixture("v2/repositories.json"))
         repositories = @client.organization_repositories("codeforamerica")
         repositories.first.name.should == "One40Proof"
       end
@@ -73,7 +73,7 @@ describe Octokit::Client::Organizations do
 
       it "should return all organization repositories for a user" do
         stub_get("organizations/repositories").
-          to_return(:body => fixture("repositories.json"))
+          to_return(:body => fixture("v2/repositories.json"))
         repositories = @client.organization_repositories
         repositories.first.name.should == "One40Proof"
       end
@@ -86,7 +86,7 @@ describe Octokit::Client::Organizations do
 
     it "should return all public members of an organization" do
       stub_get("organizations/codeforamerica/public_members").
-        to_return(:body => fixture("users.json"))
+        to_return(:body => fixture("v2/users.json"))
       users = @client.organization_members("codeforamerica")
       users.first.name.should == "Erik Michaels-Ober"
     end
@@ -97,7 +97,7 @@ describe Octokit::Client::Organizations do
 
     it "should return all teams for an organization" do
       stub_get("organizations/codeforamerica/teams").
-        to_return(:body => fixture("teams.json"))
+        to_return(:body => fixture("v2/teams.json"))
       teams = @client.organization_teams("codeforamerica")
       teams.first.name.should == "Fellows"
     end
@@ -109,7 +109,7 @@ describe Octokit::Client::Organizations do
     it "should create a team" do
       stub_post("organizations/codeforamerica/teams").
         with(:name => "Fellows").
-        to_return(:body => fixture("team.json"))
+        to_return(:body => fixture("v2/team.json"))
       team = @client.create_team("codeforamerica", {:name => "Fellows"})
       team.name.should == "Fellows"
     end
@@ -120,7 +120,7 @@ describe Octokit::Client::Organizations do
 
     it "should return a team" do
       stub_get("teams/32598").
-        to_return(:body => fixture("team.json"))
+        to_return(:body => fixture("v2/team.json"))
       team = @client.team(32598)
       team.name.should == "Fellows"
     end
@@ -132,7 +132,7 @@ describe Octokit::Client::Organizations do
     it "should update a team" do
       stub_put("teams/32598").
         with(:name => "Fellows").
-        to_return(:body => fixture("team.json"))
+        to_return(:body => fixture("v2/team.json"))
       team = @client.update_team(32598, :name => "Fellows")
       team.name.should == "Fellows"
     end
@@ -143,7 +143,7 @@ describe Octokit::Client::Organizations do
 
     it "should delete a team" do
       stub_delete("teams/32598").
-        to_return(:body => fixture("team.json"))
+        to_return(:body => fixture("v2/team.json"))
       team = @client.delete_team(32598)
       team.name.should == "Fellows"
     end
@@ -154,7 +154,7 @@ describe Octokit::Client::Organizations do
 
     it "should delete a team" do
       stub_delete("teams/32598").
-        to_return(:body => fixture("team.json"))
+        to_return(:body => fixture("v2/team.json"))
       team = @client.delete_team(32598)
       team.name.should == "Fellows"
     end
@@ -165,7 +165,7 @@ describe Octokit::Client::Organizations do
 
     it "should return team members" do
       stub_get("teams/32598/members").
-        to_return(:body => fixture("users.json"))
+        to_return(:body => fixture("v2/users.json"))
       users = @client.team_members(32598)
       users.first.name.should == "Erik Michaels-Ober"
     end
@@ -177,7 +177,7 @@ describe Octokit::Client::Organizations do
     it "should add a team member" do
       stub_post("teams/32598/members").
         with(:name => "sferik").
-        to_return(:body => fixture("user.json"))
+        to_return(:body => fixture("v2/user.json"))
       user = @client.add_team_member(32598, "sferik")
       user.name.should == "Erik Michaels-Ober"
     end
@@ -189,7 +189,7 @@ describe Octokit::Client::Organizations do
     it "should remove a team member" do
       stub_delete("teams/32598/members").
         with(:query => {:name => "sferik"}).
-        to_return(:body => fixture("user.json"))
+        to_return(:body => fixture("v2/user.json"))
       user = @client.remove_team_member(32598, "sferik")
       user.name.should == "Erik Michaels-Ober"
     end
@@ -200,7 +200,7 @@ describe Octokit::Client::Organizations do
 
     it "should return team repositories" do
       stub_get("teams/32598/repositories").
-        to_return(:body => fixture("repositories.json"))
+        to_return(:body => fixture("v2/repositories.json"))
       repositories = @client.team_repositories(32598)
       repositories.first.name.should == "One40Proof"
     end
@@ -212,7 +212,7 @@ describe Octokit::Client::Organizations do
     it "should add a team repository" do
       stub_post("teams/32598/repositories").
         with(:name => "reddavis/One40Proof").
-        to_return(:body => fixture("repositories.json"))
+        to_return(:body => fixture("v2/repositories.json"))
       repositories = @client.add_team_repository(32598, "reddavis/One40Proof")
       repositories.first.name.should == "One40Proof"
     end
@@ -224,7 +224,7 @@ describe Octokit::Client::Organizations do
     it "should remove a team repository" do
       stub_delete("teams/32598/repositories").
         with(:query => {:name => "reddavis/One40Proof"}).
-        to_return(:body => fixture("repositories.json"))
+        to_return(:body => fixture("v2/repositories.json"))
       repositories = @client.remove_team_repository(32598, "reddavis/One40Proof")
       repositories.first.name.should == "One40Proof"
     end

data/spec/octokit/client/pulls_spec.rb

@@ -12,7 +12,7 @@ describe Octokit::Client::Pulls do
     it "should create a pull request" do
       stub_post("pulls/sferik/rails_admin").
         with(:pull => {:base => "master", :head => "pengwynn:master", :title => "Title", :body => "Body"}).
-        to_return(:body => fixture("pulls.json"))
+        to_return(:body => fixture("v2/pulls.json"))
       issues = @client.create_pull_request("sferik/rails_admin", "master", "pengwynn:master", "Title", "Body")
       issues.first.number.should == 251
     end
@@ -23,7 +23,7 @@ describe Octokit::Client::Pulls do
 
     it "should return all pull requests" do
       stub_get("pulls/sferik/rails_admin/open").
-        to_return(:body => fixture("pulls.json"))
+        to_return(:body => fixture("v2/pulls.json"))
       pulls = @client.pulls("sferik/rails_admin")
       pulls.first.number.should == 251
     end
@@ -34,7 +34,7 @@ describe Octokit::Client::Pulls do
 
     it "should return a pull request" do
       stub_get("pulls/sferik/rails_admin/251").
-        to_return(:body => fixture("pull.json"))
+        to_return(:body => fixture("v2/pull.json"))
       pull = @client.pull("sferik/rails_admin", 251)
       pull.number.should == 251
     end

data/spec/octokit/client/repositories_spec.rb

@@ -11,7 +11,7 @@ describe Octokit::Client::Repositories do
 
     it "should return matching repositories" do
       stub_get("repos/search/One40Proof").
-        to_return(:body => fixture("repositories.json"))
+        to_return(:body => fixture("v2/repositories.json"))
       repositories = @client.search_repositories("One40Proof")
       repositories.first.name.should == "One40Proof"
     end
@@ -22,7 +22,7 @@ describe Octokit::Client::Repositories do
 
     it "should return the matching repository" do
       stub_get("repos/show/sferik/rails_admin").
-        to_return(:body => fixture("repository.json"))
+        to_return(:body => fixture("v2/repository.json"))
       repository = @client.repository("sferik/rails_admin")
       repository.name.should == "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_post("repos/show/sferik/rails_admin").
         with(:values => {:description => description}).
-        to_return(:body => fixture("repository.json"))
+        to_return(:body => fixture("v2/repository.json"))
       repository = @client.update_repository("sferik/rails_admin", :description => description)
       repository.description.should == description
     end
@@ -48,7 +48,7 @@ describe Octokit::Client::Repositories do
 
       it "should return user's repositories" do
         stub_get("repos/show/sferik").
-          to_return(:body => fixture("repositories.json"))
+          to_return(:body => fixture("v2/repositories.json"))
         repositories = @client.repositories("sferik")
         repositories.first.name.should == "One40Proof"
       end
@@ -59,7 +59,7 @@ describe Octokit::Client::Repositories do
 
       it "should return authenticated user's repositories" do
         stub_get("repos/show/sferik").
-          to_return(:body => fixture("repositories.json"))
+          to_return(:body => fixture("v2/repositories.json"))
         repositories = @client.repositories
         repositories.first.name.should == "One40Proof"
       end
@@ -72,7 +72,7 @@ describe Octokit::Client::Repositories do
 
     it "should watch a repository" do
       stub_post("repos/watch/sferik/rails_admin").
-        to_return(:body => fixture("repository.json"))
+        to_return(:body => fixture("v2/repository.json"))
       repository = @client.watch("sferik/rails_admin")
       repository.name.should == "rails_admin"
     end
@@ -83,7 +83,7 @@ describe Octokit::Client::Repositories do
 
     it "should unwatch a repository" do
       stub_post("repos/unwatch/sferik/rails_admin").
-        to_return(:body => fixture("repository.json"))
+        to_return(:body => fixture("v2/repository.json"))
       repository = @client.unwatch("sferik/rails_admin")
       repository.name.should == "rails_admin"
     end
@@ -94,7 +94,7 @@ describe Octokit::Client::Repositories do
 
     it "should fork a repository" do
       stub_post("repos/fork/sferik/rails_admin").
-        to_return(:body => fixture("repository.json"))
+        to_return(:body => fixture("v2/repository.json"))
       repository = @client.fork("sferik/rails_admin")
       repository.name.should == "rails_admin"
     end
@@ -106,7 +106,7 @@ describe Octokit::Client::Repositories do
     it "should create a repository" do
       stub_post("repos/create").
         with(:name => "rails_admin").
-        to_return(:body => fixture("repository.json"))
+        to_return(:body => fixture("v2/repository.json"))
       repository = @client.create_repository("rails_admin")
       repository.name.should == "rails_admin"
     end
@@ -117,20 +117,33 @@ describe Octokit::Client::Repositories do
 
     it "should return a delete token" do
       stub_post("repos/delete/sferik/rails_admin").
-        to_return(:body => fixture("delete_token.json"))
+        to_return(:body => fixture("v2/delete_token.json"))
       delete_token = @client.delete_repository("sferik/rails_admin")
       delete_token.should == "uhihwkkkzu"
     end
 
   end
 
-  describe ".delete_repository" do
+  describe ".delete_repository!" do
 
     it "should delete a repository" do
       stub_post("repos/delete/sferik/rails_admin").
-        to_return(:body => fixture("repository.json"))
-      repository = @client.delete_repository("sferik/rails_admin")
-      repository.name.should == "rails_admin"
+        to_return(:body => fixture("v2/delete_token.json"))
+      stub_post("repos/delete/sferik/rails_admin").
+        with(:delete_token => "uhihwkkkzu").
+        to_return(:status => 204)
+      @client.delete_repo!("sferik/rails_admin")
+    end
+
+  end
+
+  describe ".delete_repository" do
+
+    it "should return an error for non-existant repo" do
+      stub_post("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"
     end
 
   end
@@ -139,7 +152,7 @@ describe Octokit::Client::Repositories do
 
     it "should set a repository private" do
       stub_post("repos/set/private/sferik/rails_admin").
-        to_return(:body => fixture("repository.json"))
+        to_return(:body => fixture("v2/repository.json"))
       repository = @client.set_private("sferik/rails_admin")
       repository.name.should == "rails_admin"
     end
@@ -150,7 +163,7 @@ describe Octokit::Client::Repositories do
 
     it "should set a repository public" do
       stub_post("repos/set/public/sferik/rails_admin").
-        to_return(:body => fixture("repository.json"))
+        to_return(:body => fixture("v2/repository.json"))
       repository = @client.set_public("sferik/rails_admin")
       repository.name.should == "rails_admin"
     end
@@ -161,7 +174,7 @@ describe Octokit::Client::Repositories do
 
     it "should return a repository's deploy keys" do
       stub_get("repos/keys/sferik/rails_admin").
-        to_return(:body => fixture("public_keys.json"))
+        to_return(:body => fixture("v2/public_keys.json"))
       public_keys = @client.deploy_keys("sferik/rails_admin")
       public_keys.first.id.should == 103205
     end
@@ -173,7 +186,7 @@ describe Octokit::Client::Repositories do
     it "should add a repository deploy keys" do
       stub_post("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("public_keys.json"))
+        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
     end
@@ -185,7 +198,7 @@ describe Octokit::Client::Repositories do
     it "should remove a repository deploy keys" do
       stub_post("repos/key/sferik/rails_admin/remove").
         with(:id => 103205).
-        to_return(:body => fixture("public_keys.json"))
+        to_return(:body => fixture("v2/public_keys.json"))
       public_keys = @client.remove_deploy_key("sferik/rails_admin", 103205)
       public_keys.first.id.should == 103205
     end
@@ -196,7 +209,7 @@ describe Octokit::Client::Repositories do
 
     it "should return a repository's collaborators" do
       stub_get("repos/show/sferik/rails_admin/collaborators").
-        to_return(:body => fixture("collaborators.json"))
+        to_return(:body => fixture("v2/collaborators.json"))
       collaborators = @client.collaborators("sferik/rails_admin")
       collaborators.first.should == "sferik"
     end
@@ -207,7 +220,7 @@ describe Octokit::Client::Repositories do
 
     it "should add a repository collaborators" do
       stub_post("repos/collaborators/sferik/rails_admin/add/sferik").
-        to_return(:body => fixture("collaborators.json"))
+        to_return(:body => fixture("v2/collaborators.json"))
       collaborators = @client.add_collaborator("sferik/rails_admin", "sferik")
       collaborators.first.should == "sferik"
     end
@@ -218,7 +231,7 @@ describe Octokit::Client::Repositories do
 
     it "should remove a repository collaborators" do
       stub_post("repos/collaborators/sferik/rails_admin/remove/sferik").
-        to_return(:body => fixture("collaborators.json"))
+        to_return(:body => fixture("v2/collaborators.json"))
       collaborators = @client.remove_collaborator("sferik/rails_admin", "sferik")
       collaborators.first.should == "sferik"
     end
@@ -229,7 +242,7 @@ describe Octokit::Client::Repositories do
 
     it "should return all pushable repositories" do
       stub_get("repos/pushable").
-        to_return(:body => fixture("repositories.json"))
+        to_return(:body => fixture("v2/repositories.json"))
       repositories = @client.pushable
       repositories.first.name.should == "One40Proof"
     end
@@ -240,7 +253,7 @@ describe Octokit::Client::Repositories do
 
     it "should return all repository teams" do
       stub_get("repos/show/codeforamerica/open311/teams").
-        to_return(:body => fixture("teams.json"))
+        to_return(:body => fixture("v2/teams.json"))
       teams = @client.repository_teams("codeforamerica/open311")
       teams.first.name.should == "Fellows"
     end
@@ -253,7 +266,7 @@ describe Octokit::Client::Repositories do
 
       it "should return all repository contributors" do
         stub_get("repos/show/sferik/rails_admin/contributors/anon").
-          to_return(:body => fixture("contributors.json"))
+          to_return(:body => fixture("v2/contributors.json"))
         contributors = @client.contributors("sferik/rails_admin", true)
         contributors.first.name.should == "Erik Michaels-Ober"
       end
@@ -264,7 +277,7 @@ describe Octokit::Client::Repositories do
 
       it "should return all repository contributors" do
         stub_get("repos/show/sferik/rails_admin/contributors").
-          to_return(:body => fixture("contributors.json"))
+          to_return(:body => fixture("v2/contributors.json"))
         contributors = @client.contributors("sferik/rails_admin")
         contributors.first.name.should == "Erik Michaels-Ober"
       end
@@ -277,7 +290,7 @@ describe Octokit::Client::Repositories do
 
     it "should return all repository watchers" do
       stub_get("repos/show/sferik/rails_admin/watchers").
-        to_return(:body => fixture("watchers.json"))
+        to_return(:body => fixture("v2/watchers.json"))
       watchers = @client.watchers("sferik/rails_admin")
       watchers.first.should == "sferik"
     end
@@ -288,7 +301,7 @@ describe Octokit::Client::Repositories do
 
     it "should return a repository's network" do
       stub_get("repos/show/sferik/rails_admin/network").
-        to_return(:body => fixture("network.json"))
+        to_return(:body => fixture("v2/network.json"))
       network = @client.network("sferik/rails_admin")
       network.first.owner.should == "sferik"
     end
@@ -299,7 +312,7 @@ describe Octokit::Client::Repositories do
 
     it "should return a repository's languages" do
       stub_get("repos/show/sferik/rails_admin/languages").
-        to_return(:body => fixture("languages.json"))
+        to_return(:body => fixture("v2/languages.json"))
       languages = @client.languages("sferik/rails_admin")
       languages["Ruby"].should == 205046
     end
@@ -310,7 +323,7 @@ describe Octokit::Client::Repositories do
 
     it "should return a repository's tags" do
       stub_get("repos/show/pengwynn/octokit/tags").
-        to_return(:body => fixture("tags.json"))
+        to_return(:body => fixture("v2/tags.json"))
       tags = @client.tags("pengwynn/octokit")
       tags["v0.0.1"].should == "0d7a03f2035ecd74e4d6eb9be58865c2a688ee55"
     end
@@ -321,7 +334,7 @@ describe Octokit::Client::Repositories do
 
     it "should return a repository's branches" do
       stub_get("repos/show/pengwynn/octokit/branches").
-        to_return(:body => fixture("branches.json"))
+        to_return(:body => fixture("v2/branches.json"))
       branches = @client.branches("pengwynn/octokit")
       branches["master"].should == "4d9a9e9ca183bab1c3d0accf1d53edd85bd6200f"
     end