octokit 1.25.0 → 2.0.0.pre

data/spec/octokit/client/say_spec.rb

@@ -1,36 +1,22 @@
-# -*- encoding: utf-8 -*-
 require 'helper'
 
 describe Octokit::Client::Say do
   before do
-    @client = Octokit::Client.new
+    Octokit.reset!
+    @client = oauth_client
   end
 
-  describe ".say" do
+  describe ".say", :vcr do
     it "returns an ASCII octocat" do
-      stub_get("/octocat").
-        to_return \
-          :status => 200,
-          :body => fixture("say.txt"),
-          :headers => {
-            :content_type => 'text/plain'
-          }
-
       text = @client.say
-      expect(text).to match(/Half measures/)
+      expect(text).to match /MMMMMMMMMMMMMMMMMMMMM/
+      assert_requested :get, github_url("/octocat")
     end
 
     it "returns an ASCII octocat with custom text" do
-      stub_get("/octocat").
-        to_return \
-          :status => 200,
-          :body => fixture("say_custom.txt"),
-          :headers => {
-            :content_type => 'text/plain'
-          }
-
-      text = @client.say
-      expect(text).to match(/upset/)
+      text = @client.say "There is no need to be upset"
+      expect(text).to match /upset/
+      assert_requested :get, github_url("/octocat?s=There+is+no+need+to+be+upset")
     end
   end
 

data/spec/octokit/client/service_status_spec.rb

@@ -0,0 +1,37 @@
+require 'helper'
+
+describe Octokit::Client::ServiceStatus do
+
+  before do
+    Octokit.reset!
+  end
+
+  describe ".github_status", :vcr do
+    it "returns the current system status" do
+      current_status = Octokit.github_status
+      expect(current_status.status).to_not be_nil
+      assert_requested :get, "https://status.github.com/api.json"
+      assert_requested :get, "https://status.github.com/api/status.json"
+    end
+  end # .github_status
+
+  describe ".github_status_last_message", :vcr do
+    it "returns the last human message" do
+      message = Octokit.github_status_last_message
+      expect(message.status).to_not be_nil
+      expect(message.body).to_not be_nil
+      assert_requested :get, "https://status.github.com/api.json"
+      assert_requested :get, "https://status.github.com/api/last-message.json"
+    end
+  end # .github_status_last_message
+
+  describe ".github_status", :vcr do
+    it "returns the most recent status messages" do
+      messages = Octokit.github_status_messages
+      expect(messages).to be_kind_of Array
+      assert_requested :get, "https://status.github.com/api.json"
+      assert_requested :get, "https://status.github.com/api/messages.json"
+    end
+  end # .github_status
+
+end

data/spec/octokit/client/stats_spec.rb

@@ -1,55 +1,105 @@
-# -*- encoding: utf-8 -*-
 require 'helper'
 
 describe Octokit::Client::Stats do
 
   before do
-    @client = Octokit::Client.new(:login => 'sferik')
+    Octokit.reset!
+    @client = oauth_client
   end
 
-  describe ".contributor_stats" do
-    it "returns contributors and their contribution stats" do
-      stub_get("/repos/pengwynn/octokit/stats/contributors").
-        to_return(json_response("contributor_stats.json"))
-      stats = @client.contributors_stats("pengwynn/octokit")
-      expect(stats.first.author.login).to eq("pengwynn")
+  context "with cold graph cache" do
+
+    before do
+      VCR.turn_off!
+      stub_request(:any, /api\.github\.com\/repos\/octokit/).
+        to_return(:status => 202)
+    end
+
+    after do
+      VCR.turn_on!
     end
