Fix basic auth extraction.

piotrmurach · piotrmurach · commit e3383179a8bc · 2016-06-19T21:38:06.000+01:00
diff --git a/lib/github_api/api.rb b/lib/github_api/api.rb
@@ -50,10 +50,9 @@ def initialize(options={}, &block)
       Github.configuration.property_names.each do |key|
         send("#{key}=", opts[key])
       end
-
-      if opts.key?(:login)
+      if opts.key?(:login) && !opts[:login].nil?
         @login, @password = opts[:login], opts[:password]
-      elsif opts.key?(:basic_auth)
+      elsif opts.key?(:basic_auth) && !opts[:basic_auth].nil?
         @login, @password = extract_basic_auth(opts[:basic_auth])
       end
 
diff --git a/spec/github/api_spec.rb b/spec/github/api_spec.rb
@@ -2,38 +2,33 @@
 
 require 'spec_helper'
 
-describe Github::API do
-  subject { described_class.new(options) }
-
-  it { described_class.included_modules.should include Github::Authorization }
-  it { described_class.included_modules.should include Github::MimeType }
-  it { described_class.included_modules.should include Github::Request::Verbs }
-
-  context 'actions' do
-    let(:options) { { } }
-    let(:repos) { Github::Client::Repos }
-
-    it { should respond_to :api_methods_in }
-
+RSpec.describe Github::API do
+  context '#actions' do
     it 'dynamically adds actions inspection to classes inheriting from api' do
-      repos.should respond_to :actions
-      repos.new.should respond_to :actions
+      repos = Github::Client::Repos
+      expect(repos).to respond_to(:actions)
+      expect(repos.new).to respond_to(:actions)
     end
 
     it 'ensures output contains api methods' do
-      methods = [ 'method_a', 'method_b']
-      repos.stub(:instance_methods).and_return methods
-      expect(subject.api_methods_in(repos)).to eq(['method_a', 'method_b'])
+      repos = Github::Client::Repos
+      methods = [:method_a, :method_b]
+      allow(repos).to receive(:instance_methods).and_return(methods)
+      expect(repos.new.api_methods_in(repos)).to eq([:method_a, :method_b])
     end
   end
 
-  context 'process_basic_auth' do
-    let(:options) { { :basic_auth => 'login:password' } }
+  context '#extract_basic_auth' do
+    let(:options) { { basic_auth: 'piotr:secret' } }
 
-    its(:login) { should eq 'login' }
-
-    its(:password) { should eq 'password' }
+    it "extracts login from :basic_auth param" do
+      api = Github::API.new(options)
+      expect(api.login).to eq('piotr')
+    end
 
-    its(:basic_auth) { should eq 'login:password' }
+    it "extracts password from :basic_auth param" do
+      api = Github::API.new(options)
+      expect(api.password).to eq('secret')
+    end
   end
 end # Github::API
