This commit is contained in:
ericmoon 2018-08-02 11:43:48 -07:00
parent 429a22778c
commit 04d5e764b2
2 changed files with 6 additions and 2 deletions

View file

@ -57,7 +57,11 @@ class PreferencesControllerTest < ActionController::TestCase
:prefs => { :date_format => "%m-%d-%Y", :week_starts => "0", :show_number_completed => "10", :show_completed_projects_in_sidebar => "false", :show_hidden_contexts_in_sidebar => "false", :staleness_starts => "14", :due_style => "1" }} :prefs => { :date_format => "%m-%d-%Y", :week_starts => "0", :show_number_completed => "10", :show_completed_projects_in_sidebar => "false", :show_hidden_contexts_in_sidebar => "false", :staleness_starts => "14", :due_style => "1" }}
updated_admin_user = users(:admin_user).reload updated_admin_user = users(:admin_user).reload
assert_equal old_password_hash, updated_admin_user.password if old_password_hash.nil?
assert_nil updated_admin_user.password
else
assert_equal old_password_hash, updated_admin_user.password
end
end end
end end

View file

@ -9,7 +9,7 @@ class ProjectFromTodoTest < ActiveSupport::TestCase
project = ProjectFromTodo.new(todo).create project = ProjectFromTodo.new(todo).create
assert_equal project.name, todo.description assert_equal project.name, todo.description
assert_equal project.description, todo.notes assert_equal project.description, todo.notes
if project.default.context.nil? if project.default_context.nil?
assert_nil todo.context assert_nil todo.context
else else
assert_equal project.default_context, todo.context assert_equal project.default_context, todo.context