[padrino-gen] Require only require 'spec_helper' in rspec tests

padrino · Dec 10, 2010 · 07ad8b3 · 07ad8b3
1 parent f24a195
commit 07ad8b3
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/CHANGES.rdoc b/CHANGES.rdoc
@@ -10,6 +10,7 @@
 * Fixed DataMapper Admin Adapter and Encrypt Passwords
 * Changed default ActiveRecord config with :reconnect => true
 * Added basic erubis support to the admin
+* Require only require 'spec_helper' in rspec tests
 
 == 0.9.19
 

diff --git a/padrino-gen/lib/padrino-gen/generators/components/tests/rspec.rb b/padrino-gen/lib/padrino-gen/generators/components/tests/rspec.rb
@@ -15,7 +15,7 @@ def app
 TEST
 
 RSPEC_CONTROLLER_TEST = (<<-TEST).gsub(/^ {12}/, '') unless defined?(RSPEC_CONTROLLER_TEST)
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper.rb')
+require 'spec_helper'
 
 describe "!NAME!Controller" do
   before do
@@ -38,7 +38,7 @@ def app
 TEST
 
 RSPEC_MODEL_TEST = (<<-TEST).gsub(/^ {12}/, '') unless defined?(RSPEC_MODEL_TEST)
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper.rb')
+require 'spec_helper'
 
 describe "!NAME! Model" do
   let(:!DNAME!) { !NAME!.new }