octokit 1.25.0 → 2.0.0.pre

data/spec/helper.rb

@@ -14,29 +14,42 @@ require 'webmock/rspec'
 WebMock.disable_net_connect!(:allow => 'coveralls.io')
 
 RSpec.configure do |config|
-  config.expect_with :rspec do |c|
-    c.syntax = :expect
-  end
-end
-
-def a_delete(url)
-  a_request(:delete, github_url(url))
+  config.treat_symbols_as_metadata_keys_with_true_values = true
 end
 
-def a_get(url)
-  a_request(:get, github_url(url))
+require 'vcr'
+VCR.configure do |c|
+  c.configure_rspec_metadata!
+  c.filter_sensitive_data("<GITHUB_LOGIN>") do
+      ENV['OCTOKIT_TEST_GITHUB_LOGIN']
+  end
+  c.filter_sensitive_data("<GITHUB_PASSWORD>") do
+      ENV['OCTOKIT_TEST_GITHUB_PASSWORD']
+  end
+  c.filter_sensitive_data("<<ACCESS_TOKEN>>") do
+      ENV['OCTOKIT_TEST_GITHUB_TOKEN']
+  end
+  c.default_cassette_options = {
+    :serialize_with             => :json,
+    # TODO: Track down UTF-8 issue and remove
+    :preserve_exact_body_bytes  => true,
+    :decode_compressed_response => true,
+    :record                     => ENV['TRAVIS'] ? :none : :once
+  }
+  c.cassette_library_dir = 'spec/cassettes'
+  c.hook_into :webmock
 end
 
-def a_patch(url)
-  a_request(:patch, github_url(url))
+def test_github_login
+  ENV.fetch 'OCTOKIT_TEST_GITHUB_LOGIN'
 end
 
-def a_post(url)
-  a_request(:post, github_url(url))
+def test_github_password
+  ENV.fetch 'OCTOKIT_TEST_GITHUB_PASSWORD'
 end
 
-def a_put(url)
-  a_request(:put, github_url(url))
+def test_github_token
+  ENV.fetch 'OCTOKIT_TEST_GITHUB_TOKEN'
 end
 
 def stub_delete(url)
@@ -81,11 +94,25 @@ def json_response(file)
 end
 
 def github_url(url)
-  if url =~ /^http/
-    url
-  elsif @client && @client.authenticated?
-    "https://#{@client.login}:#{@client.password}@api.github.com#{url}"
-  else
-    "https://api.github.com#{url}"
-  end
+  url =~ /^http/ ? url : "https://api.github.com#{url}"
 end
+
+def basic_github_url(path, options = {})
+  login = options.fetch(:login, test_github_login)
+  password = options.fetch(:password, test_github_password)
+
+  "https://#{login}:#{password}@api.github.com#{path}"
+end
+
+def basic_auth_client(login = test_github_login, password = test_github_password )
+  client = Octokit.client
+  client.login = test_github_login
+  client.password = test_github_password
+
+  client
+end
+
+def oauth_client
+  Octokit::Client.new(:access_token => ENV.fetch('OCTOKIT_TEST_GITHUB_TOKEN'))
+end
+

data/spec/octokit/client/authorizations_spec.rb

@@ -1,96 +1,85 @@
-# -*- encoding: utf-8 -*-
 require 'helper'
 
 describe Octokit::Client::Authorizations do
 
   before do
-    @client = Octokit::Client.new(:login => 'ctshryock', :password => 'secret')
+    Octokit.reset!
+    @client = basic_auth_client
   end
 
-
-  it "lists existing authorizations" do
-    stub_get("/authorizations").
-      to_return(json_response("authorizations.json"))
-    authorizations = @client.authorizations
-    expect(authorizations.first.app.name).to eq("Calendar About Nothing" )
-  end
-
-  it "returns a single authorization" do
-    stub_get("/authorizations/999999").
-      to_return(json_response("authorization.json"))
-    authorization = @client.authorization(999999)
-    expect(authorization.app.name).to eq("Travis" )
-  end
-
-  it "creates a new default authorization" do
-    stub_post('/authorizations').
-      with(:body => {"scopes" => ""},
-           :headers => {'Content-Type'=>'application/json'}).
-      to_return(json_response("authorization.json"))
-    authorization = @client.create_authorization
-    expect(authorization.app.name).to eq("Travis" )
-  end
-
-  it "creates a new authorization with options" do
-    stub_post('/authorizations').
-      with(:body => {"scopes" => ["public_repo"],"note" => "admin script", "note_url" => "https://github.com/pengwynn/octokit"},
-           :headers => {'Content-Type'=>'application/json'}).
-      to_return(json_response("authorization.json"))
-    authorization = @client.create_authorization({:scopes => ["public_repo"], :note => "admin script", :note_url => "https://github.com/pengwynn/octokit"})
-    expect(authorization.scopes).to include("public_repo")
-  end
-
-  it "updates and existing authorization" do
-    stub_patch('/authorizations/999999').
-      with(:body => {"scopes"=>"", "add_scopes" => ["public_repo", "gist"]},
-           :headers => {'Content-Type'=>'application/json'}).
-      to_return(json_response("authorization.json"))
-    authorization = @client.update_authorization(999999, {:add_scopes => ['public_repo', 'gist']})
-    expect(authorization.scopes).to include("public_repo")
-  end
-
-  it "deletes an existing authorization" do
-    stub_delete('/authorizations/999999').
-      to_return(:status => 204)
-    result = @client.delete_authorization(999999)
-    expect(result).to eq(true)
-  end
-
-  context "when working with tokens" do
-    before(:each) do
-      Octokit.reset
+  describe ".create_authorization", :vcr do
+    it "creates an API authorization" do
+      authorization = @client.create_authorization
+      expect(authorization.app.name).to_not be_nil
+      assert_requested :post, basic_github_url("/authorizations")
     end
+    it "creates a new authorization with options" do
+      info = {
+        :scopes => ["gist"],
+      }
+      authorization = @client.create_authorization info
+      expect(authorization.scopes).to be_kind_of Array
+      assert_requested :post, basic_github_url("/authorizations")
+    end
+  end # .create_authorization
 
-    it "checks the scopes on a token" do
-      stub_get("https://api.github.com/user").
-        to_return \
-          :status => 200,
-          :body => fixture('user.json'),
-          :headers => {
-            :content_type => 'application/json; charset=utf-8',
-            :x_oauth_scopes => 'user, gist'
-          }
-
-      client = Octokit::Client.new :oauth_token => 'abcdabcdabcdabcdabcdabcdabcdabcdabcd'
-      scopes = Octokit.scopes
-      expect(scopes).to eq(['gist', 'user'])
+  describe ".authorizations", :vcr do
+    it "lists existing authorizations" do
+      authorizations = @client.authorizations
+      expect(authorizations).to be_kind_of Array
+      assert_requested :get, basic_github_url("/authorizations")
     end
+  end # .authorizations
 
+  describe ".authorization", :vcr do
+    it "returns a single authorization" do
+      authorization = @client.create_authorization
+      fetched = @client.authorization(authorization['id'])
+      assert_requested :get, basic_github_url("/authorizations/#{authorization.id}")
+    end
+  end # .authorization
+
+  describe ".update_authorization", :vcr do
+    it "updates and existing authorization" do
+      authorization = @client.create_authorization
+      updated = @client.update_authorization(authorization.id, :add_scopes => ['repo:status'])
+      expect(updated.scopes).to include 'repo:status'
+      assert_requested :patch, basic_github_url("/authorizations/#{authorization.id}")
+    end
+  end # .update_authorization
+
+  describe ".scopes", :vcr do
+    it "checks the scopes on the current token" do
+      authorization = @client.create_authorization
+      token_client = Octokit::Client.new(:access_token => authorization.token)
+      expect(token_client.scopes).to be_kind_of Array
+      assert_requested :get, github_url("/user")
+    end
     it "checks the scopes on a one-off token" do
