Rename traces#list to traces#index
This commit is contained in:
Andy Allan
parent
16fef14b61
commit
d0089f0ce8
8 changed files with 72 additions and 73 deletions
|
|
@ -56,35 +56,35 @@ class TracesControllerTest < ActionController::TestCase
|
|||
|
||||
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(
|
||||
|
|
@ -164,8 +164,8 @@ class TracesControllerTest < ActionController::TestCase
|
|||
)
|
||||
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|
|
||||
|
|
@ -181,25 +181,25 @@ class TracesControllerTest < ActionController::TestCase
|
|||
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")
|
||||
|
|
@ -214,15 +214,15 @@ class TracesControllerTest < ActionController::TestCase
|
|||
|
||||
# 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)
|
||||
|
|
@ -233,45 +233,45 @@ class TracesControllerTest < ActionController::TestCase
|
|||
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"
|
||||
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
|
||||
|
|
@ -323,12 +323,12 @@ class TracesControllerTest < ActionController::TestCase
|
|||
# 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 }
|
||||
|
|
@ -342,12 +342,12 @@ class TracesControllerTest < ActionController::TestCase
|
|||
# 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
|
||||
|
|
@ -558,7 +558,7 @@ class TracesControllerTest < ActionController::TestCase
|
|||
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_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
|
||||
|
|
@ -671,7 +671,7 @@ class TracesControllerTest < ActionController::TestCase
|
|||
# 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
|
||||
|
||||
|
|
@ -681,7 +681,7 @@ class TracesControllerTest < ActionController::TestCase
|
|||
|
||||
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
|
||||
|
|
@ -1009,9 +1009,9 @@ class TracesControllerTest < ActionController::TestCase
|
|||
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
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue