Remove constant redefined warnings in suite

Rakefile

@@ -1,16 +1,16 @@
-require 'rubygems'
-require 'spec/rake/spectask'
-require 'yard'
-
-desc "Run all examples"
-Spec::Rake::SpecTask.new('spec') do |t|
-  t.spec_opts = ['--color']
-  t.spec_files = FileList['spec/**/*.rb']
-end
-
-YARD::Rake::YardocTask.new do |t|
-  t.files   = ['lib/**/*.rb', 'README.rdoc']
-  #t.options = ['--any', '--extra', '--opts'] # optional
-end
-
-task :default => :spec
+require 'rubygems'
+require 'spec/rake/spectask'
+require 'yard'
+
+desc "Run all examples"
+Spec::Rake::SpecTask.new('spec') do |t|
+  t.spec_opts = ['--color']
+  t.spec_files = FileList['spec/**/*_spec.rb']
+end
+
+YARD::Rake::YardocTask.new do |t|
+  t.files   = ['lib/**/*.rb', 'README.rdoc']
+  #t.options = ['--any', '--extra', '--opts'] # optional
+end
+
+task :default => :spec

spec/capybara_spec.rb

@@ -1,6 +1,4 @@
-require File.expand_path('spec_helper', File.dirname(__FILE__))
-
-require 'capybara'
+require 'spec_helper'
 
 describe Capybara do
 

spec/driver/celerity_driver_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../spec_helper', File.dirname(__FILE__))
+require 'spec_helper'
 
 if RUBY_PLATFORM =~ /java/
   describe Capybara::Driver::Celerity do

spec/driver/culerity_driver_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../spec_helper', File.dirname(__FILE__))
+require 'spec_helper'
 
 describe Capybara::Driver::Culerity do
   before(:all) do

spec/driver/rack_test_driver_spec.rb

@@ -1,7 +1,5 @@
 # encoding: utf-8
-require File.expand_path('../spec_helper', File.dirname(__FILE__))
-
-
+require 'spec_helper'
 require 'stringio'
 
 def capture(*streams)

spec/driver/remote_culerity_driver_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../spec_helper', File.dirname(__FILE__))
+require 'spec_helper'
 
 describe Capybara::Driver::Culerity do
   before(:all) do

spec/driver/remote_selenium_driver_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../spec_helper', File.dirname(__FILE__))
+require 'spec_helper'
 
 describe Capybara::Driver::Selenium do
   before(:all) do

spec/driver/selenium_driver_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../spec_helper', File.dirname(__FILE__))
+require 'spec_helper'
 
 describe Capybara::Driver::Selenium do
   before do

spec/dsl_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('spec_helper', File.dirname(__FILE__))
+require 'spec_helper'
 
 require 'capybara/dsl'
 

spec/save_and_open_page_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('spec_helper', File.dirname(__FILE__))
+require 'spec_helper'
 
 require 'capybara/util/save_and_open_page'
 require 'launchy'

spec/server_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('spec_helper', File.dirname(__FILE__))
+require 'spec_helper'
 
 describe Capybara::Server do
 

spec/session/celerity_session_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../spec_helper', File.dirname(__FILE__))
+require 'spec_helper'
 
 if RUBY_PLATFORM =~ /java/
   describe Capybara::Driver::Celerity do

spec/session/culerity_session_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../spec_helper', File.dirname(__FILE__))
+require 'spec_helper'
 
 describe Capybara::Session do
   context 'with culerity driver' do

spec/session/rack_test_session_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../spec_helper', File.dirname(__FILE__))
+require 'spec_helper'
 
 describe Capybara::Session do
   context 'with rack test driver' do

spec/session/selenium_session_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../spec_helper', File.dirname(__FILE__))
+require 'spec_helper'
 
 describe Capybara::Session do
   context 'with selenium driver' do

spec/spec_helper.rb

@@ -1,5 +1,4 @@
 $:.unshift(File.expand_path('../lib', File.dirname(__FILE__)))
-$:.unshift(File.dirname(__FILE__))
 
 require 'rubygems'
 require "bundler/setup"

spec/timeout_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('spec_helper', File.dirname(__FILE__))
+require 'spec_helper'
 
 require 'capybara'
 require 'capybara/util/timeout'