Skip to content
Extraits de code Groupes Projets
Valider 0ec074be rédigé par Sarah Mei's avatar Sarah Mei
Parcourir les fichiers

Remove annoying deprecation warning from spec runs

Add spec for validation hook
parent 64e1912c
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
...@@ -35,7 +35,7 @@ class User ...@@ -35,7 +35,7 @@ class User
after_create :seed_aspects after_create :seed_aspects
before_validation_on_create :downcase_username before_validation :downcase_username, :on => :create
def self.find_for_authentication(conditions={}) def self.find_for_authentication(conditions={})
if conditions[:username] =~ /^([\w\.%\+\-]+)@([\w\-]+\.)+([\w]{2,})$/i # email regex if conditions[:username] =~ /^([\w\.%\+\-]+)@([\w\-]+\.)+([\w]{2,})$/i # email regex
......
...@@ -6,7 +6,14 @@ require 'spec_helper' ...@@ -6,7 +6,14 @@ require 'spec_helper'
describe User do describe User do
let(:user) { Factory(:user) } let(:user) { Factory(:user) }
let(:aspect) { user.aspect(:name => 'heroes') }
describe "validations" do
it "downcases the username" do
user = Factory.build(:user, :username => "ALLUPPERCASE")
user.valid?
user.username.should == "alluppercase"
end
end
describe '#diaspora_handle' do describe '#diaspora_handle' do
it 'uses the pod config url to set the diaspora_handle' do it 'uses the pod config url to set the diaspora_handle' do
...@@ -27,6 +34,7 @@ describe User do ...@@ -27,6 +34,7 @@ describe User do
end end
context 'aspects' do context 'aspects' do
let(:aspect) { user.aspect(:name => 'heroes') }
let(:user2) { Factory(:user) } let(:user2) { Factory(:user) }
let(:aspect2) { user2.aspect(:name => 'stuff') } let(:aspect2) { user2.aspect(:name => 'stuff') }
......
0% Chargement en cours ou .
You are about to add 0 people to the discussion. Proceed with caution.
Terminez d'abord l'édition de ce message.
Veuillez vous inscrire ou vous pour commenter