Andreas/tracks
1
0
Fork 0
mirror of https://github.com/TracksApp/tracks.git synced 2025-12-23 10:40:13 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

these belong to last commit

Browse source
This commit is contained in:
Reinier Balt 2012-12-23 22:49:48 +01:00
parent e90b24d327
commit c8d2db6fc3
2 changed files with 3 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

3
test/fixtures/preferences.yml vendored
View file

@ -9,7 +9,6 @@ admin_user_prefs:
show_completed_projects_in_sidebar: true show_completed_projects_in_sidebar: true
show_hidden_contexts_in_sidebar: true show_hidden_contexts_in_sidebar: true
show_hidden_projects_in_sidebar: true show_hidden_projects_in_sidebar: true
admin_email: butshesagirl@rousette.org.uk
week_starts: 1 week_starts: 1
due_style: 0 due_style: 0
refresh: 0 refresh: 0
@ -27,7 +26,6 @@ other_user_prefs:
show_completed_projects_in_sidebar: true show_completed_projects_in_sidebar: true
show_hidden_contexts_in_sidebar: true show_hidden_contexts_in_sidebar: true
show_hidden_projects_in_sidebar: true show_hidden_projects_in_sidebar: true
admin_email: butshesagirl@rousette.org.uk
week_starts: 1 week_starts: 1
due_style: 0 due_style: 0
refresh: 0 refresh: 0
@ -45,7 +43,6 @@ sms_user_prefs:
show_completed_projects_in_sidebar: true show_completed_projects_in_sidebar: true
show_hidden_contexts_in_sidebar: true show_hidden_contexts_in_sidebar: true
show_hidden_projects_in_sidebar: true show_hidden_projects_in_sidebar: true
admin_email: butshesagirl@rousette.org.uk
week_starts: 1 week_starts: 1
due_style: 0 due_style: 0
refresh: 0 refresh: 0

6
test/functional/preferences_controller_test.rb
View file

@ -44,7 +44,7 @@ class PreferencesControllerTest < ActionController::TestCase
post :update, { post :update, {
:id => users(:admin_user).id, :id => users(:admin_user).id,
:user => { :first_name => 'Jane', :last_name => 'Doe'}, :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 updated_admin_user = users(:admin_user).reload
assert_not_nil updated_admin_user.preference assert_not_nil updated_admin_user.preference
assert_equal 'Jane', updated_admin_user.first_name assert_equal 'Jane', updated_admin_user.first_name
@ -60,7 +60,7 @@ class PreferencesControllerTest < ActionController::TestCase
post :update, { post :update, {
:id => users(:admin_user).id, :id => users(:admin_user).id,
:user => { :first_name => 'Jane', :last_name => 'Doe', :password => "", :password_confirmation => ""}, :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 updated_admin_user = users(:admin_user).reload
assert_equal old_password_hash, updated_admin_user.password assert_equal old_password_hash, updated_admin_user.password
@ -74,7 +74,7 @@ class PreferencesControllerTest < ActionController::TestCase
post :update, { post :update, {
:id => users(:admin_user).id, :id => users(:admin_user).id,
:user => { :first_name => 'Jane', :last_name => 'Doe', :auth_type => "open_id", :open_id_url => "http://test"}, :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 updated_admin_user = users(:admin_user).reload
assert_equal "open_id", updated_admin_user.auth_type assert_equal "open_id", updated_admin_user.auth_type