Skip to content

Commit

Permalink
Moving ClearanceMailer to app/mailers. Moving spec to spec/mailers.
Browse files Browse the repository at this point in the history
  • Loading branch information
Dan Croak committed Apr 30, 2011
1 parent 04b2363 commit 63aa6d5
Show file tree
Hide file tree
Showing 4 changed files with 1 addition and 15 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@

* Redirect to home page after sign up. #146 (Dan Croak)
* Remove dependency on dynamic_form. Replaced with flashes due to limited number of failure cases. #145 (Dan Croak)
* Moving ClearanceMailer to app/mailers. Moving spec to spec/mailers.

0.11.0
-------------------
Expand Down
File renamed without changes.
File renamed without changes.
15 changes: 0 additions & 15 deletions spec/models/user_spec.rb
Original file line number Diff line number Diff line change
@@ -1,14 +1,9 @@
require 'spec_helper'

describe User do

# db

it { should have_db_index(:email) }
it { should have_db_index(:remember_token) }

# signing up

describe "When signing up" do
it { should validate_presence_of(:email) }
it { should validate_presence_of(:password) }
Expand Down Expand Up @@ -52,8 +47,6 @@ def @user.initialize_salt; end
it { should validate_uniqueness_of(:email) }
end

# authenticating

describe "A user" do
before do
@user = Factory(:user)
Expand All @@ -76,8 +69,6 @@ def @user.initialize_salt; end
end
end

# resetting remember token

describe "When resetting authentication with reset_remember_token!" do
before do
@user = Factory(:user)
Expand All @@ -90,8 +81,6 @@ def @user.initialize_salt; end
end
end

# updating password

describe "An email confirmed user" do
before do
@user = Factory(:user)
Expand All @@ -118,8 +107,6 @@ def @user.initialize_salt; end
second_user.remember_token.should_not == first_user.remember_token
end

# recovering forgotten password

describe "An user" do
before do
@user = Factory(:user)
Expand Down Expand Up @@ -166,10 +153,8 @@ def @user.initialize_salt; end
end
end
end

end

# optional email/password fields
describe "a user with an optional email" do
before do
@user = User.new
Expand Down

0 comments on commit 63aa6d5

Please sign in to comment.