allscripts_unity_client 1.3.4 → 2.0.0

data/spec/json_client_driver_spec.rb

@@ -4,21 +4,21 @@ describe 'JSONClientDriver' do
   it_behaves_like 'a client driver'
 
   subject do
-    client_driver = FactoryGirl.build(:json_client_driver)
+    client_driver = build(:json_client_driver)
     client_driver.security_token = SecureRandom.uuid
     client_driver
   end
 
-  let(:get_server_info) { FixtureLoader.load_file("get_server_info.json") }
-  let(:get_security_token) { FixtureLoader.load_file("get_security_token.json") }
-  let(:retire_security_token) { FixtureLoader.load_file("retire_security_token.json") }
-  let(:error) { FixtureLoader.load_json("error.json") }
-  let(:error_string) { "error: Username and Password not valid for any licenses on this server" }
+  let(:get_server_info) { FixtureLoader.load_file('get_server_info.json') }
+  let(:get_security_token) { FixtureLoader.load_file('get_security_token.json') }
+  let(:retire_security_token) { FixtureLoader.load_file('retire_security_token.json') }
+  let(:error) { FixtureLoader.load_json('error.json') }
+  let(:error_string) { 'error: Username and Password not valid for any licenses on this server' }
   let(:url) { Faker::Internet.url }
 
   let(:hash) do
     {
-      "test" => true
+      'test' => true
     }
   end
 
@@ -27,49 +27,9 @@ describe 'JSONClientDriver' do
   end
 
   describe '#initialize' do
-    context 'when nil is given for base_unity_url' do
-      it { expect { FactoryGirl.build(:json_client_driver, :base_unity_url => nil) }.to raise_error(ArgumentError) }
-    end
-
-    context 'when nil is given for username' do
-      it { expect { FactoryGirl.build(:json_client_driver, :username => nil) }.to raise_error(ArgumentError) }
-    end
-
-    context 'when nil is given for password' do
-      it { expect { FactoryGirl.build(:json_client_driver, :password => nil) }.to raise_error(ArgumentError) }
-    end
-
-    context 'when nil is given for appname' do
-      it { expect { FactoryGirl.build(:json_client_driver, :appname => nil) }.to raise_error(ArgumentError) }
-    end
-
-    context 'when given a base_unity_url with a trailing /' do
-      it 'sets @base_unity_url without the trailing /' do
-        client_driver = FactoryGirl.build(:json_client_driver, :base_unity_url => "http://www.example.com/")
-        expect(client_driver.base_unity_url).to eq("http://www.example.com")
-      end
-    end
-
-    context 'when nil is given for timezone' do
-      it 'sets @timezone to UTC' do
-        client_driver = FactoryGirl.build(:json_client_driver, :timezone => nil)
-        utc_timezone = FactoryGirl.build(:timezone, :zone_identifier => "UTC")
-        expect(client_driver.timezone.tzinfo).to eq(utc_timezone.tzinfo)
-      end
-    end
-
-    context 'when nil is given for logger' do
-      it 'sets @logger to Logger' do
-        client_driver = FactoryGirl.build(:json_client_driver, :logger => nil)
-        expect(client_driver.logger).to be_instance_of(Logger)
-      end
-    end
-
-    context 'when logger is set' do
-      it 'sets @logger to logger' do
-        logger = double("logger")
-        client_driver = FactoryGirl.build(:json_client_driver, :logger => logger)
-        expect(client_driver.logger).to be(logger)
+    context 'when given proxy' do
+      it 'passes configuration to connection' do
+        expect(build(:json_client_driver, proxy: url).connection.proxy.uri.to_s).to eq(url)
       end
     end
   end