+
+    describe ".contributors_stats" do
+      it "returns contributors and their contribution stats" do
+        stats = @client.contributors_stats("octokit/octokit.rb")
+        expect(stats).to be_nil
+        assert_requested :get, github_url("/repos/octokit/octokit.rb/stats/contributors")
+      end
+    end # .contributors_stats
+
+    describe ".commit_activity_stats" do
+      it "returns the commit activity stats" do
+        stats = @client.commit_activity_stats("octokit/octokit.rb")
+        expect(stats).to be_nil
+        assert_requested :get, github_url("/repos/octokit/octokit.rb/stats/commit_activity")
+      end
+    end # .commit_activity_stats
+
+    describe ".code_frequency_stats" do
+      it "returns the code frequency stats" do
+        stats = @client.code_frequency_stats('octokit/octokit.rb')
+        expect(stats).to be_nil
+        assert_requested :get, github_url("/repos/octokit/octokit.rb/stats/code_frequency")
+      end
+    end # .code_frequency_stats
+
+    describe ".participation_stats" do
+      it "returns the owner and contributor participation stats" do
+        stats = @client.participation_stats('octokit/octokit.rb')
+        expect(stats).to be_nil
+        assert_requested :get, github_url("/repos/octokit/octokit.rb/stats/participation")
+      end
+    end # .participation_stats
+
+    describe ".punch_card_stats" do
+      it "returns commit count by hour punch card stats" do
+        stats = @client.punch_card_stats('octokit/octokit.rb')
+        expect(stats).to be_nil
+        assert_requested :get, github_url("/repos/octokit/octokit.rb/stats/punch_card")
+      end
+    end # .punch_card_stats
   end
 
-  describe ".commit_activity_stats" do
+  describe ".contributors_stats", :vcr do
+    it "returns contributors and their contribution stats" do
+      stats = @client.contributors_stats("octokit/octokit.rb")
+      expect(stats).to be_kind_of Array
+      expect(stats.first.author.login).to_not be_nil
+      assert_requested :get, github_url("/repos/octokit/octokit.rb/stats/contributors")
+    end
+  end # .contributors_stats
+
+  describe ".commit_activity_stats", :vcr do
     it "returns the commit activity stats" do
-      stub_get("/repos/pengwynn/octokit/stats/commit_activity").
-        to_return(json_response("commit_activity_stats.json"))
-      stats = @client.commit_activity_stats("pengwynn/octokit")
-      expect(stats.first.week).to eq(1336867200)
+      stats = @client.commit_activity_stats("octokit/octokit.rb")
+      expect(stats).to be_kind_of Array
+      expect(stats.first.week).to be_kind_of Fixnum
+      assert_requested :get, github_url("/repos/octokit/octokit.rb/stats/commit_activity")
     end
-  end
+  end # .commit_activity_stats
 
-  describe ".code_frequency_stats" do
+  describe ".code_frequency_stats", :vcr do
     it "returns the code frequency stats" do
-      stub_get("/repos/pengwynn/octokit/stats/code_frequency").
-        to_return(json_response('code_frequency_stats.json'))
-      stats = @client.code_frequency_stats('pengwynn/octokit')
-      expect(stats.first.first).to eq(1260057600)
+      stats = @client.code_frequency_stats('octokit/octokit.rb')
+      expect(stats).to be_kind_of Array
+      assert_requested :get, github_url("/repos/octokit/octokit.rb/stats/code_frequency")
     end
-  end
+  end # .code_frequency_stats
 
-  describe ".participation_stats" do
+  describe ".participation_stats", :vcr do
     it "returns the owner and contributor participation stats" do
-      stub_get("/repos/pengwynn/octokit/stats/participation").
-        to_return(json_response('participation_stats.json'))
-      stats = @client.participation_stats('pengwynn/octokit')
-      expect(stats.owner.first).to eq(5)
+      stats = @client.participation_stats('octokit/octokit.rb')
+      expect(stats.fields).to include :owner
+      assert_requested :get, github_url("/repos/octokit/octokit.rb/stats/participation")
     end
-  end
+  end # .participation_stats
 
-  describe ".punch_card_stats" do
+  describe ".punch_card_stats", :vcr do
     it "returns commit count by hour punch card stats" do
-      stub_get("/repos/pengwynn/octokit/stats/punch_card").
-        to_return(json_response('punch_card_stats.json'))
-      stats = @client.punch_card_stats('pengwynn/octokit')
-      expect(stats.last.first).to eq(6)
+      stats = @client.punch_card_stats('octokit/octokit.rb')
+      expect(stats).to be_kind_of Array
+      assert_requested :get, github_url("/repos/octokit/octokit.rb/stats/punch_card")
     end
-  end
+  end # .punch_card_stats
 
 end

data/spec/octokit/client/statuses_spec.rb

