Link to details from way version pages

[rails.git] / test / controllers / browse_controller_test.rb

diff --git a/test/controllers/browse_controller_test.rb b/test/controllers/browse_controller_test.rb
index d6bde97d6add65bdcbaa9dc90088875f1a625640..7df246c5781c65e609737be9f151c9eff7a4e875 100644 (file)
--- a/test/controllers/browse_controller_test.rb
+++ b/test/controllers/browse_controller_test.rb
@@ -1,7 +1,6 @@
 require "test_helper"
 require "test_helper"

-require "browse_controller"

 
 

-class BrowseControllerTest < ActionController::TestCase
+class BrowseControllerTest < ActionDispatch::IntegrationTest

   ##
   # test all routes which lead to this controller
   def test_routes
   ##
   # test all routes which lead to this controller
   def test_routes


@@ -34,46 +33,113 @@ class BrowseControllerTest < ActionController::TestCase
       { :controller => "browse", :action => "changeset", :id => "1" }
     )
     assert_routing(
       { :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
     )
   end
 
   def test_read_relation

-    browse_check "relation", create(:relation).id, "browse/feature"
+    relation = create(:relation)
+    browse_check :relation_path, relation.id, "browse/feature"
+    assert_select "h4", /^Version/ do
+      assert_select "a[href='#{old_relation_path relation, 1}']", :text => "1", :count => 1
+    end
+    assert_select ".secondary-actions a[href='#{api_relation_path relation}']", :count => 1
+    assert_select ".secondary-actions a[href='#{relation_history_path relation}']", :count => 1
+    assert_select ".secondary-actions a[href='#{old_relation_path relation, 1}']", :count => 0
+  end
+
+  def test_multiple_version_relation_links
+    relation = create(:relation, :with_history, :version => 2)
+    browse_check :relation_path, relation.id, "browse/feature"
+    assert_select ".secondary-actions a[href='#{relation_history_path relation}']", :count => 1
+    assert_select ".secondary-actions a[href='#{old_relation_path relation, 1}']", :count => 1
+    assert_select ".secondary-actions a[href='#{old_relation_path relation, 2}']", :count => 1

   end
 
   def test_read_relation_history
   end
 
   def test_read_relation_history

-    browse_check "relation_history", create(:relation, :with_history).id, "browse/history"
+    relation = create(:relation, :with_history)
+    browse_check :relation_history_path, relation.id, "browse/history"
+    assert_select "h4", /^Version/ do
+      assert_select "a[href='#{old_relation_path relation, 1}']", :text => "1", :count => 1
+    end

   end
 
   def test_read_way
   end
 
   def test_read_way

-    browse_check "way", create(:way).id, "browse/feature"
+    way = create(:way)
+    browse_check :way_path, way.id, "browse/feature"
+    assert_select "h4", /^Version/ do
+      assert_select "a[href='#{old_way_path way, 1}']", :text => "1", :count => 1
+    end
+    assert_select ".secondary-actions a[href='#{api_way_path way}']", :count => 1
+    assert_select ".secondary-actions a[href='#{way_history_path way}']", :count => 1
+    assert_select ".secondary-actions a[href='#{old_way_path way, 1}']", :count => 0
+  end
+
+  def test_multiple_version_way_links
+    way = create(:way, :with_history, :version => 2)
+    browse_check :way_path, way.id, "browse/feature"
+    assert_select ".secondary-actions a[href='#{way_history_path way}']", :count => 1
+    assert_select ".secondary-actions a[href='#{old_way_path way, 1}']", :count => 1
+    assert_select ".secondary-actions a[href='#{old_way_path way, 2}']", :count => 1

   end
 
   def test_read_way_history
   end
 
   def test_read_way_history

-    browse_check "way_history", create(:way, :with_history).id, "browse/history"
+    way = create(:way, :with_history)
+    browse_check :way_history_path, way.id, "browse/history"
+    assert_select "h4", /^Version/ do
+      assert_select "a[href='#{old_way_path way, 1}']", :text => "1", :count => 1
+    end

   end
 
   def test_read_node
   end
 
   def test_read_node

-    browse_check "node", create(:node).id, "browse/feature"
+    node = create(:node)
+    browse_check :node_path, node.id, "browse/feature"
+    assert_select "h4", /^Version/ do
+      assert_select "a[href='#{old_node_path node, 1}']", :text => "1", :count => 1
+    end
+    assert_select ".secondary-actions a[href='#{api_node_path node}']", :count => 1
+    assert_select ".secondary-actions a[href='#{node_history_path node}']", :count => 1
+    assert_select ".secondary-actions a[href='#{old_node_path node, 1}']", :count => 0
+  end
+
+  def test_multiple_version_node_links
+    node = create(:node, :with_history, :version => 2)
+    browse_check :node_path, node.id, "browse/feature"
+    assert_select ".secondary-actions a[href='#{node_history_path node}']", :count => 1
+    assert_select ".secondary-actions a[href='#{old_node_path node, 1}']", :count => 1
+    assert_select ".secondary-actions a[href='#{old_node_path node, 2}']", :count => 1
+  end
+
+  def test_read_deleted_node
+    node = create(:node, :visible => false)
+    browse_check :node_path, node.id, "browse/feature"
+    assert_select "h4", /^Version/ do
+      assert_select "a[href='#{old_node_path node, 1}']", :text => "1", :count => 1
+    end
+    assert_select "a[href='#{api_node_path node}']", :count => 0

   end
 
   def test_read_node_history
   end
 
   def test_read_node_history

-    browse_check "node_history", create(:node, :with_history).id, "browse/history"
+    node = create(:node, :with_history)
+    browse_check :node_history_path, node.id, "browse/history"
+    assert_select "h4", /^Version/ do
+      assert_select "a[href='#{old_node_path node, 1}']", :text => "1", :count => 1
+    end

   end
 
   def test_read_changeset
     user = create(:user)
   end
 
   def test_read_changeset
     user = create(:user)

-    private_changeset = create(:changeset, :user => create(:user, :data_public => false))

     changeset = create(:changeset, :user => user)
     create(:changeset, :user => user)
     changeset = create(:changeset, :user => user)
     create(:changeset, :user => user)

-    browse_check "changeset", private_changeset.id, "browse/changeset"
-    browse_check "changeset", changeset.id, "browse/changeset"
+    browse_check :changeset_path, changeset.id, "browse/changeset"
+  end
+
+  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_changeset_hidden_comments
   end
 
   def test_read_changeset_hidden_comments


@@ -81,68 +147,15 @@ class BrowseControllerTest < ActionController::TestCase
     create_list(:changeset_comment, 3, :changeset => changeset)
     create(:changeset_comment, :visible => false, :changeset => changeset)
 
     create_list(:changeset_comment, 3, :changeset => changeset)
     create(:changeset_comment, :visible => false, :changeset => changeset)
 

-    browse_check "changeset", changeset.id, "browse/changeset"
+    browse_check :changeset_path, changeset.id, "browse/changeset"

     assert_select "div.changeset-comments ul li", :count => 3
 
     assert_select "div.changeset-comments ul li", :count => 3
 

-    session[:user] = create(:moderator_user).id
+    session_for(create(:moderator_user))

 
 

-    browse_check "changeset", changeset.id, "browse/changeset"
+    browse_check :changeset_path, changeset.id, "browse/changeset"

     assert_select "div.changeset-comments ul li", :count => 4
   end
 
     assert_select "div.changeset-comments ul li", :count => 4
   end
 

-  def test_read_note
-    open_note = create(:note_with_comments)
-
-    browse_check "note", open_note.id, "browse/note"
-  end
-
-  def test_read_hidden_note
-    hidden_note_with_comment = create(:note_with_comments, :status => "hidden")
-
-    get :note, :params => { :id => hidden_note_with_comment.id }
-    assert_response :not_found
-    assert_template "browse/not_found"
-    assert_template :layout => "map"
-
-    get :note, :params => { :id => hidden_note_with_comment.id }, :xhr => true
-    assert_response :not_found
-    assert_template "browse/not_found"
-    assert_template :layout => "xhr"
-
-    session[:user] = create(:moderator_user).id
-
-    browse_check "note", hidden_note_with_comment.id, "browse/note"
-  end
-
-  def test_read_note_hidden_comments
-    note_with_hidden_comment = create(:note_with_comments, :comments_count => 2) do |note|
-      create(:note_comment, :note => note, :visible => false)
-    end
-
-    browse_check "note", note_with_hidden_comment.id, "browse/note"
-    assert_select "div.note-comments ul li", :count => 1
-
-    session[:user] = create(:moderator_user).id
-
-    browse_check "note", note_with_hidden_comment.id, "browse/note"
-    assert_select "div.note-comments ul li", :count => 2
-  end
-
-  def test_read_note_hidden_user_comment
-    hidden_user = create(:user, :status => "deleted")
-    note_with_hidden_user_comment = create(:note_with_comments, :comments_count => 2) do |note|
-      create(:note_comment, :note => note, :author => hidden_user)
-    end
-
-    browse_check "note", note_with_hidden_user_comment.id, "browse/note"
-    assert_select "div.note-comments ul li", :count => 1
-
-    session[:user] = create(:moderator_user).id
-
-    browse_check "note", note_with_hidden_user_comment.id, "browse/note"
-    assert_select "div.note-comments ul li", :count => 1
-  end
-

   ##
   #  Methods to check redaction.
   #
   ##
   #  Methods to check redaction.
   #


@@ -156,7 +169,7 @@ class BrowseControllerTest < ActionController::TestCase
     node_v1 = node.old_nodes.find_by(:version => 1)
     node_v1.redact!(create(:redaction))
 
     node_v1 = node.old_nodes.find_by(:version => 1)
     node_v1.redact!(create(:redaction))
 

-    get :node, :params => { :id => node.id }
+    get node_path(:id => node)

     assert_response :success
     assert_template "feature"
 
     assert_response :success
     assert_template "feature"
 


@@ -172,7 +185,7 @@ class BrowseControllerTest < ActionController::TestCase
     node_v1 = node.old_nodes.find_by(:version => 1)
     node_v1.redact!(create(:redaction))
 
     node_v1 = node.old_nodes.find_by(:version => 1)
     node_v1.redact!(create(:redaction))
 

-    get :node_history, :params => { :id => node.id }
+    get node_history_path(:id => node)

     assert_response :success
     assert_template "browse/history"
 
     assert_response :success
     assert_template "browse/history"
 


@@ -192,7 +205,7 @@ class BrowseControllerTest < ActionController::TestCase
     way_v3 = way.old_ways.find_by(:version => 3)
     way_v3.redact!(create(:redaction))
 
     way_v3 = way.old_ways.find_by(:version => 3)
     way_v3.redact!(create(:redaction))
 

-    get :way_history, :params => { :id => way.id }
+    get way_history_path(:id => way)

     assert_response :success
     assert_template "browse/history"
 
     assert_response :success
     assert_template "browse/history"
 


@@ -210,7 +223,7 @@ class BrowseControllerTest < ActionController::TestCase
     relation_v3 = relation.old_relations.find_by(:version => 3)
     relation_v3.redact!(create(:redaction))
 
     relation_v3 = relation.old_relations.find_by(:version => 3)
     relation_v3.redact!(create(:redaction))
 

-    get :relation_history, :params => { :id => relation.id }
+    get relation_history_path(:id => relation)

     assert_response :success
     assert_template "browse/history"
 
     assert_response :success
     assert_template "browse/history"
 


@@ -221,37 +234,45 @@ class BrowseControllerTest < ActionController::TestCase
     assert_select ".browse-section.browse-relation", 2
   end
 
     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
   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
     assert_raise ActionController::UrlGenerationError do

-      get type
+      get path_method.call

     end
 
     assert_raise ActionController::UrlGenerationError do
     end
 
     assert_raise ActionController::UrlGenerationError do

-      get type, :params => { :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
 
     end
 

-    get type, :params => { :id => 0 }
+    get path_method.call(:id => 0)

     assert_response :not_found
     assert_template "browse/not_found"
     assert_template :layout => "map"
 
     assert_response :not_found
     assert_template "browse/not_found"
     assert_template :layout => "map"
 

-    get type, :params => { :id => 0 }, :xhr => true
+    get path_method.call(:id => 0), :xhr => true

     assert_response :not_found
     assert_template "browse/not_found"
     assert_template :layout => "xhr"
 
     assert_response :not_found
     assert_template "browse/not_found"
     assert_template :layout => "xhr"
 

-    get type, :params => { :id => id }
+    get path_method.call(:id => id)

     assert_response :success
     assert_template template
     assert_template :layout => "map"
 
     assert_response :success
     assert_template template
     assert_template :layout => "map"
 

-    get type, :params => { :id => id }, :xhr => true
+    get path_method.call(:id => id), :xhr => true

     assert_response :success
     assert_template template
     assert_template :layout => "xhr"
     assert_response :success
     assert_template template
     assert_template :layout => "xhr"