rebased this branch onto master
This commit is contained in:
parent
90458381f5
commit
70dcc5becc
1 changed files with 4 additions and 0 deletions
|
|
@ -907,6 +907,7 @@ describe User do
|
||||||
fantasy_resque do
|
fantasy_resque do
|
||||||
@invitation = Factory.create(:invitation, :sender => eve, :identifier => 'invitee@example.org', :aspect => eve.aspects.first)
|
@invitation = Factory.create(:invitation, :sender => eve, :identifier => 'invitee@example.org', :aspect => eve.aspects.first)
|
||||||
end
|
end
|
||||||
|
|
||||||
@invitation.reload
|
@invitation.reload
|
||||||
@form_params = {
|
@form_params = {
|
||||||
:invitation_token => "abc",
|
:invitation_token => "abc",
|
||||||
|
|
@ -1003,6 +1004,8 @@ describe User do
|
||||||
user = Factory :user
|
user = Factory :user
|
||||||
Resque.should_receive(:enqueue).with(Jobs::ResetPassword, user.id)
|
Resque.should_receive(:enqueue).with(Jobs::ResetPassword, user.id)
|
||||||
user.send_reset_password_instructions
|
user.send_reset_password_instructions
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
context "close account" do
|
context "close account" do
|
||||||
before do
|
before do
|
||||||
|
|
@ -1078,3 +1081,4 @@ describe User do
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
end
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue