From a265d3657188c2a10e93e523ce43bc491d91d079 Mon Sep 17 00:00:00 2001 From: Aaron Patterson Date: Tue, 6 Jul 2010 15:41:44 -0700 Subject: [PATCH] spec helper is in the load path, so no need for expand_path funny business --- spec/active_record/active_record_spec.rb | 2 +- spec/em/em_spec.rb | 4 ++-- spec/mysql2/client_spec.rb | 4 ++-- spec/mysql2/error_spec.rb | 4 ++-- spec/mysql2/result_spec.rb | 4 ++-- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/spec/active_record/active_record_spec.rb b/spec/active_record/active_record_spec.rb index 9ed8d16..922ac7e 100644 --- a/spec/active_record/active_record_spec.rb +++ b/spec/active_record/active_record_spec.rb @@ -1,5 +1,5 @@ # encoding: UTF-8 -require File.expand_path(File.dirname(__FILE__) + '/../spec_helper.rb') +require 'spec_helper' require 'rubygems' require 'active_record' require 'active_record/connection_adapters/mysql2_adapter' diff --git a/spec/em/em_spec.rb b/spec/em/em_spec.rb index d20f27f..ac4f65b 100644 --- a/spec/em/em_spec.rb +++ b/spec/em/em_spec.rb @@ -1,5 +1,5 @@ # encoding: UTF-8 -require File.expand_path(File.dirname(__FILE__) + '/../spec_helper.rb') +require 'spec_helper' require 'mysql2/em' describe Mysql2::EM::Client do @@ -23,4 +23,4 @@ describe Mysql2::EM::Client do results[0].keys.should include("second_query") results[1].keys.should include("first_query") end -end \ No newline at end of file +end diff --git a/spec/mysql2/client_spec.rb b/spec/mysql2/client_spec.rb index 9d022bd..bcfec2a 100644 --- a/spec/mysql2/client_spec.rb +++ b/spec/mysql2/client_spec.rb @@ -1,5 +1,5 @@ # encoding: UTF-8 -require File.expand_path(File.dirname(__FILE__) + '/../spec_helper.rb') +require 'spec_helper' describe Mysql2::Client do before(:each) do @@ -190,4 +190,4 @@ describe Mysql2::Client do @client.affected_rows.should eql(1) end end -end \ No newline at end of file +end diff --git a/spec/mysql2/error_spec.rb b/spec/mysql2/error_spec.rb index dfe302e..f321003 100644 --- a/spec/mysql2/error_spec.rb +++ b/spec/mysql2/error_spec.rb @@ -1,5 +1,5 @@ # encoding: UTF-8 -require File.expand_path(File.dirname(__FILE__) + '/../spec_helper.rb') +require 'spec_helper' describe Mysql2::Error do before(:each) do @@ -13,4 +13,4 @@ describe Mysql2::Error do it "should respond to #sql_state" do @error.should respond_to(:sql_state) end -end \ No newline at end of file +end diff --git a/spec/mysql2/result_spec.rb b/spec/mysql2/result_spec.rb index d747a23..d167c2a 100644 --- a/spec/mysql2/result_spec.rb +++ b/spec/mysql2/result_spec.rb @@ -1,5 +1,5 @@ # encoding: UTF-8 -require File.expand_path(File.dirname(__FILE__) + '/../spec_helper.rb') +require 'spec_helper' describe Mysql2::Result do before(:all) do @@ -331,4 +331,4 @@ describe Mysql2::Result do end end end -end \ No newline at end of file +end