From f22df5816bd998890dfaff9191c365c21bfb87de Mon Sep 17 00:00:00 2001 From: Akira Matsuda Date: Sun, 11 Dec 2011 01:15:18 +0900 Subject: [PATCH] it is not required to require by full path. Let's trust the LOAD_PATH --- spec/acceptance/users_spec.rb | 2 +- spec/config/config_spec.rb | 2 +- spec/helpers/action_view_extension_spec.rb | 2 +- spec/helpers/helpers_spec.rb | 2 +- spec/helpers/sinatra_helpers_spec.rb | 4 ++-- spec/helpers/tags_spec.rb | 2 +- spec/models/active_record_relation_methods_spec.rb | 2 +- spec/models/array_spec.rb | 2 +- spec/models/data_mapper_spec.rb | 2 +- spec/models/default_per_page_spec.rb | 2 +- spec/models/mongo_mapper_spec.rb | 2 +- spec/models/mongoid_spec.rb | 2 +- spec/models/scopes_spec.rb | 2 +- spec/spec_helper.rb | 4 ++-- 14 files changed, 16 insertions(+), 16 deletions(-) diff --git a/spec/acceptance/users_spec.rb b/spec/acceptance/users_spec.rb index 15179a9..5a00046 100644 --- a/spec/acceptance/users_spec.rb +++ b/spec/acceptance/users_spec.rb @@ -1,5 +1,5 @@ # encoding: UTF-8 -require File.expand_path('../spec_helper', File.dirname(__FILE__)) +require 'spec_helper' feature 'Users' do background do diff --git a/spec/config/config_spec.rb b/spec/config/config_spec.rb index e4a03a0..2fa70c6 100644 --- a/spec/config/config_spec.rb +++ b/spec/config/config_spec.rb @@ -1,4 +1,4 @@ -require File.expand_path('../spec_helper', File.dirname(__FILE__)) +require 'spec_helper' describe Kaminari::Configuration do subject { Kaminari.config } diff --git a/spec/helpers/action_view_extension_spec.rb b/spec/helpers/action_view_extension_spec.rb index 7efd63b..3de3731 100644 --- a/spec/helpers/action_view_extension_spec.rb +++ b/spec/helpers/action_view_extension_spec.rb @@ -1,4 +1,4 @@ -require File.expand_path('../spec_helper', File.dirname(__FILE__)) +require 'spec_helper' describe 'Kaminari::ActionViewExtension' do before do diff --git a/spec/helpers/helpers_spec.rb b/spec/helpers/helpers_spec.rb index f89c055..d1ff21d 100644 --- a/spec/helpers/helpers_spec.rb +++ b/spec/helpers/helpers_spec.rb @@ -1,4 +1,4 @@ -require File.expand_path('../spec_helper', File.dirname(__FILE__)) +require 'spec_helper' include Kaminari::Helpers describe 'Kaminari::Helpers::Paginator' do diff --git a/spec/helpers/sinatra_helpers_spec.rb b/spec/helpers/sinatra_helpers_spec.rb index 3c944ac..750e326 100644 --- a/spec/helpers/sinatra_helpers_spec.rb +++ b/spec/helpers/sinatra_helpers_spec.rb @@ -1,5 +1,5 @@ -require File.expand_path('../spec_helper', File.dirname(__FILE__)) -require File.expand_path('../spec_helper_for_sinatra', File.dirname(__FILE__)) +require 'spec_helper' +require 'spec_helper_for_sinatra' ERB_TEMPLATE_FOR_PAGINATE = < diff --git a/spec/helpers/tags_spec.rb b/spec/helpers/tags_spec.rb index 95393e0..f8a96d3 100644 --- a/spec/helpers/tags_spec.rb +++ b/spec/helpers/tags_spec.rb @@ -1,4 +1,4 @@ -require File.expand_path('../spec_helper', File.dirname(__FILE__)) +require 'spec_helper' include Kaminari::Helpers describe 'Kaminari::Helpers' do diff --git a/spec/models/active_record_relation_methods_spec.rb b/spec/models/active_record_relation_methods_spec.rb index 3fd4763..1476389 100644 --- a/spec/models/active_record_relation_methods_spec.rb +++ b/spec/models/active_record_relation_methods_spec.rb @@ -1,4 +1,4 @@ -require File.expand_path('../spec_helper', File.dirname(__FILE__)) +require 'spec_helper' describe Kaminari::ActiveRecordRelationMethods do describe '#total_count' do diff --git a/spec/models/array_spec.rb b/spec/models/array_spec.rb index 5637ff9..a95c68c 100644 --- a/spec/models/array_spec.rb +++ b/spec/models/array_spec.rb @@ -1,4 +1,4 @@ -require File.expand_path('../spec_helper', File.dirname(__FILE__)) +require 'spec_helper' describe Kaminari::PaginatableArray do it { should have(0).items } diff --git a/spec/models/data_mapper_spec.rb b/spec/models/data_mapper_spec.rb index 59ead58..5efe486 100644 --- a/spec/models/data_mapper_spec.rb +++ b/spec/models/data_mapper_spec.rb @@ -1,4 +1,4 @@ -require File.expand_path('../spec_helper', File.dirname(__FILE__)) +require 'spec_helper' require 'dm-core' require 'dm-migrations' require 'dm-aggregates' diff --git a/spec/models/default_per_page_spec.rb b/spec/models/default_per_page_spec.rb index 34d7af4..b116b9c 100644 --- a/spec/models/default_per_page_spec.rb +++ b/spec/models/default_per_page_spec.rb @@ -1,4 +1,4 @@ -require File.expand_path('../spec_helper', File.dirname(__FILE__)) +require 'spec_helper' describe 'default per_page' do describe 'AR::Base' do diff --git a/spec/models/mongo_mapper_spec.rb b/spec/models/mongo_mapper_spec.rb index 4b4b8ae..11244bd 100644 --- a/spec/models/mongo_mapper_spec.rb +++ b/spec/models/mongo_mapper_spec.rb @@ -1,4 +1,4 @@ -require File.expand_path('../spec_helper', File.dirname(__FILE__)) +require 'spec_helper' require 'mongo_mapper' require 'kaminari/models/mongo_mapper_extension' diff --git a/spec/models/mongoid_spec.rb b/spec/models/mongoid_spec.rb index 41116d6..1a8d9a8 100644 --- a/spec/models/mongoid_spec.rb +++ b/spec/models/mongoid_spec.rb @@ -1,4 +1,4 @@ -require File.expand_path('../spec_helper', File.dirname(__FILE__)) +require 'spec_helper' require 'mongoid' require 'kaminari/models/mongoid_extension' diff --git a/spec/models/scopes_spec.rb b/spec/models/scopes_spec.rb index 50e744f..a21df29 100644 --- a/spec/models/scopes_spec.rb +++ b/spec/models/scopes_spec.rb @@ -1,4 +1,4 @@ -require File.expand_path('../spec_helper', File.dirname(__FILE__)) +require 'spec_helper' shared_examples_for 'the first page' do it { should have(25).users } diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index a4f2b25..a4c86b0 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -13,8 +13,8 @@ require 'database_cleaner' if RUBY_VERSION >= '1.9.2' YAML::ENGINE.yamler = 'syck' end -require File.join(File.dirname(__FILE__), 'fake_gem') -require File.join(File.dirname(__FILE__), 'fake_app') +require 'fake_gem' +require 'fake_app' require 'rspec/rails' # Requires supporting files with custom matchers and macros, etc,