@@ -80,7 +40,7 @@ describe 'JSONClientDriver' do
 
   describe '#magic' do
     before(:each) {
-      stub_request(:post, "http://www.example.com/Unity/UnityService.svc/json/MagicJson").to_return(:body => get_server_info)
+      stub_request(:post, 'http://www.example.com/Unity/UnityService.svc/json/MagicJson').to_return(body: get_server_info)
       allow(subject).to receive(:start_timer)
       allow(subject).to receive(:end_timer)
       allow(subject).to receive(:log_magic)
@@ -88,7 +48,7 @@ describe 'JSONClientDriver' do
 
     it 'should POST to /Unity/UnityService.svc/json/MagicJson' do
       subject.magic
-      WebMock.should have_requested(:post, "http://www.example.com/Unity/UnityService.svc/json/MagicJson")
+      expect(WebMock).to have_requested(:post, 'http://www.example.com/Unity/UnityService.svc/json/MagicJson').with(body: /\{"Action":(null|"[^"]*"),"AppUserID":(null|"[^"]*"),"Appname":(null|"[^"]*"),"PatientID":(null|"[^"]*"),"Token":(null|"[^"]*"),"Parameter1":(null|"[^"]*"),"Parameter2":(null|"[^"]*"),"Parameter3":(null|"[^"]*"),"Parameter4":(null|"[^"]*"),"Parameter5":(null|"[^"]*"),"Parameter6":(null|"[^"]*"),"Data":(null|"[^"]*")\}/, headers: { 'Content-Type' => 'application/json' })
     end
 
     it 'should call start_timer' do
@@ -109,15 +69,15 @@ describe 'JSONClientDriver' do
 
   describe '#get_security_token!' do
     before(:each) {
-      stub_request(:post, "http://www.example.com/Unity/UnityService.svc/json/GetToken").to_return(:body => get_security_token)
+      stub_request(:post, 'http://www.example.com/Unity/UnityService.svc/json/GetToken').to_return(body: get_security_token)
       allow(subject).to receive(:start_timer)
       allow(subject).to receive(:end_timer)
       allow(subject).to receive(:log_get_security_token)
     }
 
-    it 'should POST to /Unity/UnityService.svc/json/GetToken' do
+    it 'should POST to /Unity/UnityService.svc/json/GetToken with username, password, and appname' do
       subject.get_security_token!
-      WebMock.should have_requested(:post, "http://www.example.com/Unity/UnityService.svc/json/GetToken")
+      expect(WebMock).to have_requested(:post, 'http://www.example.com/Unity/UnityService.svc/json/GetToken').with(body: /\{"Username":"[^"]+","Password":"[^"]+","Appname":"[^"]+"\}/, headers: { 'Content-Type' => 'application/json' })
     end
 
     it 'should call start_timer' do
@@ -138,15 +98,15 @@ describe 'JSONClientDriver' do
 
   describe '#retire_security_token!' do
     before(:each) {
-      stub_request(:post, "http://www.example.com/Unity/UnityService.svc/json/RetireSecurityToken").to_return(:body => retire_security_token)
+      stub_request(:post, 'http://www.example.com/Unity/UnityService.svc/json/RetireSecurityToken').to_return(body: retire_security_token)
       allow(subject).to receive(:start_timer)
       allow(subject).to receive(:end_timer)
       allow(subject).to receive(:log_retire_security_token)
     }
 
-    it 'should POST to /Unity/UnityService.svc/json/RetireSecurityToken' do
+    it 'should POST to /Unity/UnityService.svc/json/RetireSecurityToken with token and appname' do
       subject.retire_security_token!
-      WebMock.should have_requested(:post, "http://www.example.com/Unity/UnityService.svc/json/RetireSecurityToken")
+      expect(WebMock).to have_requested(:post, 'http://www.example.com/Unity/UnityService.svc/json/RetireSecurityToken').with(body: /\{"Token":"[^"]+","Appname":"[^"]+"\}/, headers: { 'Content-Type' => 'application/json' })
     end
 
     it 'should call start_timer' do
@@ -165,34 +125,6 @@ describe 'JSONClientDriver' do
     end
   end
 
-  describe '#create_httpi_request' do
-    context 'when given url' do
-      it 'returns an HTTPI request with that url' do
-        expect(subject.send(:create_httpi_request, url, hash).url.to_s).to eq(url)
-      end
-    end
-
-    context 'when given data' do
-      it 'returns an HTTPI request with body set to that data' do
-        expect(subject.send(:create_httpi_request, url, hash).body).to eq(json_hash)
-      end
-    end
-
-    context 'when @proxy is nil' do
-      it 'returns an HTTPI request with proxy set to nil' do
-        subject.proxy = nil
-        expect(subject.send(:create_httpi_request, url, hash).proxy).to be_nil
-      end
-    end
-
-    context 'when @proxy is set' do
-      it 'return an HTTPI request with proxy set to @proxy' do
-        subject.proxy = url
-        expect(subject.send(:create_httpi_request, url, hash).proxy.to_s).to eq(url)
-      end
-    end
-  end
-
   describe '#raise_if_response_error' do
     context 'when given nil for response' do
       it { expect { subject.send(:raise_if_response_error, nil) }.to raise_error(AllscriptsUnityClient::APIError) }

data/spec/json_unity_request_spec.rb

@@ -3,34 +3,34 @@ require 'spec_helper'
 describe 'JSONUnityRequest' do
   it_behaves_like 'a unity request'
 
-  subject { FactoryGirl.build(:json_unity_request) }
+  subject { build(:json_unity_request) }
 
   describe '#initialize' do
     context 'when nil is given for parameters' do
-      it { expect { FactoryGirl.build(:json_unity_request, :parameters => nil) }.to raise_error(ArgumentError) }
+      it { expect { build(:json_unity_request, parameters: nil) }.to raise_error(ArgumentError) }
     end
 
     context 'when nil is given for timezone' do
-      it { expect { FactoryGirl.build(:json_unity_request, :timezone => nil) }.to raise_error(ArgumentError) }
+      it { expect { build(:json_unity_request, timezone: nil) }.to raise_error(ArgumentError) }
     end
 
     context 'when nil is given for appname' do
-      it { expect { FactoryGirl.build(:json_unity_request, :appname => nil) }.to raise_error(ArgumentError) }
+      it { expect { build(:json_unity_request, appname: nil) }.to raise_error(ArgumentError) }
     end
 
     context 'when nil is given for security_token' do
-      it { expect { FactoryGirl.build(:json_unity_request, :security_token => nil) }.to raise_error(ArgumentError) }
+      it { expect { build(:json_unity_request, security_token: nil) }.to raise_error(ArgumentError) }
     end
   end
 
   describe '#to_hash' do
     it ':userid maps to AppUserID' do
-      subject.parameters = FactoryGirl.build(:magic_request, :userid => 'UserID')
+      subject.parameters = build(:magic_request, userid: 'UserID')
       expect(subject.to_hash['AppUserID']).to eq('UserID')
     end
 
     it ':data maps to Base64 encoded Data' do
-      subject.parameters = FactoryGirl.build(:magic_request, :data => 'data')
+      subject.parameters = build(:magic_request, data: 'data')
       expect(subject.to_hash['Data']).to eq(['data'].pack('m'))
     end
   end

data/spec/json_unity_response_spec.rb

@@ -3,18 +3,18 @@ require 'spec_helper'
 describe 'JSONUnityResponse' do
   it_behaves_like 'a unity response'
 
-  subject { FactoryGirl.build(:json_unity_response, :response => get_server_info) }
+  subject { build(:json_unity_response, response: get_server_info) }
 
-  let(:get_server_info) { FixtureLoader.load_yaml("get_server_info_json.yml") }
-  let(:get_providers) { FixtureLoader.load_yaml("get_providers_json.yml") }
+  let(:get_server_info) { FixtureLoader.load_yaml('get_server_info_json.yml') }
+  let(:get_providers) { FixtureLoader.load_yaml('get_providers_json.yml') }
 
   describe '#initialize' do
     context 'when nil is given for response' do
-      it { expect { FactoryGirl.build(:json_unity_response, :response => nil) }.to raise_error(ArgumentError) }
+      it { expect { build(:json_unity_response, response: nil) }.to raise_error(ArgumentError) }
     end
 
     context 'when nil is given for timezone' do
-      it { expect { FactoryGirl.build(:json_unity_response, :timezone => nil) }.to raise_error(ArgumentError) }
+      it { expect { build(:json_unity_response, timezone: nil) }.to raise_error(ArgumentError) }
     end
   end
 
@@ -28,7 +28,7 @@ describe 'JSONUnityResponse' do
     context 'when given empty response' do
       it 'returns []' do
         magic_response = get_providers
-        magic_response[0]["getprovidersinfo"] = []
+        magic_response[0]['getprovidersinfo'] = []
         subject.response = magic_response
         expect(subject.to_hash).to eq([])
       end

data/spec/soap_client_driver_spec.rb

@@ -5,82 +5,20 @@ describe 'SOAPClientDriver' do
   it_behaves_like 'a client driver'
 
   subject do
-    client_driver = FactoryGirl.build(:soap_client_driver)
+    client_driver = build(:soap_client_driver, proxy: 'http://localhost:8888')
     client_driver.security_token = SecureRandom.uuid
     client_driver
   end
 
-  let(:get_server_info) { FixtureLoader.load_file("get_server_info.xml") }
-  let(:get_security_token) { FixtureLoader.load_file("get_security_token.xml") }
-  let(:retire_security_token) { FixtureLoader.load_file("retire_security_token.xml") }
-  let(:soap_fault) { FixtureLoader.load_file("soap_fault.xml") }
+  let(:get_server_info) { FixtureLoader.load_file('get_server_info.xml') }
+  let(:get_security_token) { FixtureLoader.load_file('get_security_token.xml') }
+  let(:retire_security_token) { FixtureLoader.load_file('retire_security_token.xml') }
+  let(:soap_fault) { FixtureLoader.load_file('soap_fault.xml') }
   let(:url) { Faker::Internet.url }
 
   before(:all) { savon.mock! }
   after(:all) { savon.unmock! }
 
-  describe '#initialize' do
-    context 'when nil is given for base_unity_url' do
-      it { expect { FactoryGirl.build(:soap_client_driver, :base_unity_url => nil) }.to raise_error(ArgumentError) }
-    end
-
-    context 'when nil is given for username' do
-      it { expect { FactoryGirl.build(:soap_client_driver, :username => nil) }.to raise_error(ArgumentError) }
-    end
-
-    context 'when nil is given for password' do
-      it { expect { FactoryGirl.build(:soap_client_driver, :password => nil) }.to raise_error(ArgumentError) }
-    end
-
-    context 'when nil is given for appname' do
-      it { expect { FactoryGirl.build(:soap_client_driver, :appname => nil) }.to raise_error(ArgumentError) }
-    end
-
-    context 'when given a base_unity_url with a trailing /' do
-      it 'sets @base_unity_url without the trailing /' do
-        client_driver = FactoryGirl.build(:soap_client_driver, :base_unity_url => "http://www.example.com/")
-        expect(client_driver.base_unity_url).to eq("http://www.example.com")
-      end
-    end
-
-    context 'when nil is given for timezone' do
-      it 'sets @timezone to UTC' do
-        client_driver = FactoryGirl.build(:soap_client_driver, :timezone => nil)
-        utc_timezone = FactoryGirl.build(:timezone, :zone_identifier => "UTC")
-        expect(client_driver.timezone.tzinfo).to eq(utc_timezone.tzinfo)
-      end
-    end
-
-    context 'when nil is given for proxy' do
-      it 'sets Savon proxy option to nil' do
-        client_driver = FactoryGirl.build(:soap_client_driver, :proxy => nil)
-        expect(client_driver.savon_client.globals.instance_variable_get("@options")[:proxy]).to be_nil
-      end
-    end
-
-    context 'when proxy is given' do
-      it 'sets Savon proxy option to the given url' do
-        client_driver = FactoryGirl.build(:soap_client_driver, :proxy => url)
-        expect(client_driver.savon_client.globals.instance_variable_get("@options")[:proxy]).to eq(url)
-      end
-    end
-
-    context 'when nil is given for logger' do
-      it 'sets @logger to Logger' do
-        client_driver = FactoryGirl.build(:soap_client_driver, :logger => nil)
-        expect(client_driver.logger).to be_instance_of(Logger)
-      end
-    end
-
-    context 'when logger is set' do
-      it 'sets @logger to logger' do
-        logger = double("logger")
-        client_driver = FactoryGirl.build(:soap_client_driver, :logger => logger)
-        expect(client_driver.logger).to be(logger)
-      end
-    end
-  end
-
   describe '#client_type' do
     it { expect(subject.client_type).to be(:soap) }
   end
@@ -93,31 +31,31 @@ describe 'SOAPClientDriver' do
     }
 
     it 'should send a SOAP request to Magic endpoint' do
-      savon.expects("Magic").with(:message => :any).returns(get_server_info)
+      savon.expects('Magic').with(message: :any).returns(get_server_info)
       subject.magic
     end
 
     context 'when a Savon::SOAPFault is raised' do
       it 'should raise an APIError' do
-        savon.expects("Magic").with(:message => :any).returns({ code: 500, headers: {}, body: soap_fault })
+        savon.expects('Magic').with(message: :any).returns({ code: 500, headers: {}, body: soap_fault })
         expect { subject.magic }.to raise_error(AllscriptsUnityClient::APIError)
       end
     end
 
     it 'should call start_timer' do
-      savon.expects("Magic").with(:message => :any).returns(get_server_info)
+      savon.expects('Magic').with(message: :any).returns(get_server_info)
       subject.magic
       expect(subject).to have_received(:start_timer)
     end
 
     it 'should call end_timer' do
-      savon.expects("Magic").with(:message => :any).returns(get_server_info)
+      savon.expects('Magic').with(message: :any).returns(get_server_info)
       subject.magic
       expect(subject).to have_received(:start_timer)
     end
 
     it 'should call log_magic' do
-      savon.expects("Magic").with(:message => :any).returns(get_server_info)
+      savon.expects('Magic').with(message: :any).returns(get_server_info)
       subject.magic
       expect(subject).to have_received(:log_magic)
     end
@@ -131,31 +69,31 @@ describe 'SOAPClientDriver' do
     }
 
     it 'should send a SOAP request to GetSecurityToken endpoint' do
