]> git.openstreetmap.org Git - rails.git/blobdiff - app/models/user.rb
Stub out requests to gravatar.com during tests.
[rails.git] / app / models / user.rb
index 3ff9277f0c7e4838856035162e8e8dea384b7fdc..2cdb9404663ae26902506a6a59ab9e4e9ec0f242 100644 (file)
@@ -83,7 +83,7 @@ class User < ActiveRecord::Base
         user = nil
       end
     elsif options[:token]
-      token = UserToken.find_by_token(options[:token])
+      token = UserToken.find_by(:token => options[:token])
       user = token.user if token
     end
 
@@ -240,7 +240,7 @@ class User < ActiveRecord::Base
   ##
   # return an oauth access token for a specified application
   def access_token(application_key)
-    ClientApplication.find_by_key(application_key).access_token_for_user(self)
+    ClientApplication.find_by(:key => application_key).access_token_for_user(self)
   end
 
   private