X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/f32aea6d1429ef55b7e5ec60bf83576cf76d85ed..846353303bcd718bb509567622af8a53a4c1421a:/test/controllers/accounts/terms_controller_test.rb diff --git a/test/controllers/accounts/terms_controller_test.rb b/test/controllers/accounts/terms_controller_test.rb index 768884666..ea8cd4e9f 100644 --- a/test/controllers/accounts/terms_controller_test.rb +++ b/test/controllers/accounts/terms_controller_test.rb @@ -29,7 +29,7 @@ module Accounts session_for(user) get account_terms_path - assert_redirected_to edit_account_path + assert_redirected_to account_path end def test_show_not_seen_without_referer @@ -52,13 +52,12 @@ module Accounts user = create(:user, :terms_seen => false, :terms_agreed => nil) session_for(user) - put account_terms_path, :params => { :user => { :consider_pd => true }, :read_ct => 1, :read_tou => 1 } - assert_redirected_to edit_account_path + put account_terms_path, :params => { :read_ct => 1, :read_tou => 1 } + assert_redirected_to account_path assert_equal "Thanks for accepting the new contributor terms!", flash[:notice] user.reload - assert user.consider_pd assert_not_nil user.terms_agreed assert user.terms_seen end @@ -67,13 +66,12 @@ module Accounts user = create(:user, :terms_seen => false, :terms_agreed => nil) session_for(user) - put account_terms_path, :params => { :user => { :consider_pd => true }, :referer => "/test", :read_ct => 1, :read_tou => 1 } + put account_terms_path, :params => { :referer => "/test", :read_ct => 1, :read_tou => 1 } assert_redirected_to "/test" assert_equal "Thanks for accepting the new contributor terms!", flash[:notice] user.reload - assert user.consider_pd assert_not_nil user.terms_agreed assert user.terms_seen end @@ -84,8 +82,8 @@ module Accounts user = create(:user, :terms_seen => false, :terms_agreed => nil) session_for(user) - get edit_account_path - assert_redirected_to account_terms_path(:referer => "/account/edit") + get account_path + assert_redirected_to account_terms_path(:referer => account_path) end end end