-      savon.expects("GetSecurityToken").with(:message => :any).returns(get_security_token)
+      savon.expects('GetSecurityToken').with(message: :any).returns(get_security_token)
       subject.get_security_token!
     end
 
     context 'when a Savon::SOAPFault is raised' do
       it 'should raise an APIError' do
-        savon.expects("GetSecurityToken").with(:message => :any).returns({ code: 500, headers: {}, body: soap_fault })
+        savon.expects('GetSecurityToken').with(message: :any).returns({ code: 500, headers: {}, body: soap_fault })
         expect { subject.get_security_token! }.to raise_error(AllscriptsUnityClient::APIError)
       end
     end
 
     it 'should call start_timer' do
-      savon.expects("GetSecurityToken").with(:message => :any).returns(get_security_token)
+      savon.expects('GetSecurityToken').with(message: :any).returns(get_security_token)
       subject.get_security_token!
       expect(subject).to have_received(:start_timer)
     end
 
     it 'should call end_timer' do
-      savon.expects("GetSecurityToken").with(:message => :any).returns(get_security_token)
+      savon.expects('GetSecurityToken').with(message: :any).returns(get_security_token)
       subject.get_security_token!
       expect(subject).to have_received(:start_timer)
     end
 
     it 'should call log_get_security_token' do