-      stub_get("https://api.github.com/user").
-        to_return \
-          :status => 200,
-          :body => fixture('user.json'),
-          :headers => {
-            :content_type => 'application/json; charset=utf-8',
-            :x_oauth_scopes => 'user, gist, repo'
-          }
-
-      client = Octokit::Client.new
-      scopes = Octokit.scopes('abcdabcdabcdabcdabcdabcdabcdabcdabcd')
-      expect(scopes).to eq(['gist', 'repo', 'user'])
+      authorization = @client.create_authorization
+      Octokit.reset!
+      expect(Octokit.scopes(authorization.token)).to be_kind_of Array
+      assert_requested :get, github_url("/user")
+    end
+  end # .scopes
+
+  describe ".delete_authorization", :vcr do
+    it "deletes an existing authorization" do
+      VCR.eject_cassette
+      VCR.use_cassette 'delete_authorization' do
+        authorization = @client.create_authorization
+        result = @client.delete_authorization(authorization.id)
+        expect(result).to eq true
+        assert_requested :delete, basic_github_url("/authorizations/#{authorization.id}")
+      end
     end
+  end # .delete_authorization
 
-  end
+  describe '.authorize_url' do
+    it "returns the authorize_url" do
+      url = Octokit.authorize_url('id_here', 'secret_here')
+      expect(url).to eq('https://github.com/login/oauth/authorize?client_id=id_here&client_secret=secret_here')
+    end
+  end # .authorize_url
 
 end

data/spec/octokit/client/commit_comments_spec.rb

@@ -0,0 +1,62 @@
+require 'helper'
+
+describe Octokit::Client::CommitComments do
+
+  before do
+    Octokit.reset!
+    @client = oauth_client
+    @commit = @client.commits('api-playground/api-sandbox').last.rels[:self].get.data
+    @commit_comment = @client.create_commit_comment \
+      "api-playground/api-sandbox",
+      @commit.sha, ":metal:\n:sparkles:\n:cake:",
+      @commit.files.last.filename
+  end
+
+  describe ".list_commit_comments", :vcr do
+    it "returns a list of all commit comments" do
+      commit_comments = @client.list_commit_comments("sferik/rails_admin")
+      expect(commit_comments.first.user.login).to eq("sferik")
+      assert_requested :get, github_url("/repos/sferik/rails_admin/comments")
+    end
+  end # .list_commit_comments
+
+  describe ".commit_comments", :vcr do
+    it "returns a list of comments for a specific commit" do
+      commit_comments = @client.commit_comments("sferik/rails_admin", "629e9fd9d4df25528e84d31afdc8ebeb0f56fbb3")
+      expect(commit_comments.first.user.login).to eq("bbenezech")
+      assert_requested :get, github_url("/repos/sferik/rails_admin/commits/629e9fd9d4df25528e84d31afdc8ebeb0f56fbb3/comments")
+    end
+  end # .commit_comments
+
+  describe ".commit_comment", :vcr do
+    it "returns a single commit comment" do
+      commit = @client.commit_comment("sferik/rails_admin", "861907")
+      expect(commit.user.login).to eq("bbenezech")
+      assert_requested :get, github_url("/repos/sferik/rails_admin/comments/861907")
+    end
+  end # .commit_comment
+
+  describe ".create_commit_comment", :vcr do
+    it "creates a commit comment" do
+      expect(@commit_comment.user.login).to eq test_github_login
+      assert_requested :post, github_url("/repos/api-playground/api-sandbox/commits/#{@commit.sha}/comments")
+    end
+  end # .create_commit_comment
+
+  describe ".update_commit_comment", :vcr do
+    it "updates a commit comment" do
+      updated_comment = @client.update_commit_comment("api-playground/api-sandbox", @commit_comment.id, ":penguin:")
+      expect(updated_comment.body).to eq ":penguin:"
+      assert_requested :patch, github_url("/repos/api-playground/api-sandbox/comments/#{@commit_comment.id}")
+    end
+  end # .update_commit_comment
+
+  describe ".delete_commit_comment", :vcr do
+    it "deletes a commit comment" do
+      result = @client.delete_commit_comment("api-playground/api-sandbox", @commit_comment.id)
+      expect(result).to be_true
+      assert_requested :delete, github_url("/repos/api-playground/api-sandbox/comments/#{@commit_comment.id}")
+    end
+  end # .delete_commit_comment
+
+end

