Fix a couple of small bugs in test templates.

jmcervera · Sep 10, 2009 · ca5fb51 · ca5fb51
1 parent dafd64f
commit ca5fb51
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 9 deletions.
diff --git a/lark_template.rb b/lark_template.rb
@@ -505,6 +505,7 @@ def install_rails (options)
 extra_notifier_test = ""
 if require_activation
   extra_notifier_test = load_snippet('extra_notifier_test', 'require_activation')
+  extra_notifier_test.sub!('#{notifier_email_from}', notifier_email_from)
 end
 
 file 'test/unit/notifier_test.rb', load_pattern('test/unit/notifier_test.rb', 'default', binding)

diff --git a/patterns/default/test/integration/user_can_login_test.rb b/patterns/default/test/integration/user_can_login_test.rb
@@ -4,19 +4,19 @@ class UserCanLoginTest < ActionController::IntegrationTest
 
   context 'an existing user' do
     setup do
-#{make_user_block}
+      #{generate_user_block}
     end
 
     should 'be able to login with valid id and password' do
       visit login_path
 
-      fill_in 'Login', :with => @user.login
-      fill_in 'Password', :with => @user.password
+      fill_in 'Login', :with => @the_user.login
+      fill_in 'Password', :with => @the_user.password
 
       click_button 'Login'
 
       assert_equal '/', path
-      assert_contain "Login successful!"
+      assert_contain I18n.t('flash.user_sessions.create.notice')
     end
   end
 end
diff --git a/patterns/default/test/integration/user_can_logout_test.rb b/patterns/default/test/integration/user_can_logout_test.rb
@@ -4,10 +4,10 @@ class UserCanLogoutTest < ActionController::IntegrationTest
 
   context 'a logged-in user' do
     setup do
-#{make_user_block}
+      #{generate_user_block}
       visit login_path
-      fill_in 'Login', :with => @user.login
-      fill_in 'Password', :with => @user.password
+      fill_in 'Login', :with => @the_user.login
+      fill_in 'Password', :with => @the_user.password
       click_button 'Login'
     end
 
@@ -17,7 +17,7 @@ class UserCanLogoutTest < ActionController::IntegrationTest
       click_link "Logout"
 
       assert_equal new_user_session_path, path
-      assert_contain "Logout successful!"
+      assert_contain I18n.t('flash.user_sessions.destroy.notice')
     end
   end
 end
diff --git a/snippets/require_activation/extra_notifier_test b/snippets/require_activation/extra_notifier_test
@@ -3,7 +3,7 @@
                          Notifier.deliver_activation_instructions(user)
                          assert_sent_email do |email|
                            email.subject = "Activation Instructions"
-                           email.from.include?('Lark Group <noreply@larkfarm.com>')
+                           email.from.include?('#{notifier_email_from}')
                            email.to.include?(user.email)
                            email.body =~ Regexp.new(user.perishable_token)
                          end