@@ -1,68 +1,28 @@
-# -*- encoding: utf-8 -*-
 require 'helper'
 
 describe Octokit::Client::Statuses do
 
   before do
-    @client = Octokit::Client.new(:login => 'sferik')
+    Octokit.reset!
+    @client = oauth_client
   end
 
-  describe ".statuses" do
-
+  describe ".statuses", :vcr do
     it "lists commit statuses" do
-      stub_get('https://api.github.com/repos/pengwynn/octokit/statuses/7d069dedd4cb56bf57760688657abd0e6b5a28b8').
-        to_return(json_response('statuses.json'))
-      statuses = @client.statuses('pengwynn/octokit', '7d069dedd4cb56bf57760688657abd0e6b5a28b8')
-      expect(statuses.first.target_url).to eq('http://travis-ci.org/pengwynn/octokit/builds/2092930')
+      statuses = Octokit.statuses('octokit/octokit.rb', '7d069dedd4cb56bf57760688657abd0e6b5a28b8')
+      expect(statuses).to be_kind_of Array
+      assert_requested :get, github_url("/repos/octokit/octokit.rb/statuses/7d069dedd4cb56bf57760688657abd0e6b5a28b8")
     end
+  end # .statuses
 
-  end
-
-  describe ".create_status" do
-
+  describe ".create_status", :vcr do
     it "creates status" do
-      stub_post('https://api.github.com/repos/pengwynn/octokit/statuses/7d069dedd4cb56bf57760688657abd0e6b5a28b8').
-        to_return(json_response('status.json'))
       info = {
         :target_url => 'http://wynnnetherland.com'
       }
-      status = @client.create_status('pengwynn/octokit', '7d069dedd4cb56bf57760688657abd0e6b5a28b8', 'success', info)
-      expect(status.target_url).to eq('http://wynnnetherland.com')
+      @client.create_status("api-playground/api-sandbox", '78c9dcae41c7c5f81b012d15d06d843623a4988a', 'success', info)
+      assert_requested :post, github_url("/repos/api-playground/api-sandbox/statuses/78c9dcae41c7c5f81b012d15d06d843623a4988a")
     end
-
-  end
-
-  describe ".github_status" do
-
-    it "returns the current system status" do
-      stub_get('https://status.github.com/api/status.json').
-        to_return(json_response('github_status.json'))
-      github_status = @client.github_status
-      expect(github_status.status).to eq('good')
-    end
-
-  end
-
-  describe ".github_status_last_message" do
-
-    it "returns the last human communication, status, and timestamp" do
-      stub_get('https://status.github.com/api/last-message.json').
-        to_return(json_response('github_status_last_message.json'))
-      last_message = @client.github_status_last_message
-      expect(last_message.body).to eq('Everything operating normally.')
-    end
-
-  end
-
-  describe ".github_status_messages" do
-
-    it "returns the most recent human communications" do
-      stub_get('https://status.github.com/api/messages.json').
-        to_return(json_response('github_status_messages.json'))
-      status_messages = @client.github_status_messages
-      expect(status_messages.first.body).to eq("I'm seeing, like, unicorns man.")
-    end
-
-  end
+  end # .create_status
 
 end

data/spec/octokit/client/users_spec.rb

@@ -1,412 +1,208 @@
-# -*- encoding: utf-8 -*-
 require 'helper'
 
 describe Octokit::Client::Users do
 
-  before do
-    @client = Octokit::Client.new(:login => 'sferik')
+  before(:each) do
+    Octokit.reset!
+    @client = oauth_client
   end
 
-  describe ".search_users" do
-
-    context "with a username passed" do
-
-      it "returns matching username" do
-        stub_get("https://api.github.com/legacy/user/search/sferik").
-          to_return(json_response("legacy/users.json"))
-        users = @client.search_users("sferik")
-        expect(users.first.username).to eq("sferik")
-      end
-
-    end
-
-    context "with no encode url" do
-
-      it "should not raise URI::InvalidURIError and returns success" do
-        stub_get("https://api.github.com/legacy/user/search/follower:>0").
-          to_return(json_response("legacy/users.json"))
-        users = @client.search_users("follower:>0")
-        expect(users.first.login).to eq("sferik")
-      end
-
-    end
-
-
-  end
-
-  describe ".all_users" do
-
+  describe ".all_users", :vcr do
     it "returns all GitHub users" do