-      savon.expects("GetSecurityToken").with(:message => :any).returns(get_security_token)
+      savon.expects('GetSecurityToken').with(message: :any).returns(get_security_token)
       subject.get_security_token!
       expect(subject).to have_received(:log_get_security_token)
     end
@@ -169,31 +107,31 @@ describe 'SOAPClientDriver' do
     }
 
     it 'should send a SOAP request to RetireSecurityToken endpoint' do
-      savon.expects("RetireSecurityToken").with(:message => :any).returns(retire_security_token)
+      savon.expects('RetireSecurityToken').with(message: :any).returns(retire_security_token)
       subject.retire_security_token!
     end
 
     context 'when a Savon::SOAPFault is raised' do
       it 'should raise an APIError' do
-        savon.expects("RetireSecurityToken").with(:message => :any).returns({ code: 500, headers: {}, body: soap_fault })
+        savon.expects('RetireSecurityToken').with(message: :any).returns({ code: 500, headers: {}, body: soap_fault })
         expect { subject.retire_security_token! }.to raise_error(AllscriptsUnityClient::APIError)
       end
     end
 
     it 'should call start_timer' do
-      savon.expects("RetireSecurityToken").with(:message => :any).returns(retire_security_token)
+      savon.expects('RetireSecurityToken').with(message: :any).returns(retire_security_token)
       subject.retire_security_token!
       expect(subject).to have_received(:start_timer)
     end
 
     it 'should call end_timer' do
-      savon.expects("RetireSecurityToken").with(:message => :any).returns(retire_security_token)
+      savon.expects('RetireSecurityToken').with(message: :any).returns(retire_security_token)
       subject.retire_security_token!
       expect(subject).to have_received(:start_timer)
     end
 
     it 'should call log_retire_security_token' do
-      savon.expects("RetireSecurityToken").with(:message => :any).returns(retire_security_token)
+      savon.expects('RetireSecurityToken').with(message: :any).returns(retire_security_token)
       subject.retire_security_token!
       expect(subject).to have_received(:log_retire_security_token)
     end

data/spec/spec_helper.rb

@@ -10,14 +10,9 @@ SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
 SimpleCov.start do
   add_filter do |source_file|
     filename = Pathname.new(source_file.filename).basename
-    ignored_files = [
-      "version.rb",
-      "allscripts_unity_client.gemspec",
-      "Gemfile",
-      "Rakefile"
-    ]
-
-    ignored_files.include?(filename) || source_file.filename.include?("spec/")
+    ignored_files = %w(version.rb allscripts_unity_client.gemspec Gemfile Rakefile)
+
+    ignored_files.include?(filename) || source_file.filename.include?('spec/')
   end
 end
 
@@ -35,10 +30,11 @@ require 'factory_girl'
 require 'json'
 
 # Include all support files