data/spec/octokit/client/commits_spec.rb

@@ -1,272 +1,139 @@
-# -*- encoding: utf-8 -*-
 require 'helper'
 
-# need this to filter the data
-require 'json'
-require 'date'
-
 describe Octokit::Client::Commits do
 
   before do
-    @client = Octokit::Client.new(:login => 'sferik')
+    Octokit.reset!
+    @client = oauth_client
   end
 
-  describe ".commits" do
-
+  describe ".commits", :vcr do
     it "returns all commits" do
-      stub_get("/repos/sferik/rails_admin/commits?per_page=35&sha=master").
-        to_return(json_response("commits.json"))
       commits = @client.commits("sferik/rails_admin")
-      expect(commits.first.author.login).to eq("caboteria")
+      expect(commits.first.author).to_not be_nil
+      assert_requested :get, github_url("/repos/sferik/rails_admin/commits")
     end
+    it "handles branch or sha argument" do
+      commits = @client.commits("sferik/rails_admin", "master")
+      assert_requested :get, github_url("/repos/sferik/rails_admin/commits?sha=master")
+    end
+    it "handles the sha option" do
+      commits = @client.commits("sferik/rails_admin", :sha => "master")
+      assert_requested :get, github_url("/repos/sferik/rails_admin/commits?sha=master")
+    end
+  end # .commits
 
-  end
-
-  describe ".commits_on" do
-
+  describe ".commits_on", :vcr do
     it "returns all commits on the specified date" do
-      stub_http_request(:get, "https://api.github.com/repos/sferik/rails_admin/commits").
-        with(:query=>{"per_page" => 35, "sha" => "master",
-          "since" => "2011-01-20T00:00:00+00:00", "until" => "2011-01-21T00:00:00+00:00"}).
-        to_return json_response('commits.json')
       commits = @client.commits_on("sferik/rails_admin", "2011-01-20")
-      expect(commits).to be_an(Array)
+      expect(commits).to be_kind_of Array
+      assert_requested :get, github_url("/repos/sferik/rails_admin/commits?since=2011-01-20T00:00:00%2B00:00&until=2011-01-21T00:00:00%2B00:00")
     end
-
-    it "returns an empty array if there are no commits on the specified date" do
-      stub_http_request(:get, "https://api.github.com/repos/sferik/rails_admin/commits").
-        with(:query=>{"per_page" => 35, "sha" => "master",
-          "since" => "2011-01-15T00:00:00+00:00",
-          "until" => "2011-01-16T00:00:00+00:00"}).
-        to_return json_response('commits.json')
-      commits = @client.commits_on("sferik/rails_admin", "2011-01-15")
-      expect(commits).to be_an(Array)
-    end
-
     it "errors if the date is invalid" do
-      expect {@client.commits_on("sferik/rails_admin", "A pear")}.to raise_exception(ArgumentError, "A pear is not a valid date")
+      expect { @client.commits_on "sferik/rails_admin", "A pear" }.to raise_error ArgumentError
     end
-
-  end
-
-  describe ".commits_since" do
-
-    it "returns all commits after the specified date" do
-      start_date = Date.parse("2011-01-16T00:00:00+00:00")
-      stub_http_request(:get, "https://api.github.com/repos/sferik/rails_admin/commits").
-        with(:query=>{"per_page" => 35, "sha" => "master",
-          "since" => "2011-01-16T00:00:00+00:00"}).
-        to_return json_response('commits.json')
-      commits = @client.commits_since("sferik/rails_admin", "2011-01-16")
-      expect(commits).to be_an(Array)
+    it "handles branch or sha argument" do
+      commits = @client.commits_on("sferik/rails_admin", "2011-01-15", "master")
+      assert_requested :get, github_url("/repos/sferik/rails_admin/commits?sha=master&since=2011-01-15T00:00:00%2B00:00&until=2011-01-16T00:00:00%2B00:00")
     end