-      stub_get("/users").
-        to_return(json_response("all_users.json"))
-      users = @client.all_users
-      expect(users.first.login).to eq("mojombo")
-    end
-
-  end
-
-  describe ".user" do
-
-    context "with a username passed" do
-
-      it "returns the user" do
-        stub_get("/users/sferik").
-          to_return(json_response("user.json"))
-        user = @client.user("sferik")
-        expect(user.login).to eq("sferik")
-      end
-
+      users = Octokit.all_users
+      expect(users).to be_kind_of Array
     end
+  end # .all_users
 
-    context "without a username passed" do
-
-      it "returns the authenticated user" do
-        stub_get("/user").
-          to_return(json_response("user.json"))
-        user = @client.user
-        expect(user.login).to eq("sferik")
-      end
-
+  describe ".user", :vcr do
+    it "returns a user" do
+      user = Octokit.client.user("sferik")
+      expect(user.login).to eq 'sferik'
     end
-
-  end
-
-  describe '.access_token' do
-
-    context 'with authorization code, client id, and client secret' do
-
-      it 'returns the access_token' do
-        stub_post("https://github.com/login/oauth/access_token").
-          to_return(json_response("user_token.json"))
-        resp = @client.access_token('code', 'id_here', 'secret_here')
-        expect(resp.access_token).to eq('this_be_ye_token/use_it_wisely')
-      end
-
+    it "returns the authenticated user" do
+      user = @client.user
+      expect(user.login).to eq test_github_login
     end
+  end # .user
 
-  end
-
-  describe ".validate_credentials" do
+  describe ".validate_credentials", :vcr do
     it "validates username and password" do
-      stub_get("https://sferik:foobar@api.github.com/user").
-        to_return(json_response("user.json"))
-
-        expect(Octokit.validate_credentials(:login => 'sferik', :password => 'foobar')).to eq(true)
+      expect(Octokit.validate_credentials(:login => test_github_login, :password => test_github_password)).to be_true
     end
-  end
-
-  describe ".update_user" do
-
-    context "with a location passed" do
-
-      it "updates the user's location" do
-        stub_patch("/user").
-          with(:body => {:name => "Erik Michaels-Ober", :email => "sferik@gmail.com", :company => "Code for America", :location => "San Francisco", :hireable => false}).
-          to_return(json_response("user.json"))
-        user = @client.update_user(:name => "Erik Michaels-Ober", :email => "sferik@gmail.com", :company => "Code for America", :location => "San Francisco", :hireable => false)
-        expect(user.login).to eq("sferik")
-      end
+  end # .validate_credentials
 
+  describe ".update_user", :vcr do
+    it "updates a user profile" do
+      user = @client.update_user(:location => "San Francisco, CA", :hireable => false)
+      expect(user.login).to eq test_github_login
+      assert_requested :patch, github_url("/user")
     end
+  end # .update_user
 
-  end
-
-  describe ".followers" do
-
-    context "with a username passed" do
-
-      it "returns the user's followers" do
-        stub_get("https://api.github.com/users/sferik/followers").
-          to_return(json_response("followers.json"))
-        users = @client.followers("sferik")
-        expect(users.first.login).to eq("puls")
-      end
-
+  describe ".followers", :vcr do
+    it "returns followers for a user" do
+      users = Octokit.followers("sferik")
+      expect(users).to be_kind_of Array
+      assert_requested :get, github_url("/users/sferik/followers")
     end
-
-    context "without a username passed" do
-
-      it "returns the user's followers" do
-        stub_get("https://api.github.com/users/sferik/followers").
-          to_return(json_response("followers.json"))
-        users = @client.followers
-        expect(users.first.login).to eq("puls")
-      end
-
+    it "returns the authenticated user's followers" do
+      users = @client.followers
+      expect(users).to be_kind_of Array
+      assert_requested :get, github_url("/users/#{test_github_login}/followers")
     end
+  end # .followers
 
