Remove version lock on dalli now that ruby-openid is updated

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

diff --git a/test/functional/amf_controller_test.rb b/test/functional/amf_controller_test.rb
index 46ff71eb734aad0ba57a3220105dd2870d6ba044..f3a4e7cd1b642ea69da87723ea2010eae669761d 100644 (file)
--- a/test/functional/amf_controller_test.rb
+++ b/test/functional/amf_controller_test.rb
@@ -295,11 +295,10 @@ class AmfControllerTest < ActionController::TestCase
     assert_equal latest.id, history[1] 
     # We use dates rather than version numbers here, because you might
     # have moved a node within a way (i.e. way version not incremented).
-    # The timestamp is +1 (timestamp.succ) because we say "give me the
-    # revision of 15:33:02", but that might actually include changes at
-    # 15:33:02.457.
-    assert_equal latest.timestamp.succ.strftime("%d %b %Y, %H:%M:%S"), history[2].first[0]
-    assert_equal oldest.timestamp.succ.strftime("%d %b %Y, %H:%M:%S"), history[2].last[0]
+    # The timestamp is +1 because we say "give me the revision of 15:33:02",
+    # but that might actually include changes at 15:33:02.457.
+    assert_equal (latest.timestamp + 1).strftime("%d %b %Y, %H:%M:%S"), history[2].first[0]
+    assert_equal (oldest.timestamp + 1).strftime("%d %b %Y, %H:%M:%S"), history[2].last[0]
   end
 
   def test_getway_history_nonexistent
@@ -331,10 +330,10 @@ class AmfControllerTest < ActionController::TestCase
     assert_equal history[1], latest.id,
       'second element should be the input node ID'
     assert_equal history[2].first[0], 
-      latest.timestamp.succ.strftime("%d %b %Y, %H:%M:%S"),
+      (latest.timestamp + 1).strftime("%d %b %Y, %H:%M:%S"),
       'first element in third element (array) should be the latest version'
     assert_equal history[2].last[0], 
-      nodes(:node_with_versions_v1).timestamp.succ.strftime("%d %b %Y, %H:%M:%S"),
+      (nodes(:node_with_versions_v1).timestamp + 1).strftime("%d %b %Y, %H:%M:%S"),
       'last element in third element (array) should be the initial version'
   end
 
@@ -417,7 +416,7 @@ class AmfControllerTest < ActionController::TestCase
     assert_equal 0, current_node.tags.size, "There seems to be a tag that has been added to the node"
     assert_equal result[4], current_node.version, "The version returned, is different to the one returned by the amf"
     # Now check the history table
-    historic_nodes = Node.find(:all, :conditions => { :id => result[3] })
+    historic_nodes = Node.where(:id => result[3])
     assert_equal 1, historic_nodes.size, "There should only be one historic node created"
     first_historic_node = historic_nodes.first
     assert_in_delta lat, first_historic_node.lat, 0.00001, "The latitude was not retreived correctly"
@@ -457,7 +456,7 @@ class AmfControllerTest < ActionController::TestCase
     assert_equal({ "key" => "value", "ping" => "pong" }, current_node.tags, "tags are different")
     assert_equal result[4], current_node.version, "The version returned, is different to the one returned by the amf"
     # Now check the history table
-    historic_nodes = Node.find(:all, :conditions => { :id => result[3] })
+    historic_nodes = Node.where(:id => result[3])
     assert_equal 1, historic_nodes.size, "There should only be one historic node created"
     first_historic_node = historic_nodes.first
     assert_in_delta lat, first_historic_node.lat, 0.00001, "The latitude was not retreived correctly"