Merged r3905 from trunk.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@3955 e93f8b46-1217-0410-a6f0-8f06a7374b81

Merged r3905 from trunk.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@3955 e93f8b46-1217-0410-a6f0-8f06a7374b81
ae3d5426 · Eric Davis · c731d112 · ae3d5426 · ae3d5426
Commit ae3d5426 authored Aug 19, 2010 by Eric Davis
Hide whitespace changes
Inline Side-by-side

Showing with 10 additions and 5 deletions

account_controller_test.rb test/functional/account_controller_test.rb +1 -5

test_helper.rb test/test_helper.rb +9 -0

No files found.
--- a/test/functional/account_controller_test.rb
+++ b/test/functional/account_controller_test.rb
@@ -195,11 +195,7 @@ class AccountControllerTest < ActionController::TestCase
      should_assign_to :user
      should_redirect_to('my page') { {:controller => 'my', :action => 'account'} }

-      should "create a new user" do
-        user = User.last(:conditions => {:login => 'register'})
-        assert user
-        assert_kind_of User, user
-      end
+      should_create_a_new_user { User.last(:conditions => {:login => 'register'}) }

      should 'set the user status to active' do
        user = User.last(:conditions => {:login => 'register'})

--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -162,4 +162,13 @@ class ActiveSupport::TestCase
      end
    end
  end
+
+  def self.should_create_a_new_user(&block)
+    should "create a new user" do
+      user = instance_eval &block
+      assert user
+      assert_kind_of User, user
+      assert !user.new_record?
+    end
+  end
 end