-  end
-
-  describe ".following" do
-
-    context "with a username passed" do
-
-      it "returns the user's following" do
-        stub_get("https://api.github.com/users/sferik/following").
-          to_return(json_response("following.json"))
-        users = @client.following("sferik")
-        expect(users.first.login).to eq("rails")
-      end
-
+  describe ".following", :vcr do
+    it "returns following for a user" do
+      users = Octokit.following("sferik")
+      expect(users).to be_kind_of Array
+      assert_requested :get, github_url("/users/sferik/following")
     end
-
-    context "without a username passed" do
-
-      it "returns the user's following" do
-        stub_get("https://api.github.com/users/sferik/following").
-          to_return(json_response("following.json"))
-        users = @client.following
-        expect(users.first.login).to eq("rails")
-      end
-
-    end
-
-  end
-
-  describe ".follows?" do
-
-    context "with one user following another" do
-
-      it "returns true" do
-        stub_get("https://api.github.com/user/following/puls").
-          to_return(:status => 204, :body => "")
-        follows = @client.follows?("sferik", "puls")
-        expect(follows).to eq(true)
-      end
-
+    it "returns the authenticated user's following" do
+      users = @client.following
+      expect(users).to be_kind_of Array
+      assert_requested :get, github_url("/users/#{test_github_login}/following")
     end
+  end # .following
 
-    context "with one user not following another" do
-
-      it "returns false" do
-        stub_get("https://api.github.com/user/following/dogbrainz").
-          to_return(:status => 404, :body => "")
-        follows = @client.follows?("sferik", "dogbrainz")
-        expect(follows).to be_false
-      end
-
+  describe ".follows?", :vcr do
+    it "checks if the authenticated user follows another" do
+      follows = @client.follows?("sferik")
+      assert_requested :get, github_url("/user/following/sferik")
     end
+  end # .follows?
 
-  end
-
-  describe ".follow" do
-
+  describe ".follow", :vcr do
     it "follows a user" do
-      stub_put("https://api.github.com/user/following/dianakimball").
-        to_return(:status => 204, :body => "")
-      following = @client.follow("dianakimball")
-      expect(following).to eq(true)
+      following = @client.follow("pengwynn")
+      assert_requested :put, github_url("/user/following/pengwynn")
     end
+  end # .follow
 
-  end
-
-  describe ".unfollow" do
-
+  describe ".unfollow", :vcr do
     it "unfollows a user" do
-      stub_delete("https://api.github.com/user/following/dogbrainz").
-        to_return(:status => 204, :body => "")
-      following = @client.unfollow("dogbrainz")
-      expect(following).to eq(true)
+      following = @client.unfollow("pengwynn")
+      assert_requested :delete, github_url("/user/following/pengwynn")
     end
+  end # .unfollow
 
-  end
-
-  describe ".starred?" do
-
-    context "with on user starring a repo" do
-
-      it "returns true" do
-        stub_get("https://api.github.com/user/starred/sferik/rails_admin").
-          to_return(:status => 204, :body => "")
-        starred = @client.starred?("sferik", "rails_admin")
-        expect(starred).to eq(true)
-      end
-
+  describe ".starred?", :vcr do
+    it "checks if the authenticated user has starred a repository" do
+      starred = @client.starred?("sferik", "rails_admin")
+      assert_requested :get, github_url("/user/starred/sferik/rails_admin")
     end
+  end # .starred?
 
-    context "with on user not starring a repo" do
-
-      it "returns false" do
-        stub_get("https://api.github.com/user/starred/sferik/dogbrainz").
-          to_return(:status => 404, :body => "")
-        starred = @client.starred?("sferik", "dogbrainz")
-        expect(starred).to be_false
-      end
-
-    end
-
-  end
-
-  describe ".starred" do
-
-    context "with a username passed" do
-
-      it "returns starred repositories" do
-        stub_get("https://api.github.com/users/sferik/starred").
-          to_return(json_response("starred.json"))
-        repositories = @client.starred("sferik")
-        expect(repositories.first.name).to eq("grit")
-      end
-
-    end
-
-    context "without a username passed" do
-
-      it "returns starred repositories" do
-        stub_get("https://api.github.com/users/sferik/starred").
-          to_return(json_response("starred.json"))
-        repositories = @client.starred
-        expect(repositories.first.name).to eq("grit")
-      end
-
-    end
-
-  end
-
-  describe ".watched" do
-
-    context "with a username passed" do
-
-      it "returns watched repositories" do
-        stub_get("https://api.github.com/users/sferik/watched").
-          to_return(json_response("watched.json"))
-        repositories = @client.watched("sferik")
-        expect(repositories.first.name).to eq("grit")
-      end
-
-    end
-
-    context "without a username passed" do
-
-      it "returns watched repositories" do
-        stub_get("https://api.github.com/users/sferik/watched").
-          to_return(json_response("watched.json"))
-        repositories = @client.watched
-        expect(repositories.first.name).to eq("grit")
-      end
-
+  describe ".starred", :vcr do
+    it "returns starred repositories for a user" do
+      repositories = Octokit.starred("sferik")
+      assert_requested :get, github_url("/users/sferik/starred")
     end
