The syntax of assert_difference has changed

You pass it a string now, instead of an object and a method
This commit is contained in:
Eric Allen 2009-12-07 18:41:23 -05:00
parent c459461aa3
commit 0dfb1aafda
5 changed files with 23 additions and 23 deletions

View file

@ -74,7 +74,7 @@ class TodosControllerTest < ActionController::TestCase
end end
def test_create_todo def test_create_todo
assert_difference Todo, :count do assert_difference 'Todo.count' do
login_as(:admin_user) login_as(:admin_user)
put :create, :_source_view => 'todo', "context_name"=>"library", "project_name"=>"Build a working time machine", "todo"=>{"notes"=>"", "description"=>"Call Warren Buffet to find out how much he makes per day", "due"=>"30/11/2006"}, "tag_list"=>"foo bar" put :create, :_source_view => 'todo', "context_name"=>"library", "project_name"=>"Build a working time machine", "todo"=>{"notes"=>"", "description"=>"Call Warren Buffet to find out how much he makes per day", "due"=>"30/11/2006"}, "tag_list"=>"foo bar"
end end
@ -82,7 +82,7 @@ class TodosControllerTest < ActionController::TestCase
def test_create_todo_via_xml def test_create_todo_via_xml
login_as(:admin_user) login_as(:admin_user)
assert_difference Todo, :count do assert_difference 'Todo.count' do
put :create, :format => "xml", "request" => { "context_name"=>"library", "project_name"=>"Build a working time machine", "todo"=>{"notes"=>"", "description"=>"Call Warren Buffet to find out how much he makes per day", "due"=>"30/11/2006"}, "tag_list"=>"foo bar" } put :create, :format => "xml", "request" => { "context_name"=>"library", "project_name"=>"Build a working time machine", "todo"=>{"notes"=>"", "description"=>"Call Warren Buffet to find out how much he makes per day", "due"=>"30/11/2006"}, "tag_list"=>"foo bar" }
assert_response 201 assert_response 201
end end
@ -91,7 +91,7 @@ class TodosControllerTest < ActionController::TestCase
def test_create_todo_via_xml_show_from def test_create_todo_via_xml_show_from
login_as(:admin_user) login_as(:admin_user)
assert_difference Todo, :count do assert_difference 'Todo.count' do
xml = "<todo><description>Call Warren Buffet to find out how much he makes per day</description><project_id>#{projects(:timemachine).id}</project_id><context_id>#{contexts(:agenda).id}</context_id><show-from type=\"datetime\">#{1.week.from_now.xmlschema}</show-from></todo>" xml = "<todo><description>Call Warren Buffet to find out how much he makes per day</description><project_id>#{projects(:timemachine).id}</project_id><context_id>#{contexts(:agenda).id}</context_id><show-from type=\"datetime\">#{1.week.from_now.xmlschema}</show-from></todo>"
# p parse_xml_body(xml) # p parse_xml_body(xml)

View file

@ -123,7 +123,7 @@ class UsersControllerTest < ActionController::TestCase
def test_create_adds_a_user def test_create_adds_a_user
login_as :admin_user login_as :admin_user
assert_difference(User, :count) do assert_difference 'User.count' do
post :create, :user => {:login => 'newbie', :password => 'newbiepass', :password_confirmation => 'newbiepass'} post :create, :user => {:login => 'newbie', :password => 'newbiepass', :password_confirmation => 'newbiepass'}
end end
end end
@ -132,7 +132,7 @@ class UsersControllerTest < ActionController::TestCase
# #
def test_create_by_non_admin def test_create_by_non_admin
login_as :other_user login_as :other_user
assert_no_difference(User, :count) do assert_no_difference 'User.count' do
post :create, :user => {:login => 'newbie2', :password => 'newbiepass2', :password_confirmation => 'newbiepass2'} post :create, :user => {:login => 'newbie2', :password => 'newbiepass2', :password_confirmation => 'newbiepass2'}
end end
assert_response :success assert_response :success
@ -145,7 +145,7 @@ class UsersControllerTest < ActionController::TestCase
def test_create_with_invalid_password_does_not_add_a_new_user def test_create_with_invalid_password_does_not_add_a_new_user
login_as :admin_user login_as :admin_user
assert_no_difference(User, :count) do assert_no_difference 'User.count' do
post :create, :user => {:login => 'newbie', :password => '', :password_confirmation => ''} post :create, :user => {:login => 'newbie', :password => '', :password_confirmation => ''}
end end
end end
@ -170,7 +170,7 @@ class UsersControllerTest < ActionController::TestCase
def test_create_with_duplicate_login_does_not_add_a_new_user def test_create_with_duplicate_login_does_not_add_a_new_user
login_as :admin_user login_as :admin_user
assert_no_difference(User, :count) do assert_no_difference 'User.count' do
post :create, :user => {:login => 'jane', :password => 'newbiepass', :password_confirmation => 'newbiepass'} post :create, :user => {:login => 'jane', :password => 'newbiepass', :password_confirmation => 'newbiepass'}
end end
end end

