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

Revert "Added some specs for grammatical_gender (User model and Users controller)."

This reverts commit 12954172.
parent d6e8873b
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
......@@ -11,8 +11,7 @@ describe UsersController do
let!(:old_password) { user.encrypted_password }
let!(:old_language) { user.language }
let!(:old_gender) { user.grammatical_gender }
before do
sign_in :user, user
end
......@@ -60,28 +59,5 @@ describe UsersController do
user.language.should_not == old_language
end
end
describe 'grammatical_gender' do
it 'should allow user to change his grammatical gender for some languages' do
user.language = 'pl'
user.grammatical_gender = 'masculine'
user.save
old_gender = user.grammatical_gender
put("update", :id => user.id, "user" => {"language" => "ru", "grammatical_gender" => "neuter"})
user.reload
user.grammatical_gender.should_not == old_gender
old_gender = user.grammatical_gender
put("update", :id => user.id, "user" => {"language" => "ru", "grammatical_gender" => ""})
user.reload
user.grammatical_gender.should == old_gender
put("update", :id => user.id, "user" => {"language" => "ru", "grammatical_gender" => "feminine"})
user.reload
old_gender = user.grammatical_gender
put("update", :id => user.id, "user" => {"language" => "en"})
user.reload
user.grammatical_gender.should == old_gender
end
end
end
end
......@@ -167,22 +167,6 @@ describe User do
end
end
describe "of grammatical gender" do
after do
I18n.locale = :en
end
it "requires availability" do
user = Factory.build(:user, :grammatical_gender => 'some invalid string')
user.should_not be_valid
end
it "should save with empty grammatical gender if blank" do
I18n.locale = :pl
user = Factory(:user, :grammatical_gender => nil)
user.grammatical_gender.should == nil
end
end
end
describe ".build" do
......
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