-
-  end
-
-  describe ".key" do
-
-    it "returns a public key" do
-      stub_get("https://api.github.com/user/keys/103205").
-        to_return(json_response('public_key.json'))
-      public_key = @client.key(103205)
-      expect(public_key.id).to eq(103205)
-      expect(public_key[:key]).to include("ssh-dss AAAAB")
+    it "returns starred repositories for the authenticated user" do
+      repositories = @client.starred
+      assert_requested :get, github_url("/user/starred")
     end
+  end # .starred
 
-  end
-
-  describe ".keys" do
-
-    it "returns public keys" do
-      stub_get("https://api.github.com/user/keys").
-        to_return(json_response("public_keys.json"))
+  describe ".keys", :vcr do
+    it "returns public keys for the authenticated user" do
       public_keys = @client.keys
-      expect(public_keys.first.id).to eq(103205)
+      expect(public_keys).to be_kind_of Array
+      assert_requested :get, github_url("/user/keys")
     end
+  end # .keys
 
-  end
-  
-  describe ".user_keys" do
-
-    it "returns public keys for a user" do
-      stub_get("https://api.github.com/users/pengwynn/keys").
-        to_return(json_response("public_keys.json"))
-      public_keys = @client.user_keys 'pengwynn'
-      expect(public_keys.first.id).to eq(103205)
+  describe ".user_keys", :vcr do
+    it "returns public keys for another user" do
+      public_keys = Octokit.user_keys("pengwynn")
+      expect(public_keys).to be_kind_of Array
+      assert_requested :get, github_url("/users/pengwynn/keys")
     end
+  end # .user_keys
 
-  end
-
-  describe ".add_key" do
+  context "methods requiring an existing @public_key", :vcr do
 
-    it "adds a public key" do
-      title, key = "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"
-      stub_post("https://api.github.com/user/keys").
-        with(:title => title, :key => key).
-        to_return(json_response("public_key.json"))
-      public_key = @client.add_key(title, key)
-      expect(public_key.id).to eq(103205)
+    before(:each) do
+      title, key = "wynning", "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDN/h7Hf5TA6G4p19deF8YS9COfuBd133GPs49tO6AU/DKIt7tlitbnUnttT0VbNZM4fplyinPu5vJl60eusn/Ngq2vDfSHP5SfgHfA9H8cnHGPYG7w6F0CujFB3tjBhHa3L6Je50E3NC4+BGGhZMpUoTClEI5yEzx3qosRfpfJu/2MUp/V2aARCAiHUlUoj5eiB15zC25uDsY7SYxkh1JO0ecKSMISc/OCdg0kwi7it4t7S/qm8Wh9pVGuA5FmVk8w0hvL+hHWB9GT02WPqiesMaS9Sj3t0yuRwgwzLDaudQPKKTKYXi+SjwXxTJ/lei2bZTMC4QxYbqfqYQt66pQB wynn.netherland+api-padawan@gmail.com"
+      @public_key = @client.add_key(title, key)
     end
 
-  end
-
-  describe ".update_key" do
-
-    it "updates a public key" do
-      updated_key = {
-        :title => "updated title",
-        :key => "ssh-rsa BBBB..."
-      }
-      stub_patch("https://api.github.com/user/keys/1").
-        with(updated_key).
-          to_return(json_response("public_key_update.json"))
-      public_key = @client.update_key(1, updated_key)
-      expect(public_key[:title]).to eq(updated_key[:title])
-      expect(public_key[:key]).to eq(updated_key[:key])
+    after(:each) do
+      @client.remove_key(@public_key.id)
     end
 
