From c8d2db6fc3b2ead738dd4e3ed392e237114752cd Mon Sep 17 00:00:00 2001 From: Reinier Balt Date: Sun, 23 Dec 2012 22:49:48 +0100 Subject: [PATCH] these belong to last commit --- test/fixtures/preferences.yml | 3 --- test/functional/preferences_controller_test.rb | 6 +++--- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/test/fixtures/preferences.yml b/test/fixtures/preferences.yml index b047f8d6..e621f9c3 100644 --- a/test/fixtures/preferences.yml +++ b/test/fixtures/preferences.yml @@ -9,7 +9,6 @@ admin_user_prefs: show_completed_projects_in_sidebar: true show_hidden_contexts_in_sidebar: true show_hidden_projects_in_sidebar: true - admin_email: butshesagirl@rousette.org.uk week_starts: 1 due_style: 0 refresh: 0 @@ -27,7 +26,6 @@ other_user_prefs: show_completed_projects_in_sidebar: true show_hidden_contexts_in_sidebar: true show_hidden_projects_in_sidebar: true - admin_email: butshesagirl@rousette.org.uk week_starts: 1 due_style: 0 refresh: 0 @@ -45,7 +43,6 @@ sms_user_prefs: show_completed_projects_in_sidebar: true show_hidden_contexts_in_sidebar: true show_hidden_projects_in_sidebar: true - admin_email: butshesagirl@rousette.org.uk week_starts: 1 due_style: 0 refresh: 0 diff --git a/test/functional/preferences_controller_test.rb b/test/functional/preferences_controller_test.rb index 46063bdc..bcb55a51 100644 --- a/test/functional/preferences_controller_test.rb +++ b/test/functional/preferences_controller_test.rb @@ -44,7 +44,7 @@ class PreferencesControllerTest < ActionController::TestCase post :update, { :id => users(:admin_user).id, :user => { :first_name => 'Jane', :last_name => 'Doe'}, - :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", :admin_email => "my.email@domain.com" }} + :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 assert_not_nil updated_admin_user.preference assert_equal 'Jane', updated_admin_user.first_name @@ -60,7 +60,7 @@ class PreferencesControllerTest < ActionController::TestCase post :update, { :id => users(:admin_user).id, :user => { :first_name => 'Jane', :last_name => 'Doe', :password => "", :password_confirmation => ""}, - :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", :admin_email => "my.email@domain.com" }} + :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 assert_equal old_password_hash, updated_admin_user.password @@ -74,7 +74,7 @@ class PreferencesControllerTest < ActionController::TestCase post :update, { :id => users(:admin_user).id, :user => { :first_name => 'Jane', :last_name => 'Doe', :auth_type => "open_id", :open_id_url => "http://test"}, - :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", :admin_email => "my.email@domain.com" }} + :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 assert_equal "open_id", updated_admin_user.auth_type