-
-    it "returns an empty array if there are no commits after the specified date" do
-      start_date = Date.parse("2011-01-22T00:00:00+00:00")
-      stub_http_request(:get, "https://api.github.com/repos/sferik/rails_admin/commits").
-        with(:query=>{"per_page" => 35, "sha" => "master",
-          "since" => "2011-01-22T00:00:00+00:00"}).
-        to_return json_response('commits.json')
-      commits = @client.commits_since("sferik/rails_admin", "2011-01-22")
-      expect(commits).to be_an(Array)
+    it "handles the sha option" do
+      commits = @client.commits_on("sferik/rails_admin", "2011-01-15", :sha => "master")
+      assert_requested :get, github_url("/repos/sferik/rails_admin/commits?sha=master&since=2011-01-15T00:00:00%2B00:00&until=2011-01-16T00:00:00%2B00:00")
     end
+  end # .commits_on
 
+  describe ".commits_since", :vcr do
+    it "returns all commits since the specified date" do
+      commits = @client.commits_since("sferik/rails_admin", "2011-01-20")
+      expect(commits).to be_kind_of Array
+      assert_requested :get, github_url("/repos/sferik/rails_admin/commits?since=2011-01-20T00:00:00%2B00:00")
+    end
     it "errors if the date is invalid" do
-      expect {@client.commits_since("sferik/rails_admin", "A pear")}.to raise_exception(ArgumentError, "A pear is not a valid date")
+      expect { @client.commits_since "sferik/rails_admin", "A pear" }.to raise_error ArgumentError
     end
-
-  end
-
-  describe ".commits_before" do
-
-    it "returns all commits before the specified date" do
-      end_date = Date.parse("2011-01-17T00:00:00+00:00")
-      stub_http_request(:get, "https://api.github.com/repos/sferik/rails_admin/commits").
-        with(:query=>{"per_page" => 35, "sha" => "master",
-          "until" => "2011-01-17T00:00:00+00:00"}).
-          to_return json_response('commits.json')
-      commits = @client.commits_before("sferik/rails_admin", "2011-01-17")
-      expect(commits).to be_an(Array)
+    it "handles branch or sha argument" do
+      commits = @client.commits_since("sferik/rails_admin", "2011-01-15", "master")
+      assert_requested :get, github_url("/repos/sferik/rails_admin/commits?sha=master&since=2011-01-15T00:00:00%2B00:00")
     end
-
-    it "returns an empty array if there are no commits before the specified date" do
-      end_date = DateTime.parse("2011-01-16T00:00:00%2000:00")
-      stub_http_request(:get, "https://api.github.com/repos/sferik/rails_admin/commits").
-        with(:query=>{"per_page" => 35, "sha" => "master",
-          "until" => "2011-01-16T00:00:00+00:00"}).
-          to_return json_response('commits.json')
-      commits = @client.commits_before("sferik/rails_admin", "2011-01-16")
-      expect(commits).to be_an(Array)
+    it "handles the sha option" do
+      commits = @client.commits_since("sferik/rails_admin", "2011-01-15", :sha => "master")
+      assert_requested :get, github_url("/repos/sferik/rails_admin/commits?sha=master&since=2011-01-15T00:00:00%2B00:00")
     end
+  end # .commits_since
 
+  describe ".commits_before", :vcr do
+    it "returns all commits until the specified date" do
+      commits = @client.commits_before("sferik/rails_admin", "2011-01-20")
+      expect(commits).to be_kind_of Array
+      assert_requested :get, github_url("/repos/sferik/rails_admin/commits?until=2011-01-20T00:00:00%2B00:00")
+    end
     it "errors if the date is invalid" do
-      expect {@client.commits_before("sferik/rails_admin", "A pear")}.to raise_exception(ArgumentError, "A pear is not a valid date")
+      expect { @client.commits_before "sferik/rails_admin", "A pear" }.to raise_error ArgumentError
     end
