##
# test all routes which lead to this controller
def test_routes
- assert_routing(
- { :path => "/api/0.6/user/1", :method => :get },
- { :controller => "users", :action => "api_read", :id => "1" }
- )
- assert_routing(
- { :path => "/api/0.6/user/details", :method => :get },
- { :controller => "users", :action => "api_details" }
- )
- assert_routing(
- { :path => "/api/0.6/user/gpx_files", :method => :get },
- { :controller => "users", :action => "api_gpx_files" }
- )
- assert_routing(
- { :path => "/api/0.6/users", :method => :get },
- { :controller => "users", :action => "api_users" }
- )
-
assert_routing(
{ :path => "/login", :method => :get },
{ :controller => "users", :action => "login" }
assert_difference "User.count", 1 do
assert_difference "ActionMailer::Base.deliveries.size", 1 do
perform_enqueued_jobs do
- post :save, :session => { :new_user => user }
+ post :save, :session => { :new_user => user }, :params => { :read_ct => 1, :read_tou => 1 }
end
end
end
assert_no_difference "User.count" do
assert_no_difference "ActionMailer::Base.deliveries.size" do
perform_enqueued_jobs do
- post :save, :session => { :new_user => user }
+ post :save, :session => { :new_user => user }, :params => { :read_ct => 1, :read_tou => 1 }
end
end
end
assert_no_difference "User.count" do
assert_no_difference "ActionMailer::Base.deliveries.size" do
perform_enqueued_jobs do
- post :save, :session => { :new_user => user }
+ post :save, :session => { :new_user => user }, :params => { :read_ct => 1, :read_tou => 1 }
end
end
end
assert_no_difference "User.count" do
assert_no_difference "ActionMailer::Base.deliveries.size" do
perform_enqueued_jobs do
- post :save, :session => { :new_user => user }
+ post :save, :session => { :new_user => user }, :params => { :read_ct => 1, :read_tou => 1 }
end
end
end
assert_no_difference "User.count" do
assert_no_difference "ActionMailer::Base.deliveries.size" do
perform_enqueued_jobs do
- post :save, :session => { :new_user => user }
+ post :save, :session => { :new_user => user }, :params => { :read_ct => 1, :read_tou => 1 }
end
end
end
assert_no_difference "User.count" do
assert_no_difference "ActionMailer::Base.deliveries.size" do
perform_enqueued_jobs do
- post :save, :session => { :new_user => user }
+ post :save, :session => { :new_user => user }, :params => { :read_ct => 1, :read_tou => 1 }
end
end
end
assert_difference "ActionMailer::Base.deliveries.size", 1 do
perform_enqueued_jobs do
post :save, :session => { :new_user => user,
- :referer => "/edit?editor=id#map=1/2/3" }
+ :referer => "/edit?editor=id#map=1/2/3" },
+ :params => { :read_ct => 1, :read_tou => 1 }
end
end
end
end
def test_terms_not_seen_without_referer
- user = create(:user, :terms_seen => false)
+ user = create(:user, :terms_seen => false, :terms_agreed => nil)
session[:user] = user.id
assert_response :success
assert_template :terms
- post :save, :params => { :user => { :consider_pd => true } }
+ post :save, :params => { :user => { :consider_pd => true }, :read_ct => 1, :read_tou => 1 }
assert_response :redirect
assert_redirected_to :action => :account, :display_name => user.display_name
assert_equal "Thanks for accepting the new contributor terms!", flash[:notice]
end
def test_terms_not_seen_with_referer
- user = create(:user, :terms_seen => false)
+ user = create(:user, :terms_seen => false, :terms_agreed => nil)
session[:user] = user.id
assert_response :success
assert_template :terms
- post :save, :params => { :user => { :consider_pd => true }, :referer => "/test" }
+ post :save, :params => { :user => { :consider_pd => true }, :referer => "/test", :read_ct => 1, :read_tou => 1 }
assert_response :redirect
assert_redirected_to "/test"
assert_equal "Thanks for accepting the new contributor terms!", flash[:notice]
# Check that if you haven't seen the terms, and make a request that requires authentication,
# that your request is redirected to view the terms
def test_terms_not_seen_redirection
- user = create(:user, :terms_seen => false)
+ user = create(:user, :terms_seen => false, :terms_agreed => nil)
session[:user] = user.id
get :account, :params => { :display_name => user.display_name }
# Test whether information about contributor terms is shown for users who haven't agreed
def test_terms_not_agreed
agreed_user = create(:user, :terms_agreed => 3.days.ago)
- seen_user = create(:user, :terms_seen => true)
- not_seen_user = create(:user, :terms_seen => false)
+ seen_user = create(:user, :terms_seen => true, :terms_agreed => nil)
+ not_seen_user = create(:user, :terms_seen => false, :terms_agreed => nil)
get :show, :params => { :display_name => agreed_user.display_name }
assert_response :success
end
end
- def test_api_read
- user = create(:user, :description => "test", :terms_agreed => Date.yesterday)
- # check that a visible user is returned properly
- get :api_read, :params => { :id => user.id }
- assert_response :success
- assert_equal "text/xml", response.content_type
-
- # check the data that is returned
- assert_select "description", :count => 1, :text => "test"
- assert_select "contributor-terms", :count => 1 do
- assert_select "[agreed='true']"
- end
- assert_select "img", :count => 0
- assert_select "roles", :count => 1 do
- assert_select "role", :count => 0
- end
- assert_select "changesets", :count => 1 do
- assert_select "[count='0']"
- end
- assert_select "traces", :count => 1 do
- assert_select "[count='0']"
- end
- assert_select "blocks", :count => 1 do
- assert_select "received", :count => 1 do
- assert_select "[count='0'][active='0']"
- end
- assert_select "issued", :count => 0
- end
-
- # check that we aren't revealing private information
- assert_select "contributor-terms[pd]", false
- assert_select "home", false
- assert_select "languages", false
- assert_select "messages", false
-
- # check that a suspended user is not returned
- get :api_read, :params => { :id => create(:user, :suspended).id }
- assert_response :gone
-
- # check that a deleted user is not returned
- get :api_read, :params => { :id => create(:user, :deleted).id }
- assert_response :gone
-
- # check that a non-existent user is not returned
- get :api_read, :params => { :id => 0 }
- assert_response :not_found
- end
-
- def test_api_details
- user = create(:user, :description => "test", :terms_agreed => Date.yesterday, :home_lat => 12.1, :home_lon => 12.1, :languages => ["en"])
- create(:message, :read, :recipient => user)
- create(:message, :sender => user)
-
- # check that nothing is returned when not logged in
- get :api_details
- assert_response :unauthorized
-
- # check that we get a response when logged in
- basic_authorization user.email, "test"
- get :api_details
- assert_response :success
- assert_equal "text/xml", response.content_type
-
- # check the data that is returned
- assert_select "description", :count => 1, :text => "test"
- assert_select "contributor-terms", :count => 1 do
- assert_select "[agreed='true'][pd='false']"
- end
- assert_select "img", :count => 0
- assert_select "roles", :count => 1 do
- assert_select "role", :count => 0
- end
- assert_select "changesets", :count => 1 do
- assert_select "[count='0']", :count => 1
- end
- assert_select "traces", :count => 1 do
- assert_select "[count='0']", :count => 1
- end
- assert_select "blocks", :count => 1 do
- assert_select "received", :count => 1 do
- assert_select "[count='0'][active='0']"
- end
- assert_select "issued", :count => 0
- end
- assert_select "home", :count => 1 do
- assert_select "[lat='12.1'][lon='12.1'][zoom='3']"
- end
- assert_select "languages", :count => 1 do
- assert_select "lang", :count => 1, :text => "en"
- end
- assert_select "messages", :count => 1 do
- assert_select "received", :count => 1 do
- assert_select "[count='1'][unread='0']"
- end
- assert_select "sent", :count => 1 do
- assert_select "[count='1']"
- end
- end
- end
-
- def test_api_users
- user1 = create(:user, :description => "test1", :terms_agreed => Date.yesterday)
- user2 = create(:user, :description => "test2", :terms_agreed => Date.yesterday)
- user3 = create(:user, :description => "test3", :terms_agreed => Date.yesterday)
-
- get :api_users, :params => { :users => user1.id }
- assert_response :success
- assert_equal "text/xml", response.content_type
- assert_select "user", :count => 1 do
- assert_select "user[id='#{user1.id}']", :count => 1
- assert_select "user[id='#{user2.id}']", :count => 0
- assert_select "user[id='#{user3.id}']", :count => 0
- end
-
- get :api_users, :params => { :users => user2.id }
- assert_response :success
- assert_equal "text/xml", response.content_type
- assert_select "user", :count => 1 do
- assert_select "user[id='#{user1.id}']", :count => 0
- assert_select "user[id='#{user2.id}']", :count => 1
- assert_select "user[id='#{user3.id}']", :count => 0
- end
-
- get :api_users, :params => { :users => "#{user1.id},#{user3.id}" }
- assert_response :success
- assert_equal "text/xml", response.content_type
- assert_select "user", :count => 2 do
- assert_select "user[id='#{user1.id}']", :count => 1
- assert_select "user[id='#{user2.id}']", :count => 0
- assert_select "user[id='#{user3.id}']", :count => 1
- end
-
- get :api_users, :params => { :users => create(:user, :suspended).id }
- assert_response :not_found
-
- get :api_users, :params => { :users => create(:user, :deleted).id }
- assert_response :not_found
-
- get :api_users, :params => { :users => 0 }
- assert_response :not_found
- end
-
- def test_api_gpx_files
- user = create(:user)
- trace1 = create(:trace, :user => user) do |trace|
- create(:tracetag, :trace => trace, :tag => "London")
- end
- trace2 = create(:trace, :user => user) do |trace|
- create(:tracetag, :trace => trace, :tag => "Birmingham")
- end
- # check that nothing is returned when not logged in
- get :api_gpx_files
- assert_response :unauthorized
-
- # check that we get a response when logged in
- basic_authorization user.email, "test"
- get :api_gpx_files
- assert_response :success
- assert_equal "application/xml", response.content_type
-
- # check the data that is returned
- assert_select "gpx_file[id='#{trace1.id}']", 1 do
- assert_select "tag", "London"
- end
- assert_select "gpx_file[id='#{trace2.id}']", 1 do
- assert_select "tag", "Birmingham"
- end
- end
-
def test_make_friend
# Get users to work with
user = create(:user)
# Now try as a normal user
get :set_status, :params => { :display_name => user.display_name, :status => "suspended" }, :session => { :user => user }
assert_response :redirect
- assert_redirected_to :action => :show, :display_name => user.display_name
+ assert_redirected_to :controller => :errors, :action => :forbidden
# Finally try as an administrator
get :set_status, :params => { :display_name => user.display_name, :status => "suspended" }, :session => { :user => create(:administrator_user) }
# Now try as a normal user
get :delete, :params => { :display_name => user.display_name, :status => "suspended" }, :session => { :user => user }
assert_response :redirect
- assert_redirected_to :action => :show, :display_name => user.display_name
+ assert_redirected_to :controller => :errors, :action => :forbidden
# Finally try as an administrator
get :delete, :params => { :display_name => user.display_name, :status => "suspended" }, :session => { :user => create(:administrator_user) }
# Shouldn't work when logged in as a normal user
get :index
assert_response :redirect
- assert_redirected_to :action => :login, :referer => users_path
+ assert_redirected_to :controller => :errors, :action => :forbidden
session[:user] = moderator_user.id
# Shouldn't work when logged in as a moderator
get :index
assert_response :redirect
- assert_redirected_to :action => :login, :referer => users_path
+ assert_redirected_to :controller => :errors, :action => :forbidden
session[:user] = administrator_user.id
assert_no_difference "User.active.count" do
post :index, :params => { :confirm => 1, :user => { inactive_user.id => 1, suspended_user.id => 1 } }
end
- assert_response :redirect
- assert_redirected_to :action => :login, :referer => users_path
+ assert_response :forbidden
+
assert_equal "pending", inactive_user.reload.status
assert_equal "suspended", suspended_user.reload.status
post :index, :params => { :confirm => 1, :user => { inactive_user.id => 1, suspended_user.id => 1 } }
end
assert_response :redirect
- assert_redirected_to :action => :login, :referer => users_path
+ assert_redirected_to :controller => :errors, :action => :forbidden
assert_equal "pending", inactive_user.reload.status
assert_equal "suspended", suspended_user.reload.status
post :index, :params => { :confirm => 1, :user => { inactive_user.id => 1, suspended_user.id => 1 } }
end
assert_response :redirect
- assert_redirected_to :action => :login, :referer => users_path
+ assert_redirected_to :controller => :errors, :action => :forbidden
assert_equal "pending", inactive_user.reload.status
assert_equal "suspended", suspended_user.reload.status
assert_no_difference "User.active.count" do
post :index, :params => { :hide => 1, :user => { normal_user.id => 1, confirmed_user.id => 1 } }
end
- assert_response :redirect
- assert_redirected_to :action => :login, :referer => users_path
+ assert_response :forbidden
+
assert_equal "active", normal_user.reload.status
assert_equal "confirmed", confirmed_user.reload.status
post :index, :params => { :hide => 1, :user => { normal_user.id => 1, confirmed_user.id => 1 } }
end
assert_response :redirect
- assert_redirected_to :action => :login, :referer => users_path
+ assert_redirected_to :controller => :errors, :action => :forbidden
assert_equal "active", normal_user.reload.status
assert_equal "confirmed", confirmed_user.reload.status
post :index, :params => { :hide => 1, :user => { normal_user.id => 1, confirmed_user.id => 1 } }
end
assert_response :redirect
- assert_redirected_to :action => :login, :referer => users_path
+ assert_redirected_to :controller => :errors, :action => :forbidden
assert_equal "active", normal_user.reload.status
assert_equal "confirmed", confirmed_user.reload.status
projects / rails.git / blobdiff