Merge remote-tracking branch 'openstreetmap/pull/1458'

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

diff --git a/test/controllers/amf_controller_test.rb b/test/controllers/amf_controller_test.rb
index d388114dd99626db7f0f54ff3fa8e07f086e8880..66965d8affb4ed1182a7725bf143f2fa15735d52 100644 (file)
--- a/test/controllers/amf_controller_test.rb
+++ b/test/controllers/amf_controller_test.rb
@@ -19,9 +19,9 @@ class AmfControllerTest < ActionController::TestCase
   end
 
   def test_getpresets
   end
 
   def test_getpresets

-    [:public_user, :german_user].each do |id|
-      user = users(id)
-
+    user_en_de = create(:normal_user, :languages => %w(en de))
+    user_de = create(:normal_user, :languages => %w(de))
+    [user_en_de, user_de].each do |user|

       amf_content "getpresets", "/1", ["#{user.email}:test", ""]
       post :amf_read
       assert_response :success
       amf_content "getpresets", "/1", ["#{user.email}:test", ""]
       post :amf_read
       assert_response :success


@@ -308,8 +308,7 @@ class AmfControllerTest < ActionController::TestCase
     # try to get version 1
     v1 = ways(:way_with_versions_v2)
     { latest.id => "",
     # try to get version 1
     v1 = ways(:way_with_versions_v2)
     { latest.id => "",

-      v1.way_id => v1.timestamp.strftime("%d %b %Y, %H:%M:%S")
-    }.each do |id, t|
+      v1.way_id => v1.timestamp.strftime("%d %b %Y, %H:%M:%S") }.each do |id, t|

       amf_content "getway_old", "/1", [id, t]
       post :amf_read
       assert_response :success
       amf_content "getway_old", "/1", [id, t]
       post :amf_read
       assert_response :success


@@ -329,10 +328,9 @@ class AmfControllerTest < ActionController::TestCase
     way_id = current_ways(:way_with_versions).id
     { "foo"  => "bar",
       way_id => "not a date",
     way_id = current_ways(:way_with_versions).id
     { "foo"  => "bar",
       way_id => "not a date",

-      way_id => "2009-03-25 00:00:00", # <- wrong format
-      way_id => "0 Jan 2009 00:00:00", # <- invalid date
-      -1     => "1 Jan 2009 00:00:00"  # <- invalid ID
-    }.each do |id, t|
+      way_id => "2009-03-25 00:00:00",                   # <- wrong format
+      way_id => "0 Jan 2009 00:00:00",                   # <- invalid date
+      -1     => "1 Jan 2009 00:00:00" }.each do |id, t|  # <- invalid

       amf_content "getway_old", "/1", [id, t]
       post :amf_read
       assert_response :success
       amf_content "getway_old", "/1", [id, t]
       post :amf_read
       assert_response :success


@@ -352,8 +350,7 @@ class AmfControllerTest < ActionController::TestCase
     # try to get specific version of non-existent way
     [[0, ""],
      [0, "1 Jan 1970, 00:00:00"],
     # try to get specific version of non-existent way
     [[0, ""],
      [0, "1 Jan 1970, 00:00:00"],

-     [v1.way_id, (v1.timestamp - 10).strftime("%d %b %Y, %H:%M:%S")]
-    ].each do |id, t|
+     [v1.way_id, (v1.timestamp - 10).strftime("%d %b %Y, %H:%M:%S")]].each do |id, t|

       amf_content "getway_old", "/1", [id, t]
       post :amf_read
       assert_response :success
       amf_content "getway_old", "/1", [id, t]
       post :amf_read
       assert_response :success


@@ -369,8 +366,7 @@ class AmfControllerTest < ActionController::TestCase
   def test_getway_old_invisible
     v1 = ways(:invisible_way)
     # try to get deleted version
   def test_getway_old_invisible
     v1 = ways(:invisible_way)
     # try to get deleted version

-    [[v1.way_id, (v1.timestamp + 10).strftime("%d %b %Y, %H:%M:%S")]
-    ].each do |id, t|
+    [[v1.way_id, (v1.timestamp + 10).strftime("%d %b %Y, %H:%M:%S")]].each do |id, t|

       amf_content "getway_old", "/1", [id, t]
       post :amf_read
       assert_response :success
       amf_content "getway_old", "/1", [id, t]
       post :amf_read
       assert_response :success


@@ -464,7 +460,9 @@ class AmfControllerTest < ActionController::TestCase
     assert_equal -1, result[0]
     assert_match /must be logged in/, result[1]
 
     assert_equal -1, result[0]
     assert_match /must be logged in/, result[1]
 

-    amf_content "findgpx", "/1", [1, "blocked@openstreetmap.org:test"]
+    blocked_user = create(:normal_user)
+    create(:user_block, :user => blocked_user)
+    amf_content "findgpx", "/1", [1, "#{blocked_user.email}:test"]

     post :amf_read
     assert_response :success
     amf_parse_response
     post :amf_read
     assert_response :success
     amf_parse_response


@@ -476,9 +474,10 @@ class AmfControllerTest < ActionController::TestCase
   end
 
   def test_findgpx_by_id
   end
 
   def test_findgpx_by_id

-    trace = gpx_files(:anon_trace_file)
+    user = create(:normal_user)
+    trace = create(:trace, :visibility => "private", :user => user)

 
 

-    amf_content "findgpx", "/1", [trace.id, "test@example.com:test"]
+    amf_content "findgpx", "/1", [trace.id, "#{user.email}:test"]

     post :amf_read
     assert_response :success
     amf_parse_response
     post :amf_read
     assert_response :success
     amf_parse_response


@@ -534,7 +533,10 @@ class AmfControllerTest < ActionController::TestCase
 
   def test_findrelations_by_tags
     visible_relation = current_relations(:visible_relation)
 
   def test_findrelations_by_tags
     visible_relation = current_relations(:visible_relation)

+    create(:relation_tag, :relation => visible_relation, :k => "test", :v => "yes")

     used_relation = current_relations(:used_relation)
     used_relation = current_relations(:used_relation)

+    create(:relation_tag, :relation => used_relation, :k => "test", :v => "yes")
+    create(:relation_tag, :relation => used_relation, :k => "name", :v => "Test Relation")

 
     amf_content "findrelations", "/1", ["yes"]
     post :amf_read
 
     amf_content "findrelations", "/1", ["yes"]
     post :amf_read