assert_routing(
{ :path => "/traces", :method => :get },
- { :controller => "traces", :action => "list" }
+ { :controller => "traces", :action => "index" }
)
assert_routing(
{ :path => "/traces/page/1", :method => :get },
- { :controller => "traces", :action => "list", :page => "1" }
+ { :controller => "traces", :action => "index", :page => "1" }
)
assert_routing(
{ :path => "/traces/tag/tagname", :method => :get },
- { :controller => "traces", :action => "list", :tag => "tagname" }
+ { :controller => "traces", :action => "index", :tag => "tagname" }
)
assert_routing(
{ :path => "/traces/tag/tagname/page/1", :method => :get },
- { :controller => "traces", :action => "list", :tag => "tagname", :page => "1" }
+ { :controller => "traces", :action => "index", :tag => "tagname", :page => "1" }
)
assert_routing(
{ :path => "/user/username/traces", :method => :get },
- { :controller => "traces", :action => "list", :display_name => "username" }
+ { :controller => "traces", :action => "index", :display_name => "username" }
)
assert_routing(
{ :path => "/user/username/traces/page/1", :method => :get },
- { :controller => "traces", :action => "list", :display_name => "username", :page => "1" }
+ { :controller => "traces", :action => "index", :display_name => "username", :page => "1" }
)
assert_routing(
{ :path => "/user/username/traces/tag/tagname", :method => :get },
- { :controller => "traces", :action => "list", :display_name => "username", :tag => "tagname" }
+ { :controller => "traces", :action => "index", :display_name => "username", :tag => "tagname" }
)
assert_routing(
{ :path => "/user/username/traces/tag/tagname/page/1", :method => :get },
- { :controller => "traces", :action => "list", :display_name => "username", :tag => "tagname", :page => "1" }
+ { :controller => "traces", :action => "index", :display_name => "username", :tag => "tagname", :page => "1" }
)
assert_routing(
)
end
- # Check that the list of traces is displayed
- def test_list
+ # Check that the index of traces is displayed
+ def test_index
user = create(:user)
# The fourth test below is surpisingly sensitive to timestamp ordering when the timestamps are equal.
trace_a = create(:trace, :visibility => "public", :timestamp => 4.seconds.ago) do |trace|
create(:tracetag, :trace => trace, :tag => "Birmingham")
end
- # First with the public list
- get :list
- check_trace_list [trace_b, trace_a]
+ # First with the public index
+ get :index
+ check_trace_index [trace_b, trace_a]
# Restrict traces to those with a given tag
- get :list, :params => { :tag => "London" }
- check_trace_list [trace_a]
+ get :index, :params => { :tag => "London" }
+ check_trace_index [trace_a]
# Should see more when we are logged in
- get :list, :session => { :user => user }
- check_trace_list [trace_d, trace_c, trace_b, trace_a]
+ get :index, :session => { :user => user }
+ check_trace_index [trace_d, trace_c, trace_b, trace_a]
# Again, we should see more when we are logged in
- get :list, :params => { :tag => "London" }, :session => { :user => user }
- check_trace_list [trace_c, trace_a]
+ get :index, :params => { :tag => "London" }, :session => { :user => user }
+ check_trace_index [trace_c, trace_a]
end
# Check that I can get mine
- def test_list_mine
+ def test_index_mine
user = create(:user)
create(:trace, :visibility => "public") do |trace|
create(:tracetag, :trace => trace, :tag => "Birmingham")
# First try to get it when not logged in
get :mine
- assert_redirected_to :controller => "user", :action => "login", :referer => "/traces/mine"
+ assert_redirected_to :controller => "users", :action => "login", :referer => "/traces/mine"
# Now try when logged in
get :mine, :session => { :user => user }
- assert_redirected_to :action => "list", :display_name => user.display_name
+ assert_redirected_to :action => "index", :display_name => user.display_name
- # Fetch the actual list
- get :list, :params => { :display_name => user.display_name }, :session => { :user => user }
- check_trace_list [trace_b]
+ # Fetch the actual index
+ get :index, :params => { :display_name => user.display_name }, :session => { :user => user }
+ check_trace_index [trace_b]
end
- # Check the list of traces for a specific user
- def test_list_user
+ # Check the index of traces for a specific user
+ def test_index_user
user = create(:user)
second_user = create(:user)
third_user = create(:user)
end
# Test a user with no traces
- get :list, :params => { :display_name => second_user.display_name }
- check_trace_list []
+ get :index, :params => { :display_name => second_user.display_name }
+ check_trace_index []
# Test the user with the traces - should see only public ones
- get :list, :params => { :display_name => user.display_name }
- check_trace_list [trace_b]
+ get :index, :params => { :display_name => user.display_name }
+ check_trace_index [trace_b]
# Should still see only public ones when authenticated as another user
- get :list, :params => { :display_name => user.display_name }, :session => { :user => third_user }
- check_trace_list [trace_b]
+ get :index, :params => { :display_name => user.display_name }, :session => { :user => third_user }
+ check_trace_index [trace_b]
# Should see all traces when authenticated as the target user
- get :list, :params => { :display_name => user.display_name }, :session => { :user => user }
- check_trace_list [trace_c, trace_b]
+ get :index, :params => { :display_name => user.display_name }, :session => { :user => user }
+ check_trace_index [trace_c, trace_b]
# Should only see traces with the correct tag when a tag is specified
- get :list, :params => { :display_name => user.display_name, :tag => "London" }, :session => { :user => user }
- check_trace_list [trace_c]
+ get :index, :params => { :display_name => user.display_name, :tag => "London" }, :session => { :user => user }
+ check_trace_index [trace_c]
# Should get an error if the user does not exist
- get :list, :params => { :display_name => "UnknownUser" }
+ get :index, :params => { :display_name => "UnknownUser" }
assert_response :not_found
- assert_template "user/no_such_user"
+ assert_template "users/no_such_user"
end
- # Check a multi-page list
- def test_list_paged
+ # Check a multi-page index
+ def test_index_paged
# Create several pages worth of traces
create_list(:trace, 50)
- # Try and get the list
- get :list
+ # Try and get the index
+ get :index
assert_response :success
assert_select "table#trace_list tbody", :count => 1 do
assert_select "tr", :count => 20
end
# Try and get the second page
- get :list, :params => { :page => 2 }
+ get :index, :params => { :page => 2 }
assert_response :success
assert_select "table#trace_list tbody", :count => 1 do
assert_select "tr", :count => 20
end
end
- # Check that the rss loads
+ # Check the RSS feed
def test_rss
user = create(:user)
+ # The fourth test below is surpisingly sensitive to timestamp ordering when the timestamps are equal.
+ trace_a = create(:trace, :visibility => "public", :timestamp => 4.seconds.ago) do |trace|
+ create(:tracetag, :trace => trace, :tag => "London")
+ end
+ trace_b = create(:trace, :visibility => "public", :timestamp => 3.seconds.ago) do |trace|
+ create(:tracetag, :trace => trace, :tag => "Birmingham")
+ end
+ create(:trace, :visibility => "private", :user => user, :timestamp => 2.seconds.ago) do |trace|
+ create(:tracetag, :trace => trace, :tag => "London")
+ end
+ create(:trace, :visibility => "private", :user => user, :timestamp => 1.second.ago) do |trace|
+ create(:tracetag, :trace => trace, :tag => "Birmingham")
+ end
# First with the public feed
get :georss, :params => { :format => :rss }
- check_trace_feed Trace.visible_to_all
+ check_trace_feed [trace_b, trace_a]
# Restrict traces to those with a given tag
get :georss, :params => { :tag => "London", :format => :rss }
- check_trace_feed Trace.tagged("London").visible_to_all
+ check_trace_feed [trace_a]
+ end
- # Restrict traces to those for a given user
+ # Check the RSS feed for a specific user
+ def test_rss_user
+ user = create(:user)
+ second_user = create(:user)
+ create(:user)
+ create(:trace)
+ trace_b = create(:trace, :visibility => "public", :timestamp => 4.seconds.ago, :user => user)
+ trace_c = create(:trace, :visibility => "public", :timestamp => 3.seconds.ago, :user => user) do |trace|
+ create(:tracetag, :trace => trace, :tag => "London")
+ end
+ create(:trace, :visibility => "private")
+
+ # Test a user with no traces
+ get :georss, :params => { :display_name => second_user.display_name, :format => :rss }
+ check_trace_feed []
+
+ # Test the user with the traces - should see only public ones
get :georss, :params => { :display_name => user.display_name, :format => :rss }
- check_trace_feed user.traces.visible_to_all
+ check_trace_feed [trace_c, trace_b]
+
+ # Should only see traces with the correct tag when a tag is specified
+ get :georss, :params => { :display_name => user.display_name, :tag => "London", :format => :rss }
+ check_trace_feed [trace_c]
- # Restrict traces to those for a given user with a tiven tag
- get :georss, :params => { :display_name => user.display_name, :tag => "Birmingham", :format => :rss }
- check_trace_feed user.traces.tagged("Birmingham").visible_to_all
+ # Should no traces if the user does not exist
+ get :georss, :params => { :display_name => "UnknownUser", :format => :rss }
+ check_trace_feed []
end
# Test showing a trace
# First with no auth
get :show, :params => { :display_name => anon_trace_file.user.display_name, :id => anon_trace_file.id }
assert_response :redirect
- assert_redirected_to :action => :list
+ assert_redirected_to :action => :index
# Now with some other user, which should not work since the trace is anon
get :show, :params => { :display_name => anon_trace_file.user.display_name, :id => anon_trace_file.id }, :session => { :user => create(:user) }
assert_response :redirect
- assert_redirected_to :action => :list
+ assert_redirected_to :action => :index
# And finally we should be able to do it with the owner of the trace
get :show, :params => { :display_name => anon_trace_file.user.display_name, :id => anon_trace_file.id }, :session => { :user => anon_trace_file.user }
# First with a trace that has never existed
get :show, :params => { :display_name => create(:user).display_name, :id => 0 }
assert_response :redirect
- assert_redirected_to :action => :list
+ assert_redirected_to :action => :index
# Now with a trace that has been deleted
get :show, :params => { :display_name => deleted_trace_file.user.display_name, :id => deleted_trace_file.id }, :session => { :user => deleted_trace_file.user }
assert_response :redirect
- assert_redirected_to :action => :list
+ assert_redirected_to :action => :index
end
# Test downloading a trace
# First with no auth
get :new
assert_response :redirect
- assert_redirected_to :controller => :user, :action => :login, :referer => new_trace_path
+ assert_redirected_to :controller => :users, :action => :login, :referer => new_trace_path
# Now authenticated as a user with gps.trace.visibility set
user = create(:user)
assert_not_equal "trackable", user.preferences.where(:k => "gps.trace.visibility").first.v
post :create, :params => { :trace => { :gpx_file => file, :description => "New Trace", :tagstring => "new,trace", :visibility => "trackable" } }, :session => { :user => user }
assert_response :redirect
- assert_redirected_to :action => :list, :display_name => user.display_name
- assert_match /file has been uploaded/, flash[:notice]
+ assert_redirected_to :action => :index, :display_name => user.display_name
+ assert_match(/file has been uploaded/, flash[:notice])
trace = Trace.order(:id => :desc).first
assert_equal "a.gpx", trace.name
assert_equal "New Trace", trace.description
# First with no auth
get :edit, :params => { :display_name => public_trace_file.user.display_name, :id => public_trace_file.id }
assert_response :redirect
- assert_redirected_to :controller => :user, :action => :login, :referer => edit_trace_path(:display_name => public_trace_file.user.display_name, :id => public_trace_file.id)
+ assert_redirected_to :controller => :users, :action => :login, :referer => edit_trace_path(:display_name => public_trace_file.user.display_name, :id => public_trace_file.id)
# Now with some other user, which should fail
get :edit, :params => { :display_name => public_trace_file.user.display_name, :id => public_trace_file.id }, :session => { :user => create(:user) }
# Now with a trace that we are allowed to delete
post :delete, :params => { :display_name => public_trace_file.user.display_name, :id => public_trace_file.id }, :session => { :user => public_trace_file.user }
assert_response :redirect
- assert_redirected_to :action => :list, :display_name => public_trace_file.user.display_name
+ assert_redirected_to :action => :index, :display_name => public_trace_file.user.display_name
trace = Trace.find(public_trace_file.id)
assert_equal false, trace.visible
post :delete, :params => { :display_name => public_trace_file.user.display_name, :id => public_trace_file.id }, :session => { :user => admin }
assert_response :redirect
- assert_redirected_to :action => :list, :display_name => public_trace_file.user.display_name
+ assert_redirected_to :action => :index, :display_name => public_trace_file.user.display_name
trace = Trace.find(public_trace_file.id)
assert_equal false, trace.visible
end
anon_trace_file = create(:trace, :visibility => "private")
# First with no auth
- content public_trace_file.to_xml
- put :api_update, :params => { :id => public_trace_file.id }
+ put :api_update, :params => { :id => public_trace_file.id }, :body => public_trace_file.to_xml.to_s
assert_response :unauthorized
# Now with some other user, which should fail
basic_authorization create(:user).display_name, "test"
- content public_trace_file.to_xml
- put :api_update, :params => { :id => public_trace_file.id }
+ put :api_update, :params => { :id => public_trace_file.id }, :body => public_trace_file.to_xml.to_s
assert_response :forbidden
# Now with a trace which doesn't exist
basic_authorization create(:user).display_name, "test"
- content public_trace_file.to_xml
- put :api_update, :params => { :id => 0 }
+ put :api_update, :params => { :id => 0 }, :body => public_trace_file.to_xml.to_s
assert_response :not_found
# Now with a trace which did exist but has been deleted
basic_authorization deleted_trace_file.user.display_name, "test"
- content deleted_trace_file.to_xml
- put :api_update, :params => { :id => deleted_trace_file.id }
+ put :api_update, :params => { :id => deleted_trace_file.id }, :body => deleted_trace_file.to_xml.to_s
assert_response :not_found
# Now try an update with the wrong ID
basic_authorization public_trace_file.user.display_name, "test"
- content anon_trace_file.to_xml
- put :api_update, :params => { :id => public_trace_file.id }
+ put :api_update, :params => { :id => public_trace_file.id }, :body => anon_trace_file.to_xml.to_s
assert_response :bad_request,
"should not be able to update a trace with a different ID from the XML"
t = public_trace_file
t.description = "Changed description"
t.visibility = "private"
- content t.to_xml
- put :api_update, :params => { :id => t.id }
+ put :api_update, :params => { :id => t.id }, :body => t.to_xml.to_s
assert_response :success
nt = Trace.find(t.id)
assert_equal nt.description, t.description
trace = tracetag.trace
basic_authorization trace.user.display_name, "test"
- content trace.to_xml
- put :api_update, :params => { :id => trace.id }
+ put :api_update, :params => { :id => trace.id }, :body => trace.to_xml.to_s
assert_response :success
updated = Trace.find(trace.id)
assert_select "description"
assert_select "link"
assert_select "image"
- assert_select "item", :count => traces.visible.count do |items|
- traces.visible.order("timestamp DESC").zip(items).each do |trace, item|
+ assert_select "item", :count => traces.length do |items|
+ traces.zip(items).each do |trace, item|
assert_select item, "title", trace.name
- assert_select item, "link", "http://test.host/user/#{trace.user.display_name}/traces/#{trace.id}"
- assert_select item, "guid", "http://test.host/user/#{trace.user.display_name}/traces/#{trace.id}"
+ assert_select item, "link", "http://test.host/user/#{ERB::Util.u(trace.user.display_name)}/traces/#{trace.id}"
+ assert_select item, "guid", "http://test.host/user/#{ERB::Util.u(trace.user.display_name)}/traces/#{trace.id}"
assert_select item, "description"
# assert_select item, "dc:creator", trace.user.display_name
assert_select item, "pubDate", trace.timestamp.rfc822
end
end
- def check_trace_list(traces)
+ def check_trace_index(traces)
assert_response :success
- assert_template "list"
+ assert_template "index"
if !traces.empty?
assert_select "table#trace_list tbody", :count => 1 do
projects / rails.git / blobdiff