changing generators to require "test_helper" instead of the old File.…

…join. the old way was problematic when we used RR.
thoughtbot · Feb 16, 2009 · 4e276c6 · 4e276c6
1 parent 6954964
commit 4e276c6
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 8 deletions.
diff --git a/Rakefile b/Rakefile
@@ -1,12 +1,13 @@
 require 'rake'
 require 'rake/testtask'
 require 'cucumber/rake/task'
- 
+
 test_files_pattern = 'test/rails_root/test/{unit,functional,other}/**/*_test.rb'
 
 namespace :test do
   Rake::TestTask.new(:all => ['generator:cleanup', 'generator:generate']) do |task|
     task.libs << 'lib'
+    task.libs << File.join(File.dirname(__FILE__), "test/rails_root/test")
     task.pattern = test_files_pattern
     task.verbose = false
   end

diff --git a/generators/clearance/templates/test/functional/confirmations_controller_test.rb b/generators/clearance/templates/test/functional/confirmations_controller_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 
 class ConfirmationsControllerTest < ActionController::TestCase
   include Clearance::Test::Functional::ConfirmationsControllerTest

diff --git a/generators/clearance/templates/test/functional/passwords_controller_test.rb b/generators/clearance/templates/test/functional/passwords_controller_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 
 class PasswordsControllerTest < ActionController::TestCase
   include Clearance::Test::Functional::PasswordsControllerTest

diff --git a/generators/clearance/templates/test/functional/sessions_controller_test.rb b/generators/clearance/templates/test/functional/sessions_controller_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 
 class SessionsControllerTest < ActionController::TestCase
   include Clearance::Test::Functional::SessionsControllerTest

diff --git a/generators/clearance/templates/test/functional/users_controller_test.rb b/generators/clearance/templates/test/functional/users_controller_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 
 class UsersControllerTest < ActionController::TestCase
   include Clearance::Test::Functional::UsersControllerTest

diff --git a/generators/clearance/templates/test/unit/clearance_mailer_test.rb b/generators/clearance/templates/test/unit/clearance_mailer_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 
 class ClearanceMailerTest < ActionMailer::TestCase
   tests ClearanceMailer

diff --git a/generators/clearance/templates/test/unit/user_test.rb b/generators/clearance/templates/test/unit/user_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 
 class UserTest < Test::Unit::TestCase
   include Clearance::Test::Unit::UserTest

diff --git a/lib/clearance/app/controllers/sessions_controller.rb b/lib/clearance/app/controllers/sessions_controller.rb
@@ -18,7 +18,7 @@ def create
             @user = User.authenticate(params[:session][:email], 
                                       params[:session][:password])
             if @user.nil?
-              flash.now[:notice] = "Bad email or password. Tip: email is case-sensitive."
+              flash.now[:notice] = "Bad email or password."
               render :action => :new
             else
               if @user.email_confirmed?