-
-  end
-
-  describe ".commits_between" do
-
-    it "returns all commits between the specified dates" do
-      start_date = DateTime.parse("2011-01-17T00:00:00+00:00")
-      end_date = DateTime.parse("2011-01-20T00:00:00+00:00")
-      stub_http_request(:get, "https://api.github.com/repos/sferik/rails_admin/commits").
-        with(:query=>{"per_page" => 35, "sha" => "master",
-          "since" => "2011-01-17T00:00:00+00:00", "until" => "2011-01-20T00:00:00+00:00"}).
-          to_return json_response('commits.json')
-      commits = @client.commits_between("sferik/rails_admin", "2011-01-17", "2011-01-20")
-      expect(commits).to be_an(Array)
+    it "handles branch or sha argument" do
+      commits = @client.commits_before("sferik/rails_admin", "2011-01-15", "master")
+      assert_requested :get, github_url("/repos/sferik/rails_admin/commits?sha=master&until=2011-01-15T00:00:00%2B00:00")
     end
-
-    it "returns an empty array if there are no commits between the specified dates" do
-      start_date = Date.parse("2011-01-15T00:00:00+00:00")
-      end_date = Date.parse("2011-01-16T00:00:00+00:00")
-      stub_http_request(:get, "https://api.github.com/repos/sferik/rails_admin/commits").
-        with(:query=>{"per_page" => 35, "sha" => "master",
-          "since" => "2011-01-15T00:00:00+00:00", "until" => "2011-01-16T00:00:00+00:00"}).
-          to_return json_response('commits.json')
-      commits = @client.commits_between("sferik/rails_admin", "2011-01-15", "2011-01-16")
-      expect(commits).to be_an(Array)
+    it "handles the sha option" do
+      commits = @client.commits_before("sferik/rails_admin", "2011-01-15", :sha => "master")
+      assert_requested :get, github_url("/repos/sferik/rails_admin/commits?sha=master&until=2011-01-15T00:00:00%2B00:00")
     end
+  end # .commits_before
 
-    it "errors if the end_date preceeds the start_date" do
-      expect {@client.commits_between("sferik/rails_admin", "2011-01-16", "2011-01-15")}.to raise_exception(ArgumentError, "Start date 2011-01-16 does not precede 2011-01-15")
+  describe ".commits_between", :vcr do
+    it "returns all commits until the specified date" do
+      commits = @client.commits_between("sferik/rails_admin", "2011-01-20", "2013-01-20")
+      expect(commits).to be_kind_of Array
+      assert_requested :get, github_url("/repos/sferik/rails_admin/commits?since=2011-01-20T00:00:00%2B00:00&until=2013-01-20T00:00:00%2B00:00")
     end
-
-    it "errors if the start date is invalid" do
-      expect {@client.commits_between("sferik/rails_admin", "A pear", "2011-01-15")}.to raise_exception(ArgumentError, "A pear is not a valid date")
+    it "errors if the date is invalid" do
+      expect { @client.commits_between "sferik/rails_admin", "A pear" }.to raise_error ArgumentError
     end
-
-    it "errors if the end date is invalid" do
-      expect {@client.commits_between("sferik/rails_admin", "2011-01-16", "A walrus")}.to raise_exception(ArgumentError, "A walrus is not a valid date")
+    it "handles branch or sha argument" do
+      commits = @client.commits_between("sferik/rails_admin", "2011-01-20", "2013-01-20", "master")
+      assert_requested :get, github_url("/repos/sferik/rails_admin/commits?sha=master&since=2011-01-20T00:00:00%2B00:00&until=2013-01-20T00:00:00%2B00:00")
     end
+    it "handles the sha option" do
+      commits = @client.commits_between("sferik/rails_admin", "2011-01-20", "2013-01-20", :sha => "master")
+      assert_requested :get, github_url("/repos/sferik/rails_admin/commits?sha=master&since=2011-01-20T00:00:00%2B00:00&until=2013-01-20T00:00:00%2B00:00")
+    end
+  end # .commits_between
 
-  end
-
-  describe ".commit" do
-
+  describe ".commit", :vcr do
     it "returns a commit" do
