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
def test_create_todo
assert_difference Todo, :count do
assert_difference 'Todo.count' do
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"
end
@ -82,7 +82,7 @@ class TodosControllerTest < ActionController::TestCase
def test_create_todo_via_xml
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" }
assert_response 201
end
@ -91,7 +91,7 @@ class TodosControllerTest < ActionController::TestCase
def test_create_todo_via_xml_show_from
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>"
# p parse_xml_body(xml)

View file

@ -123,7 +123,7 @@ class UsersControllerTest < ActionController::TestCase
def test_create_adds_a_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'}
end
end
@ -132,7 +132,7 @@ class UsersControllerTest < ActionController::TestCase
#
def test_create_by_non_admin
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'}
end
assert_response :success
@ -145,7 +145,7 @@ class UsersControllerTest < ActionController::TestCase
def test_create_with_invalid_password_does_not_add_a_new_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 => ''}
end
end
@ -170,7 +170,7 @@ class UsersControllerTest < ActionController::TestCase
def test_create_with_duplicate_login_does_not_add_a_new_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'}
end
end

View file

@ -56,7 +56,7 @@ class ContextXmlApiTest < ActionController::IntegrationTest
end
def test_creates_new_context
assert_difference Context, :count do
assert_difference 'Context.count' do
authenticated_post_xml_to_context_create
assert_response 201
end
@ -74,4 +74,4 @@ class ContextXmlApiTest < ActionController::IntegrationTest
assert_response_and_body 400, "Expected post format is valid xml like so: <request><context><name>context name</name></context></request>."
end
end
end

View file

@ -50,7 +50,7 @@ class ProjectXmlApiTest < ActionController::IntegrationTest
end
def test_creates_new_project
assert_difference Project, :count do
assert_difference 'Project.count' do
authenticated_post_xml_to_project_create
assert_response :created
end
@ -68,4 +68,4 @@ class ProjectXmlApiTest < ActionController::IntegrationTest
assert_response_and_body 404, "Expected post format is valid xml like so: <request><project><name>project name</name></project></request>."
end
end
end

View file

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