diff --git a/test/controllers/notes_controller_test.rb b/test/controllers/notes_controller_test.rb index 9c14d236..828d4e7a 100644 --- a/test/controllers/notes_controller_test.rb +++ b/test/controllers/notes_controller_test.rb @@ -25,7 +25,7 @@ class NotesControllerTest < ActionController::TestCase note = users(:admin_user).notes.first - assert_not_equal "test", note.body + refute_equal "test", note.body post :update, id: note.id, note: {body: "test"}, format: :js assert_equal "test", note.reload.body end diff --git a/test/controllers/todos_controller_test.rb b/test/controllers/todos_controller_test.rb index ec203975..1f23616c 100644 --- a/test/controllers/todos_controller_test.rb +++ b/test/controllers/todos_controller_test.rb @@ -397,7 +397,7 @@ class TodosControllerTest < ActionController::TestCase todo = users(:admin_user).todos.active.first context = users(:admin_user).contexts.first - assert_not_equal todo.context.id, context.id + refute_equal todo.context.id, context.id xhr :post, :change_context, :id => todo.id, :todo=>{:context_id => context.id}, :_source_view=>"todo" assert assigns['context_changed'], "context should have changed" @@ -820,7 +820,7 @@ class TodosControllerTest < ActionController::TestCase next_todo = Todo.where(:recurring_todo_id => recurring_todo_1.id, :state => 'active').first assert_equal "Call Bill Gates every day", next_todo.description # check that the new todo is not the same as todo_1 - assert_not_equal todo_1.id, next_todo.id + refute_equal todo_1.id, next_todo.id # change recurrence pattern to monthly and set show_from 2 days before due # date this forces the next todo to be put in the tickler @@ -891,7 +891,7 @@ class TodosControllerTest < ActionController::TestCase assert !new_todo.nil?, "the todo should be in the tickler" assert_equal "Call Bill Gates every day", new_todo.description - assert_not_equal todo_1.id, new_todo.id, "check that the new todo is not the same as todo_1" + refute_equal todo_1.id, new_todo.id, "check that the new todo is not the same as todo_1" assert !new_todo.show_from.nil?, "check that the new_todo is in the tickler to show next month" assert_equal today + 1.month, new_todo.show_from diff --git a/test/integration/recurring_todos_test.rb b/test/integration/recurring_todos_test.rb index bad00387..2aa57143 100644 --- a/test/integration/recurring_todos_test.rb +++ b/test/integration/recurring_todos_test.rb @@ -29,7 +29,7 @@ class RecurringTodosTest < ActionDispatch::IntegrationTest rt.reload # then there should be two todos referencing assert_equal 2, rt.todos.size todo2 = Todo.where(:recurring_todo_id => rt.id, :state => 'active').first - assert_not_equal todo2.id, todo.id # and the todos should be different + refute_equal todo2.id, todo.id # and the todos should be different # when I delete the recurring todo delete_via_redirect "/recurring_todos/#{rt.id}", :_source_view => 'todo' @@ -40,4 +40,4 @@ class RecurringTodosTest < ActionDispatch::IntegrationTest assert todo.recurring_todo_id.nil? assert todo2.recurring_todo_id.nil? end -end \ No newline at end of file +end diff --git a/test/models/user_test.rb b/test/models/user_test.rb index be5b3320..6e20d6a4 100644 --- a/test/models/user_test.rb +++ b/test/models/user_test.rb @@ -162,7 +162,7 @@ class UserTest < ActiveSupport::TestCase def test_generate_token_updates_token old_token = @admin_user.token @admin_user.generate_token - assert_not_equal old_token, @admin_user.token + refute_equal old_token, @admin_user.token end def test_find_admin