require "test_helper"
-require "browse_controller"
-
-class BrowseControllerTest < ActionController::TestCase
- api_fixtures
+class BrowseControllerTest < ActionDispatch::IntegrationTest
##
# test all routes which lead to this controller
def test_routes
{ :controller => "browse", :action => "changeset", :id => "1" }
)
assert_routing(
- { :path => "/note/1", :method => :get },
- { :controller => "browse", :action => "note", :id => "1" }
- )
- assert_routing(
- { :path => "/note/new", :method => :get },
- { :controller => "browse", :action => "new_note" }
+ { :path => "/query", :method => :get },
+ { :controller => "browse", :action => "query" }
)
end
def test_read_relation
- browse_check "relation", relations(:visible_relation).relation_id, "browse/feature"
+ browse_check :relation_path, create(:relation).id, "browse/feature"
end
def test_read_relation_history
- browse_check "relation_history", relations(:visible_relation).relation_id, "browse/history"
+ browse_check :relation_history_path, create(:relation, :with_history).id, "browse/history"
end
def test_read_way
- browse_check "way", ways(:visible_way).way_id, "browse/feature"
+ browse_check :way_path, create(:way).id, "browse/feature"
end
def test_read_way_history
- browse_check "way_history", ways(:visible_way).way_id, "browse/history"
+ browse_check :way_history_path, create(:way, :with_history).id, "browse/history"
end
def test_read_node
- browse_check "node", nodes(:visible_node).node_id, "browse/feature"
+ node = create :node
+ browse_check :node_path, node.id, "browse/feature"
+ assert_select "a[href='#{api_node_path node}']", :count => 1
end
- def test_read_node_history
- browse_check "node_history", nodes(:visible_node).node_id, "browse/history"
+ def test_read_deleted_node
+ node = create :node, :visible => false
+ browse_check :node_path, node.id, "browse/feature"
+ assert_select "a[href='#{api_node_path node}']", :count => 0
end
- def test_read_changeset
- browse_check "changeset", changesets(:normal_user_first_change).id, "browse/changeset"
- browse_check "changeset", changesets(:public_user_first_change).id, "browse/changeset"
+ def test_read_node_history
+ browse_check :node_history_path, create(:node, :with_history).id, "browse/history"
end
- def test_read_changeset_hidden_comments
- browse_check "changeset", changesets(:normal_user_closed_change).id, "browse/changeset"
- assert_select "div.changeset-comments ul li", :count => 3
-
- session[:user] = users(:moderator_user).id
-
- browse_check "changeset", changesets(:normal_user_closed_change).id, "browse/changeset"
- assert_select "div.changeset-comments ul li", :count => 4
+ def test_read_changeset
+ user = create(:user)
+ changeset = create(:changeset, :user => user)
+ create(:changeset, :user => user)
+ browse_check :changeset_path, changeset.id, "browse/changeset"
end
- def test_read_note
- browse_check "note", notes(:open_note).id, "browse/note"
+ def test_read_private_changeset
+ user = create(:user)
+ changeset = create(:changeset, :user => create(:user, :data_public => false))
+ create(:changeset, :user => user)
+ browse_check :changeset_path, changeset.id, "browse/changeset"
end
- def test_read_hidden_note
- get :note, :id => notes(:hidden_note_with_comment).id
- assert_response :not_found
- assert_template "browse/not_found"
- assert_template :layout => "map"
-
- xhr :get, :note, :id => notes(:hidden_note_with_comment).id
- assert_response :not_found
- assert_template "browse/not_found"
- assert_template :layout => "xhr"
-
- session[:user] = users(:moderator_user).id
-
- browse_check "note", notes(:hidden_note_with_comment).id, "browse/note"
- end
+ def test_read_changeset_hidden_comments
+ changeset = create(:changeset)
+ create_list(:changeset_comment, 3, :changeset => changeset)
+ create(:changeset_comment, :visible => false, :changeset => changeset)
- def test_read_note_hidden_comments
- browse_check "note", notes(:note_with_hidden_comment).id, "browse/note"
- assert_select "div.note-comments ul li", :count => 1
+ browse_check :changeset_path, changeset.id, "browse/changeset"
+ assert_select "div.changeset-comments ul li", :count => 3
- session[:user] = users(:moderator_user).id
+ session_for(create(:moderator_user))
- browse_check "note", notes(:note_with_hidden_comment).id, "browse/note"
- assert_select "div.note-comments ul li", :count => 2
+ browse_check :changeset_path, changeset.id, "browse/changeset"
+ assert_select "div.changeset-comments ul li", :count => 4
end
##
# then please make it more easily (and robustly) testable!
##
def test_redacted_node
- get :node, :id => current_nodes(:redacted_node).id
+ node = create(:node, :with_history, :deleted, :version => 2)
+ node_v1 = node.old_nodes.find_by(:version => 1)
+ node_v1.redact!(create(:redaction))
+
+ get node_path(:id => node)
assert_response :success
assert_template "feature"
end
def test_redacted_node_history
- get :node_history, :id => nodes(:redacted_node_redacted_version).node_id
+ node = create(:node, :with_history, :deleted, :version => 2)
+ node_v1 = node.old_nodes.find_by(:version => 1)
+ node_v1.redact!(create(:redaction))
+
+ get node_history_path(:id => node)
assert_response :success
assert_template "browse/history"
end
def test_redacted_way_history
- get :way_history, :id => ways(:way_with_redacted_versions_v1).way_id
+ way = create(:way, :with_history, :version => 4)
+ way_v1 = way.old_ways.find_by(:version => 1)
+ way_v1.redact!(create(:redaction))
+ way_v3 = way.old_ways.find_by(:version => 3)
+ way_v3.redact!(create(:redaction))
+
+ get way_history_path(:id => way)
assert_response :success
assert_template "browse/history"
end
def test_redacted_relation_history
- get :relation_history, :id => relations(:relation_with_redacted_versions_v1).relation_id
+ relation = create(:relation, :with_history, :version => 4)
+ relation_v1 = relation.old_relations.find_by(:version => 1)
+ relation_v1.redact!(create(:redaction))
+ relation_v3 = relation.old_relations.find_by(:version => 3)
+ relation_v3.redact!(create(:redaction))
+
+ get relation_history_path(:id => relation)
assert_response :success
assert_template "browse/history"
assert_select ".browse-section.browse-relation", 2
end
+ def test_query
+ get query_path
+ assert_response :success
+ assert_template "browse/query"
+ end
+
private
# This is a convenience method for most of the above checks
# First we check that when we don't have an id, it will correctly return a 404
# then we check that we get the correct 404 when a non-existant id is passed
# then we check that it will get a successful response, when we do pass an id
- def browse_check(type, id, template)
+ def browse_check(path, id, template)
+ path_method = method(path)
+
assert_raise ActionController::UrlGenerationError do
- get type
+ get path_method.call
end
assert_raise ActionController::UrlGenerationError do
- get type, :id => -10 # we won't have an id that's negative
+ get path_method.call(:id => -10) # we won't have an id that's negative
end
- get type, :id => 0
+ get path_method.call(:id => 0)
assert_response :not_found
assert_template "browse/not_found"
assert_template :layout => "map"
- xhr :get, type, :id => 0
+ get path_method.call(:id => 0), :xhr => true
assert_response :not_found
assert_template "browse/not_found"
assert_template :layout => "xhr"
- get type, :id => id
+ get path_method.call(:id => id)
assert_response :success
assert_template template
assert_template :layout => "map"
- xhr :get, type, :id => id
+ get path_method.call(:id => id), :xhr => true
assert_response :success
assert_template template
assert_template :layout => "xhr"
projects / rails.git / blobdiff