-Dir["./spec/support/**/*.rb"].sort.each { |f| require f }
+Dir['./spec/support/**/*.rb'].sort.each { |f| require f }
 
 # Include all factories
 FactoryGirl.find_definitions
 
 RSpec.configure do |config|
+  config.include FactoryGirl::Syntax::Methods
 end

data/spec/support/shared_examples_for_client_driver.rb

@@ -3,35 +3,19 @@ shared_examples 'a client driver' do
     context 'when @security_token is nil' do
       it do
         subject.security_token = nil
-        expect(subject.security_token?).to be_false
+        expect(subject.security_token?).to be_falsey
       end
     end
 
     context 'when @security_token is not nil' do
       it do
-        subject.security_token = "security token"
-        expect(subject.security_token?).to be_true
+        subject.security_token = 'security token'
+        expect(subject.security_token?).to be_truthy
       end
     end
   end
 
-  describe "#log?" do
-    context 'when log is false' do
-      it 'return false' do
-        subject.log = false
-        expect(subject.log).to be_false
-      end
-    end
-
-    context 'when log is true' do
-      it 'return false' do
-        subject.log = true
-        expect(subject.log).to be_true
-      end
-    end
-  end
-
-  describe "#log_get_security_token" do
+  describe '#log_get_security_token' do
     it 'should call log_info' do
       allow(subject).to receive(:log_info)
       subject.send(:log_get_security_token)
@@ -39,7 +23,7 @@ shared_examples 'a client driver' do
     end
   end
 
-  describe "#log_retire_security_token" do
+  describe '#log_retire_security_token' do
     it 'should call log_info' do
       allow(subject).to receive(:log_info)
       subject.send(:log_retire_security_token)
@@ -47,10 +31,10 @@ shared_examples 'a client driver' do
     end
   end
 
-  describe "#log_magic" do
+  describe '#log_magic' do
     it 'should call log_info' do
       allow(subject).to receive(:log_info)
-      subject.send(:log_magic, double(:parameters => { :action => "action" }))
+      subject.send(:log_magic, double(parameters: { action: 'action'}))
       expect(subject).to have_received(:log_info)
     end
 
@@ -60,58 +44,53 @@ shared_examples 'a client driver' do
   end
 
   describe '#log_info' do
