user_spec.rb in clearance-0.16.1

- old
+ new

@@ -14,23 +14,23 @@
     it { should_not allow_value("foo@.example.com").for(:email) }
     it { should_not allow_value("foo").for(:email) }
     it { should_not allow_value("example.com").for(:email) }
 
     it "should store email in down case" do
-      user = Factory(:user, :email => "John.Doe@example.com")
+      user = create(:user, :email => "John.Doe@example.com")
       user.email.should == "john.doe@example.com"
     end
   end
 
   describe "When multiple users have signed up" do
-    before { Factory(:user) }
+    before { create(:user) }
     it { should validate_uniqueness_of(:email) }
   end
 
   describe "A user" do
     before do
-      @user     = Factory(:user)
+      @user     = create(:user)
       @password = @user.password
     end
 
     it "is authenticated with correct email and password" do
       (Clearance.configuration.user_model.authenticate(@user.email, @password)).should be
@@ -48,11 +48,11 @@
     end
   end
 
   describe "When resetting authentication with reset_remember_token!" do
     before do
-      @user  = Factory(:user)
+      @user  = create(:user)
       @user.remember_token = "old-token"
       @user.reset_remember_token!
     end
 
     it "should change the remember token" do
@@ -60,11 +60,11 @@
     end
   end
 
   describe "An email confirmed user" do
     before do
-      @user = Factory(:user)
+      @user = create(:user)
       @old_encrypted_password = @user.encrypted_password
     end
 
     describe "who updates password" do
       before do
@@ -78,19 +78,19 @@
   end
 
   it "should not generate the same remember token for users with the same password at the same time" do
     Time.stubs(:now => Time.now)
     password    = 'secret'
-    first_user  = Factory(:user, :password => password)
-    second_user = Factory(:user, :password => password)
+    first_user  = create(:user, :password => password)
+    second_user = create(:user, :password => password)
 
     second_user.remember_token.should_not == first_user.remember_token
   end
 
   describe "An user" do
     before do
-      @user = Factory(:user)
+      @user = create(:user)
       @old_encrypted_password = @user.encrypted_password
     end
 
     describe "who requests password reminder" do
       before do
@@ -166,16 +166,16 @@
     it { should allow_value("").for(:password) }
   end
 
   describe "user factory" do
     it "should create a valid user with just an overridden password" do
-      Factory.build(:user, :password => "test").should be_valid
+      build(:user, :password => "test").should be_valid
     end
   end
 
   describe "when user exists before Clearance was installed" do
     before do
-      @user = Factory(:user)
+      @user = create(:user)
       sql  = "update users set salt = NULL, encrypted_password = NULL, remember_token = NULL where id = #{@user.id}"
       ActiveRecord::Base.connection.update(sql)
       @user.reload.salt.should be_nil
       @user.reload.encrypted_password.should be_nil
       @user.reload.remember_token.should be_nil