From 5640e3625afaa38861f6aa77c240cc36334b78b5 Mon Sep 17 00:00:00 2001
From: Erik Michaels-Ober <sferik@gmail.com>
Date: Mon, 12 Mar 2012 18:09:21 -0500
Subject: [PATCH] Revert "use relative_require so specs work with root
 Rakefile.  TODO: remove"

This reverts commit 58467eba69cfbecdb18d174a61bdb1ad22a03ecb, which was
causing specs to break on Ruby 1.8.
---
 test_app/spec/controllers/controller_spec.rb               | 2 +-
 test_app/spec/controllers/impressionist_uniqueness_spec.rb | 2 +-
 test_app/spec/intializers/initializers_spec.rb             | 2 +-
 test_app/spec/models/counter_caching_spec.rb               | 2 +-
 test_app/spec/models/model_spec.rb                         | 2 +-
 test_app/spec/rails_generators/rails_generators_spec.rb    | 2 +-
 test_app/spec/spec_helper.rb                               | 1 -
 7 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/test_app/spec/controllers/controller_spec.rb b/test_app/spec/controllers/controller_spec.rb
index 2fb7926..a48b3a0 100644
--- a/test_app/spec/controllers/controller_spec.rb
+++ b/test_app/spec/controllers/controller_spec.rb
@@ -1,4 +1,4 @@
-require_relative '../spec_helper.rb'
+require 'spec_helper'
 
 describe ArticlesController do
   fixtures :articles,:impressions,:posts,:widgets
diff --git a/test_app/spec/controllers/impressionist_uniqueness_spec.rb b/test_app/spec/controllers/impressionist_uniqueness_spec.rb
index 9e848d3..5557ef3 100644
--- a/test_app/spec/controllers/impressionist_uniqueness_spec.rb
+++ b/test_app/spec/controllers/impressionist_uniqueness_spec.rb
@@ -1,4 +1,4 @@
-require_relative "../spec_helper.rb"
+require 'spec_helper'
 
 # we use the posts controller as it uses the impressionsist module. any such controller would do.
 describe DummyController do
diff --git a/test_app/spec/intializers/initializers_spec.rb b/test_app/spec/intializers/initializers_spec.rb
index 65f1b61..879a82a 100644
--- a/test_app/spec/intializers/initializers_spec.rb
+++ b/test_app/spec/intializers/initializers_spec.rb
@@ -1,4 +1,4 @@
-require_relative '../spec_helper'
+require 'spec_helper'
 
 describe Impressionist do
   it "should be extended from ActiveRecord::Base" do
diff --git a/test_app/spec/models/counter_caching_spec.rb b/test_app/spec/models/counter_caching_spec.rb
index c742818..88cbd73 100644
--- a/test_app/spec/models/counter_caching_spec.rb
+++ b/test_app/spec/models/counter_caching_spec.rb
@@ -1,4 +1,4 @@
-require_relative '../spec_helper'
+require 'spec_helper'
 
 describe Impression do
   fixtures :widgets
diff --git a/test_app/spec/models/model_spec.rb b/test_app/spec/models/model_spec.rb
index 4ae5fc6..5460166 100644
--- a/test_app/spec/models/model_spec.rb
+++ b/test_app/spec/models/model_spec.rb
@@ -1,4 +1,4 @@
-require_relative '../spec_helper'
+require 'spec_helper'
 
 describe Impression do
   fixtures :articles,:impressions,:posts
diff --git a/test_app/spec/rails_generators/rails_generators_spec.rb b/test_app/spec/rails_generators/rails_generators_spec.rb
index ab41341..2b5ea93 100644
--- a/test_app/spec/rails_generators/rails_generators_spec.rb
+++ b/test_app/spec/rails_generators/rails_generators_spec.rb
@@ -1,4 +1,4 @@
-require_relative '../spec_helper'
+require 'spec_helper'
 require 'systemu'
 
 # FIXME this test might break the others if run before them
diff --git a/test_app/spec/spec_helper.rb b/test_app/spec/spec_helper.rb
index ad2a267..689e06e 100644
--- a/test_app/spec/spec_helper.rb
+++ b/test_app/spec/spec_helper.rb
@@ -1,4 +1,3 @@
-# This file is copied to spec/ when you run 'rails generate rspec:install'
 ENV["RAILS_ENV"] ||= 'test'
 require 'simplecov'
 SimpleCov.start 'rails'