-  end
-
-  describe ".remove_key" do
+    describe ".add_key" do
+      it "adds a public key" do
+        assert_requested :post, github_url("/user/keys")
+      end
+    end # .add_key
 
-    it "removes a public key" do
-      stub_delete("https://api.github.com/user/keys/103205").
-        to_return(:status => 204, :body => "")
-      response = @client.remove_key(103205)
-      expect(response).to eq(true)
+    describe ".key" do
+      it "returns a public key" do
+        key = @client.key @public_key.id
+        assert_requested :get, github_url("/user/keys/#{@public_key.id}")
+      end
     end
 
-  end
+    describe ".update_key" do
+      it "updates a public key" do
+        public_key = @client.update_key(@public_key.id, :title => 'Updated key')
+        assert_requested :patch, github_url("/user/keys/#{@public_key.id}")
+      end
+    end # .update_key
+
+    describe ".remove_key" do
+      it "removes a public key" do
+        response = @client.remove_key(@public_key.id)
+        assert_requested :delete, github_url("/user/keys/#{@public_key.id}")
+      end
+    end # .remove_key
 
-  describe ".emails" do
+  end # @public_key methods
 
+  describe ".emails", :vcr do
     it "returns email addresses" do
-      stub_get("https://api.github.com/user/emails").
-        to_return(json_response("emails.json"))
       emails = @client.emails
-      expect(emails.first).to eq("sferik@gmail.com")
+      expect(emails).to be_kind_of Array
+      assert_requested :get, github_url("/user/emails")
     end
+  end # .emails
 
-  end
-
-  describe ".add_email" do
-
+  describe ".add_email", :vcr do
     it "adds an email address" do
-      stub_post("https://api.github.com/user/emails").
-        with(:email => "sferik@gmail.com").
-        to_return(json_response("emails.json"))
-      emails = @client.add_email("sferik@gmail.com")
-      expect(emails.first).to eq("sferik@gmail.com")
+      emails = @client.add_email("wynn.netherland+apitest@gmail.com")
+      assert_requested :post, github_url("/user/emails")
     end
+  end # .add_email
 
-  end
-
-  describe ".remove_email" do
-
+  describe ".remove_email", :vcr do
     it "removes an email address" do
-      stub_delete("https://api.github.com/user/emails?email=sferik@gmail.com").
-        to_return(:status => 204, :body => "")
-      response = @client.remove_email("sferik@gmail.com")
-      expect(response).to eq(true)
+      emails = @client.remove_email("wynn.netherland+apitest@gmail.com")
+      assert_requested :delete, github_url("/user/emails")
     end
+  end # .remove_email
 
-  end
-
-  describe ".subscriptions" do
-
-    it "returns the repositories the user watches for notifications" do
-      stub_get("https://api.github.com/users/pengwynn/subscriptions").
-        to_return(json_response("subscriptions.json"))
-      subscriptions = @client.subscriptions("pengwynn")
-      expect(subscriptions.first.id).to eq(11560)
-      expect(subscriptions.first.name).to eq("ujs_sort_helper")
+  describe ".subscriptions", :vcr do
+    it "returns the repositories a user watches for notifications" do
+      subscriptions = Octokit.subscriptions("pengwynn")
+      assert_requested :get, github_url("/users/pengwynn/subscriptions")
     end
-  end
+    it "returns the repositories the authenticated user watches for notifications" do
+      subscriptions = @client.subscriptions
+      assert_requested :get, github_url("/user/subscriptions")
+    end
+  end # .subscriptions
+
+  describe '.access_token' do
+    it 'returns the access_token' do
+      VCR.turn_off!
+      stub_post("https://github.com/login/oauth/access_token").
+        to_return(json_response("web_flow_token.json"))
+      response = Octokit.exchange_code_for_token('code', 'id_here', 'secret_here')
+      expect(response.access_token).to eq 'this_be_ye_token/use_it_wisely'
+      assert_requested :post, "https://github.com/login/oauth/access_token"
+      VCR.turn_on!
+    end
+  end # .access_token
 
 end