Merge remote-tracking branch 'upstream/pull/1561'

[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 12262b22403bd73dba6882ec169637e0f08ab40f..68345c6b6b70e8b73a41a93bd81fe51d119dc6e1 100644 (file)
--- a/test/controllers/browse_controller_test.rb
+++ b/test/controllers/browse_controller_test.rb
@@ -2,8 +2,6 @@ require "test_helper"
 require "browse_controller"
 
 class BrowseControllerTest < ActionController::TestCase
 require "browse_controller"
 
 class BrowseControllerTest < ActionController::TestCase

-  api_fixtures
-

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


@@ -46,19 +44,19 @@ class BrowseControllerTest < ActionController::TestCase
   end
 
   def test_read_relation
   end
 
   def test_read_relation

-    browse_check "relation", relations(:visible_relation).relation_id, "browse/feature"
+    browse_check "relation", create(:relation).id, "browse/feature"

   end
 
   def test_read_relation_history
   end
 
   def test_read_relation_history

-    browse_check "relation_history", relations(:visible_relation).relation_id, "browse/history"
+    browse_check "relation_history", create(:relation, :with_history).id, "browse/history"

   end
 
   def test_read_way
   end
 
   def test_read_way

-    browse_check "way", ways(:visible_way).way_id, "browse/feature"
+    browse_check "way", create(:way).id, "browse/feature"

   end
 
   def test_read_way_history
   end
 
   def test_read_way_history

-    browse_check "way_history", ways(:visible_way).way_id, "browse/history"
+    browse_check "way_history", create(:way, :with_history).id, "browse/history"

   end
 
   def test_read_node
   end
 
   def test_read_node


@@ -70,8 +68,10 @@ class BrowseControllerTest < ActionController::TestCase
   end
 
   def test_read_changeset
   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"
+    private_changeset = create(:changeset, :user => create(:user, :data_public => false))
+    changeset = create(:changeset)
+    browse_check "changeset", private_changeset.id, "browse/changeset"
+    browse_check "changeset", changeset.id, "browse/changeset"

   end
 
   def test_read_changeset_hidden_comments
   end
 
   def test_read_changeset_hidden_comments


@@ -97,12 +97,12 @@ class BrowseControllerTest < ActionController::TestCase
   def test_read_hidden_note
     hidden_note_with_comment = create(:note_with_comments, :status => "hidden")
 
   def test_read_hidden_note
     hidden_note_with_comment = create(:note_with_comments, :status => "hidden")
 

-    get :note, :id => hidden_note_with_comment.id
+    get :note, :params => { :id => hidden_note_with_comment.id }

     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"
 

-    xhr :get, :note, :id => hidden_note_with_comment.id
+    get :note, :params => { :id => hidden_note_with_comment.id }, :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"


@@ -139,7 +139,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, :id => node.id
+    get :node, :params => { :id => node.id }

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


@@ -155,7 +155,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, :id => node.id
+    get :node_history, :params => { :id => node.id }

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


@@ -169,7 +169,13 @@ class BrowseControllerTest < ActionController::TestCase
   end
 
   def test_redacted_way_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, :params => { :id => way.id }

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


@@ -181,7 +187,13 @@ class BrowseControllerTest < ActionController::TestCase
   end
 
   def test_redacted_relation_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, :params => { :id => relation.id }

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


@@ -204,25 +216,25 @@ class BrowseControllerTest < ActionController::TestCase
     end
 
     assert_raise ActionController::UrlGenerationError do
     end
 
     assert_raise ActionController::UrlGenerationError do

-      get type, :id => -10 # we won't have an id that's negative
+      get type, :params => { :id => -10 } # we won't have an id that's negative

     end
 
     end
 

-    get type, :id => 0
+    get type, :params => { :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"
 

-    xhr :get, type, :id => 0
+    get type, :params => { :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, :id => id
+    get type, :params => { :id => id }

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

-    xhr :get, type, :id => id
+    get type, :params => { :id => id }, :xhr => true

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