-      stub_get("/repos/sferik/rails_admin/commits/3cdfabd973bc3caac209cba903cfdb3bf6636bcd").
-        to_return(json_response("commit.json"))
       commit = @client.commit("sferik/rails_admin", "3cdfabd973bc3caac209cba903cfdb3bf6636bcd")
-      expect(commit.author.login).to eq("caboteria")
+      expect(commit.author.login).to eq 'caboteria'
+      assert_requested :get, github_url("/repos/sferik/rails_admin/commits/3cdfabd973bc3caac209cba903cfdb3bf6636bcd")
     end
+  end # .commit
 
-  end
-
-  describe ".create_commit" do
-
+  describe ".create_commit", :vcr do
     it "creates a commit" do
-      stub_post("/repos/octocat/Hello-World/git/commits").
-        with(:body => { :message => "My commit message", :tree => "827efc6d56897b048c772eb4087f854f46256132", :parents => ["7d1b31e74ee336d15cbd21741bc88a537ed063a0"] },
-             :headers => { "Content-Type" => "application/json" }).
-        to_return(json_response("commit_create.json"))
-      commit = @client.create_commit("octocat/Hello-World", "My commit message", "827efc6d56897b048c772eb4087f854f46256132", "7d1b31e74ee336d15cbd21741bc88a537ed063a0")
-      expect(commit.sha).to eq("7638417db6d59f3c431d3e1f261cc637155684cd")
-      expect(commit.message).to eq("My commit message")
-      expect(commit.parents.size).to eq(1)
-      expect(commit.parents.first.sha).to eq("7d1b31e74ee336d15cbd21741bc88a537ed063a0")
-    end
-
-  end
-
-  describe ".list_commit_comments" do
-
-    it "returns a list of all commit comments" do
-      stub_get("/repos/sferik/rails_admin/comments").
-        to_return(json_response("list_commit_comments.json"))
-      commit_comments = @client.list_commit_comments("sferik/rails_admin")
-      expect(commit_comments.first.user.login).to eq("sferik")
-    end
-
-  end
-
-  describe ".commit_comments" do
-
-    it "returns a list of comments for a specific commit" do
-      stub_get("/repos/sferik/rails_admin/commits/629e9fd9d4df25528e84d31afdc8ebeb0f56fbb3/comments").
-        to_return(json_response("commit_comments.json"))
-      commit_comments = @client.commit_comments("sferik/rails_admin", "629e9fd9d4df25528e84d31afdc8ebeb0f56fbb3")
-      expect(commit_comments.first.user.login).to eq("bbenezech")
-    end
-
-  end
-
-  describe ".commit_comment" do
-
-    it "returns a single commit comment" do
-      stub_get("/repos/sferik/rails_admin/comments/861907").
-        to_return(json_response("commit_comment.json"))
-      commit = @client.commit_comment("sferik/rails_admin", "861907")
-      expect(commit.user.login).to eq("bbenezech")
-    end
-
-  end
-
-  describe ".create_commit_comment" do
-
-    it "creates a commit comment" do
-      stub_post("/repos/sferik/rails_admin/commits/629e9fd9d4df25528e84d31afdc8ebeb0f56fbb3/comments").
-        with(:body => { :body => "Hey Eric,\r\n\r\nI think it's a terrible idea: for a number of reasons (dissections, etc.), test suite should stay deterministic IMO.\r\n", :commit_id => "629e9fd9d4df25528e84d31afdc8ebeb0f56fbb3", :line => 1, :path => ".rspec", :position => 4 },
-             :headers => { "Content-Type" => "application/json" }).
-        to_return(json_response("commit_comment_create.json"))
-      commit_comment = @client.create_commit_comment("sferik/rails_admin", "629e9fd9d4df25528e84d31afdc8ebeb0f56fbb3", "Hey Eric,\r\n\r\nI think it's a terrible idea: for a number of reasons (dissections, etc.), test suite should stay deterministic IMO.\r\n", ".rspec", 1, 4)
-      expect(commit_comment.body).to eq("Hey Eric,\r\n\r\nI think it's a terrible idea: for a number of reasons (dissections, etc.), test suite should stay deterministic IMO.\r\n")
-      expect(commit_comment.commit_id).to eq("629e9fd9d4df25528e84d31afdc8ebeb0f56fbb3")
-      expect(commit_comment.path).to eq(".rspec")
-      expect(commit_comment.line).to eq(1)
-      expect(commit_comment.position).to eq(4)
-    end
-
-  end
-
-  describe ".update_commit_comment" do
-
-    it "updates a commit comment" do
-      stub_patch("/repos/sferik/rails_admin/comments/860296").
-        with(:body => { :body => "Hey Eric,\r\n\r\nI think it's a terrible idea. The test suite should stay deterministic IMO.\r\n" },
-          :headers => { "Content-Type" => "application/json" }).
-        to_return(json_response("commit_comment_update.json"))
-        commit_comment = @client.update_commit_comment("sferik/rails_admin", "860296", "Hey Eric,\r\n\r\nI think it's a terrible idea. The test suite should stay deterministic IMO.\r\n")
-        expect(commit_comment.body).to eq("Hey Eric,\r\n\r\nI think it's a terrible idea. The test suite should stay deterministic IMO.\r\n")
-    end
-
-  end
-
-  describe ".delete_commit_comment" do
-
-    it "deletes a commit comment" do
-      stub_delete("/repos/sferik/rails_admin/comments/860296").
-        to_return(:status => 204, :body => "")
-      commit_comment = @client.delete_commit_comment("sferik/rails_admin", "860296")
-      expect(commit_comment).to eq(true)
+      last_commit = @client.commits('api-playground/api-sandbox').last
+      commit = @client.create_commit("api-playground/api-sandbox", "My commit message", last_commit.commit.tree.sha, last_commit.sha)
+      assert_requested :post, github_url("/repos/api-playground/api-sandbox/git/commits")
     end