-    context 'when log? is true' do
-      it 'should call @logger.info' do
-        subject.log = true
-        allow(subject.logger).to receive(:info)
-        subject.send(:log_info, "test")
-        expect(subject.logger).to have_received(:info)
+    context 'when @options.logger? is true' do
+      it 'should call @options.logger.info' do
+        subject.options.logger = double('logger', info: true)
+        subject.send(:log_info, 'test')
+        expect(subject.options.logger).to have_received(:info)
       end
     end
 
-    context 'when log? is false' do
-      it 'should not call @logger.info' do
-        subject.log = false
-        allow(subject.logger).to receive(:info)
-        subject.send(:log_info, "test")
-        expect(subject.logger).to_not have_received(:info)
+    context 'when @options.logger? is false' do
+      it 'should not call @options.logger.info' do
+        allow_message_expectations_on_nil
+        subject.options.logger = nil
+        allow(subject.options.logger).to receive(:info)
+        subject.send(:log_info, 'test')
+        expect(subject.options.logger).not_to have_received(:info)
       end
     end
 
     context 'when given nil for message' do
-      it 'should not call @logger.info' do
-        subject.log = true
-        allow(subject.logger).to receive(:info)
+      it 'should not call @options.logger.info' do
+        subject.options.logger = double('logger', info: true)
         subject.send(:log_info, nil)
-        expect(subject.logger).to_not have_received(:info)
+        expect(subject.options.logger).not_to have_received(:info)
       end
     end
 
-    context 'when @logger is nil and log is true' do
+    context 'when @options.logger? is false' do
       it 'should not call @logger.info' do
-        subject.log = true
-        subject.logger = nil
-        expect { subject.send(:log_info, "test") }.to_not raise_error
+        expect { subject.send(:log_info, 'test') }.not_to raise_error
       end
     end
 
-    context 'when @timer is nil and log is true' do
+    context 'when @timer is nil and @options.logger is true' do
       it 'should not include seconds in the log' do
-        subject.log = true
-        subject.instance_variable_set("@timer", nil)
-        allow(subject.logger).to receive(:info)
-        subject.send(:log_info, "test")
-        expect(subject.logger).to_not have_received(:info).with(match(/seconds/))
+        subject.options.logger = double('logger', info: true)
+        subject.instance_variable_set('@timer', nil)
+        subject.send(:log_info, 'test')
+        expect(subject.options.logger).not_to have_received(:info).with(match(/seconds/))
       end
     end
 
-    context 'when @timer is not nil and log is true' do
+    context 'when @timer is not nil and @options.logger? is true' do
       it 'should include seconds in log' do
-        subject.log = true
-        subject.instance_variable_set("@timer", 1.2)
-        allow(subject.logger).to receive(:info)
-        subject.send(:log_info, "test")
-        expect(subject.logger).to have_received(:info).with(match(/seconds/))
+        subject.options.logger = double('logger', info: true)
+        subject.instance_variable_set('@timer', 1.2)
+        subject.send(:log_info, 'test')
+        expect(subject.options.logger).to have_received(:info).with(match(/seconds/))
       end
     end
   end
@@ -119,7 +98,7 @@ shared_examples 'a client driver' do
   describe '#start_timer' do
     it 'sets @start_time' do
       subject.send(:start_timer)
-      expect(subject.instance_variable_get("@start_time")).to_not be_nil
+      expect(subject.instance_variable_get('@start_time')).not_to be_nil
     end
   end
 
@@ -127,13 +106,13 @@ shared_examples 'a client driver' do
     it 'sets @end_time' do
       subject.send(:start_timer)
       subject.send(:end_timer)
-      expect(subject.instance_variable_get("@end_time")).to_not be_nil
+      expect(subject.instance_variable_get('@end_time')).not_to be_nil
     end
 
     it 'sets @timer to @end_time - @start_time' do
       subject.send(:start_timer)
       subject.send(:end_timer)
-      expect(subject.instance_variable_get("@timer")).to eq(subject.instance_variable_get("@end_time") - subject.instance_variable_get("@start_time"))
+      expect(subject.instance_variable_get('@timer')).to eq(subject.instance_variable_get('@end_time') - subject.instance_variable_get('@start_time'))
     end
   end
 end