got rid of rails/init as it's deprecated

call the deliver methods correctly
tessro · Apr 24, 2010 · e690860 · e690860
1 parent f6a4589
commit e690860
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 5 deletions.
diff --git a/init.rb b/init.rb
@@ -1 +1 @@
-require 'rails/init'
+require 'devise_invitable'
diff --git a/lib/devise_invitable/model.rb b/lib/devise_invitable/model.rb
@@ -39,15 +39,15 @@ def invited?
 
       # Send invitation by email
       def send_invitation
-        ::DeviseMailer.deliver_invitation(self)
+        ::Devise::Mailer.invitation(self).deliver
       end
 
       # Reset invitation token and send invitation again
       def resend_invitation!
         if new_record? || invited?
           self.skip_confirmation! if self.new_record? and self.respond_to? :skip_confirmation!
           generate_invitation_token
-          save(false)
+          save(:validate=>false)
           send_invitation
         end
       end

diff --git a/rails/init.rb b/rails/init.rb
diff --git a/test/test_helper.rb b/test/test_helper.rb
@@ -10,7 +10,7 @@
 
 path = File.join(File.dirname(__FILE__), '..', 'app', 'views')
 ActionController::Base.view_paths << path
-DeviseMailer.view_paths << path
+Devise::Mailer.view_paths << path
 
 ActionMailer::Base.delivery_method = :test
 ActionMailer::Base.perform_deliveries = true