diff --git a/spec/searchlogic/active_record/association_proxy_spec.rb b/spec/searchlogic/active_record/association_proxy_spec.rb index 9ccbc27f..4f61c4ee 100644 --- a/spec/searchlogic/active_record/association_proxy_spec.rb +++ b/spec/searchlogic/active_record/association_proxy_spec.rb @@ -1,4 +1,4 @@ -require File.expand_path(File.dirname(__FILE__) + "/../../spec_helper") +require 'spec_helper' describe "Searchlogic::ActiveRecord::AssociationProxy" do it "should call location conditions" do diff --git a/spec/searchlogic/active_record/consistency_spec.rb b/spec/searchlogic/active_record/consistency_spec.rb index 18bc196b..d230b61e 100644 --- a/spec/searchlogic/active_record/consistency_spec.rb +++ b/spec/searchlogic/active_record/consistency_spec.rb @@ -1,4 +1,4 @@ -require File.expand_path(File.dirname(__FILE__) + "/../../spec_helper") +require 'spec_helper' describe Searchlogic::ActiveRecord::Consistency do it "should merge joins with consistent conditions" do diff --git a/spec/searchlogic/core_ext/object_spec.rb b/spec/searchlogic/core_ext/object_spec.rb index ed20e382..bcc58da6 100644 --- a/spec/searchlogic/core_ext/object_spec.rb +++ b/spec/searchlogic/core_ext/object_spec.rb @@ -1,4 +1,4 @@ -require File.expand_path(File.dirname(__FILE__) + "/../../spec_helper") +require 'spec_helper' describe Searchlogic::CoreExt::Object do it "should accept and pass the argument to the searchlogic_options" do diff --git a/spec/searchlogic/core_ext/proc_spec.rb b/spec/searchlogic/core_ext/proc_spec.rb index 3bfb3f20..ee609938 100644 --- a/spec/searchlogic/core_ext/proc_spec.rb +++ b/spec/searchlogic/core_ext/proc_spec.rb @@ -1,4 +1,4 @@ -require File.expand_path(File.dirname(__FILE__) + "/../../spec_helper") +require 'spec_helper' describe Searchlogic::CoreExt::Proc do it "should have a searchlogic_options accessor" do diff --git a/spec/searchlogic/named_scopes/alias_scope_spec.rb b/spec/searchlogic/named_scopes/alias_scope_spec.rb index 084ef387..767638ab 100644 --- a/spec/searchlogic/named_scopes/alias_scope_spec.rb +++ b/spec/searchlogic/named_scopes/alias_scope_spec.rb @@ -1,4 +1,4 @@ -require File.expand_path(File.dirname(__FILE__) + "/../../spec_helper") +require 'spec_helper' describe Searchlogic::NamedScopes::AliasScope do before(:each) do diff --git a/spec/searchlogic/named_scopes/association_conditions_spec.rb b/spec/searchlogic/named_scopes/association_conditions_spec.rb index 908ce2b5..0cd02994 100644 --- a/spec/searchlogic/named_scopes/association_conditions_spec.rb +++ b/spec/searchlogic/named_scopes/association_conditions_spec.rb @@ -1,4 +1,4 @@ -require File.expand_path(File.dirname(__FILE__) + "/../../spec_helper") +require 'spec_helper' describe Searchlogic::NamedScopes::AssociationConditions do it "should create a named scope" do diff --git a/spec/searchlogic/named_scopes/association_ordering_spec.rb b/spec/searchlogic/named_scopes/association_ordering_spec.rb index bd234c0b..0ea0049c 100644 --- a/spec/searchlogic/named_scopes/association_ordering_spec.rb +++ b/spec/searchlogic/named_scopes/association_ordering_spec.rb @@ -1,4 +1,4 @@ -require File.expand_path(File.dirname(__FILE__) + "/../../spec_helper") +require 'spec_helper' describe Searchlogic::NamedScopes::Ordering do it "should allow ascending" do diff --git a/spec/searchlogic/named_scopes/column_conditions_spec.rb b/spec/searchlogic/named_scopes/column_conditions_spec.rb index 8f907839..bcd6615a 100644 --- a/spec/searchlogic/named_scopes/column_conditions_spec.rb +++ b/spec/searchlogic/named_scopes/column_conditions_spec.rb @@ -1,4 +1,4 @@ -require File.expand_path(File.dirname(__FILE__) + "/../../spec_helper") +require 'spec_helper' describe Searchlogic::NamedScopes::ColumnConditions do it "should be dynamically created and then cached" do diff --git a/spec/searchlogic/named_scopes/or_conditions_spec.rb b/spec/searchlogic/named_scopes/or_conditions_spec.rb index 2bbf6253..5bcb9fcc 100644 --- a/spec/searchlogic/named_scopes/or_conditions_spec.rb +++ b/spec/searchlogic/named_scopes/or_conditions_spec.rb @@ -1,4 +1,4 @@ -require File.expand_path(File.dirname(__FILE__) + "/../../spec_helper") +require 'spec_helper' describe Searchlogic::NamedScopes::OrConditions do it "should define a scope by the exact same name as requested by the code" do diff --git a/spec/searchlogic/named_scopes/ordering_spec.rb b/spec/searchlogic/named_scopes/ordering_spec.rb index 2b1169b9..13b4e942 100644 --- a/spec/searchlogic/named_scopes/ordering_spec.rb +++ b/spec/searchlogic/named_scopes/ordering_spec.rb @@ -1,4 +1,4 @@ -require File.expand_path(File.dirname(__FILE__) + "/../../spec_helper") +require 'spec_helper' describe Searchlogic::NamedScopes::Ordering do it "should have ascending" do