+  end # .create_commit
 
-  end
-
-  describe ".compare" do
-
+  describe ".merge", :vcr do
+    it "merges a branch into another" do
+      begin
+        @client.delete_ref("api-playground/api-sandbox", "heads/branch-to-merge")
+      rescue Octokit::UnprocessableEntity
+      end
+      last_commit = @client.commits('api-playground/api-sandbox').last
+      branch = @client.create_ref("api-playground/api-sandbox", "heads/branch-to-merge", last_commit.sha)
+      merge = @client.merge("api-playground/api-sandbox", "master", "branch-to-merge", :commit_message => "Testing the merge API")
+      assert_requested :post, github_url("/repos/api-playground/api-sandbox/merges")
+    end
+  end # .merge
+
+  describe ".compare", :vcr do
     it "returns a comparison" do
-      stub_get("/repos/gvaughn/octokit/compare/0e0d7ae299514da692eb1cab741562c253d44188...b7b37f75a80b8e84061cd45b246232ad958158f5").
-        to_return(json_response("compare.json"))
       comparison = @client.compare("gvaughn/octokit", '0e0d7ae299514da692eb1cab741562c253d44188', 'b7b37f75a80b8e84061cd45b246232ad958158f5')
       expect(comparison.base_commit.sha).to eq('0e0d7ae299514da692eb1cab741562c253d44188')
       expect(comparison.merge_base_commit.sha).to eq('b7b37f75a80b8e84061cd45b246232ad958158f5')
+      assert_requested :get, github_url("/repos/gvaughn/octokit/compare/0e0d7ae299514da692eb1cab741562c253d44188...b7b37f75a80b8e84061cd45b246232ad958158f5")
     end
-  end
-
-  describe ".merge" do
-
-    before do
-      stub_post("/repos/pengwynn/api-sandbox/merges").
-        to_return(json_response("merge.json"))
-    end
-
-    it "merges a branch into another" do
-      merge = @client.merge("pengwynn/api-sandbox", "master", "new-branch", :commit_message => "Testing the merge API")
-      expect(merge.sha).to eq('4298c8499e0a7a160975adefdecdf9d8a5437095')
-      expect(merge.commit.message).to eq('Testing the merge API')
-    end
-
-  end
+  end # .compare
 end