Fix oauth test dependencies leaks, call client directly.

piotrmurach · piotrmurach · commit b911673a66d7 · 2012-03-11T14:44:04.000Z
diff --git a/lib/github_api/authorization.rb b/lib/github_api/authorization.rb
@@ -17,7 +17,7 @@ def client
     # Strategy token
     def auth_code
       _verify_client
-      @client.auth_code
+      client.auth_code
     end
 
     # Sends authorization request to GitHub.
@@ -33,13 +33,13 @@ def auth_code
     #
     def authorize_url(params = {})
       _verify_client
-      @client.auth_code.authorize_url(params)
+      client.auth_code.authorize_url(params)
     end
 
     # Makes request to token endpoint and retrieves access token value
     def get_token(authorization_code, params = {})
       _verify_client
-      @client.auth_code.get_token(authorization_code, params)
+      client.auth_code.get_token(authorization_code, params)
     end
 
     # Check whether authentication credentials are present
diff --git a/spec/github/authorization_spec.rb b/spec/github/authorization_spec.rb
@@ -1,26 +1,18 @@
+# encoding: utf-8
+
 require 'spec_helper'
 
 describe Github::Authorization do
-
   let(:client_id) { '234jl23j4l23j4l' }
   let(:client_secret) { 'asasd79sdf9a7asfd7sfd97s' }
   let(:code) { 'c9798sdf97df98ds'}
-  let(:github) { Github.new }
-
-  it "should instantiate oauth2 instance" do
-    github.client.should be_a OAuth2::Client
-  end
-
-  it "should assign site from the options hash" do
-    github.client.site.should == 'https://github.com'
-  end
-
-  it "should assign 'authorize_url" do
-    github.client.authorize_url.should == 'https://github.com/login/oauth/authorize'
-  end
+  let(:github) {
+    Github.new :client_id => client_id, :client_secret => client_secret
+  }
 
-  it "should assign 'token_url" do
-    github.client.token_url.should == 'https://github.com/login/oauth/access_token'
+  after do
+    github.client_id, github.client_secret = nil, nil
+    reset_authentication_for github
   end
 
   context '.client' do
@@ -29,18 +21,22 @@
     it "should return OAuth2::Client instance" do
       github.client.should be_a OAuth2::Client
     end
-  end
 
-  context '.auth_code' do
-    let(:oauth) { OAuth2::Client.new(client_id, client_secret) }
+    it "should assign site from the options hash" do
+      github.client.site.should == 'https://github.com'
+    end
 
-    before do
-      github = Github.new :client_id => client_id, :client_secret => client_secret
+    it "should assign 'authorize_url" do
+      github.client.authorize_url.should == 'https://github.com/login/oauth/authorize'
     end
 
-    after do
-      github.client_id, github.client_secret = nil, nil
+    it "should assign 'token_url" do
+      github.client.token_url.should == 'https://github.com/login/oauth/access_token'
     end
+  end
+
+  context '.auth_code' do
+    let(:oauth) { OAuth2::Client.new(client_id, client_secret) }
 
     it "should throw an error if no client_id" do
       github.client_id = nil
@@ -61,10 +57,6 @@
   end
 
   context "authorize_url" do
-    before do
-      github = Github.new :client_id => client_id, :client_secret => client_secret
-    end
-
     it "should respond to 'authorize_url' " do
       github.should respond_to :authorize_url
     end
@@ -84,7 +76,6 @@
 
   context "get_token" do
     before do
-      github = Github.new :client_id => client_id, :client_secret => client_secret
       stub_request(:post, 'https://github.com/login/oauth/access_token').
         to_return(:body => '', :status => 200, :headers => {})
     end
