Fixed failing tests

- Some fixtures added by Erik Ordway broke tests
- message:// links had an edge case I broke with 68701ada
- One test had a hard-coded id that changed

Closes #1019
This commit is contained in:
Eric Allen 2010-04-09 09:34:57 -04:00
parent 68701adaca
commit a022f449c1
7 changed files with 9 additions and 45 deletions

View file

@ -542,10 +542,9 @@ class TodosControllerTest < ActionController::TestCase
def test_format_note_link_message
login_as(:admin_user)
todo = users(:admin_user).todos.first
todo.notes = "A Mail.app message://<ABCDEF-GHADB-123455-FOO-BAR@example.com> link"
todo.raw_notes = "A Mail.app message://<ABCDEF-GHADB-123455-FOO-BAR@example.com> link"
todo.save!
get :index
# puts css_select("div#notes_todo_#{todo.id}")
assert_select("div#notes_todo_#{todo.id}", 'A Mail.app message://&lt;ABCDEF-GHADB-123455-FOO-BAR@example.com&gt; link')
assert_select("div#notes_todo_#{todo.id} a", 'message://&lt;ABCDEF-GHADB-123455-FOO-BAR@example.com&gt;')
assert_select("div#notes_todo_#{todo.id} a[href=message://&lt;ABCDEF-GHADB-123455-FOO-BAR@example.com&gt;]", 'message://&lt;ABCDEF-GHADB-123455-FOO-BAR@example.com&gt;')

View file

@ -52,8 +52,9 @@ class UsersControllerTest < ActionController::TestCase
def test_destroy_user
login_as :admin_user
@no_users_before = User.find(:all).size
xhr :post, :destroy, :id => users(:ldap_user).id.to_param
assert_rjs :page, "user-3", :remove
user_id = users(:ldap_user).id
xhr :post, :destroy, :id => user_id.to_param
assert_rjs :page, "user-#{user_id}", :remove
assert_equal @no_users_before-1, User.find(:all).size
end