View file

@ -56,7 +56,7 @@ class ContextXmlApiTest < ActionController::IntegrationTest
end end
def test_creates_new_context def test_creates_new_context
assert_difference Context, :count do assert_difference 'Context.count' do
authenticated_post_xml_to_context_create authenticated_post_xml_to_context_create
assert_response 201 assert_response 201
end end

View file

@ -50,7 +50,7 @@ class ProjectXmlApiTest < ActionController::IntegrationTest
end end
def test_creates_new_project def test_creates_new_project
assert_difference Project, :count do assert_difference 'Project.count' do
authenticated_post_xml_to_project_create authenticated_post_xml_to_project_create
assert_response :created assert_response :created
end end

View file

@ -55,54 +55,54 @@ class UserTest < ActiveSupport::TestCase
# Test a password shorter than 5 characters # Test a password shorter than 5 characters
# #
def test_validate_short_password def test_validate_short_password
assert_no_difference User, :count do assert_no_difference 'User.count' do
u = create_user :password => generate_random_string(4) u = create_user :password => generate_random_string(4)
assert_error_on u, :password, "is too short (minimum is 5 characters)" assert_error_on u, :password, "is too short (minimum is 5 characters)"
end end
end end
def test_validate_long_password def test_validate_long_password
assert_no_difference User, :count do assert_no_difference 'User.count' do
u = create_user :password => generate_random_string(41) u = create_user :password => generate_random_string(41)
assert_error_on u, :password, "is too long (maximum is 40 characters)" assert_error_on u, :password, "is too long (maximum is 40 characters)"
end end
end end
def test_validate_correct_length_password def test_validate_correct_length_password
assert_difference User, :count do assert_difference 'User.count' do
create_user :password => generate_random_string(6) create_user :password => generate_random_string(6)
end end
end end
def test_validate_missing_password def test_validate_missing_password
assert_no_difference User, :count do assert_no_difference 'User.count' do
u = create_user :password => '' u = create_user :password => ''
assert_errors_on u, :password, ["can't be blank", "is too short (minimum is 5 characters)"] assert_errors_on u, :password, ["can't be blank", "is too short (minimum is 5 characters)"]
end end
end end
def test_validate_short_login def test_validate_short_login
assert_no_difference User, :count do assert_no_difference 'User.count' do
u = create_user :login => 'ba' u = create_user :login => 'ba'
assert_error_on u, :login, "is too short (minimum is 3 characters)" assert_error_on u, :login, "is too short (minimum is 3 characters)"
end end
end end
def test_validate_long_login def test_validate_long_login
assert_no_difference User, :count do assert_no_difference 'User.count' do
u = create_user :login => generate_random_string(81) u = create_user :login => generate_random_string(81)
assert_error_on u, :login, "is too long (maximum is 80 characters)" assert_error_on u, :login, "is too long (maximum is 80 characters)"
end end
end end
def test_validate_correct_length_login def test_validate_correct_length_login
assert_difference User, :count do assert_difference 'User.count' do
create_user :login => generate_random_string(6) create_user :login => generate_random_string(6)
end end
end end
def test_validate_missing_login def test_validate_missing_login
assert_no_difference User, :count do assert_no_difference 'User.count' do
u = create_user :login => '' u = create_user :login => ''
assert_errors_on u, :login, ["can't be blank", "is too short (minimum is 3 characters)"] assert_errors_on u, :login, ["can't be blank", "is too short (minimum is 3 characters)"]
end end
@ -272,28 +272,28 @@ class UserTest < ActiveSupport::TestCase
end end
def test_should_create_user def test_should_create_user
assert_difference User, :count do assert_difference 'User.count' do
user = create_user user = create_user
assert !user.new_record?, "#{user.errors.full_messages.to_sentence}" assert !user.new_record?, "#{user.errors.full_messages.to_sentence}"
end end
end end
def test_should_require_login def test_should_require_login
assert_no_difference User, :count do assert_no_difference 'User.count' do
u = create_user(:login => nil) u = create_user(:login => nil)
assert u.errors.on(:login) assert u.errors.on(:login)
end end
end end
def test_should_require_password def test_should_require_password
assert_no_difference User, :count do assert_no_difference 'User.count' do
u = create_user(:password => nil) u = create_user(:password => nil)
assert u.errors.on(:password) assert u.errors.on(:password)
end end
end end
def test_should_require_password_confirmation def test_should_require_password_confirmation
assert_no_difference User, :count do assert_no_difference 'User.count' do
u = create_user(:password_confirmation => nil) u = create_user(:password_confirmation => nil)
assert u.errors.on(:password_confirmation) assert u.errors.on(:password_confirmation)
end end