Extract observation of User to a UserObserver

Robb Kidd
1 parent 97ca4f5d
Showing 5 changed files with 37 additions and 10 deletions Show diff stats
app/models/mailer_observer.rb
app/models/user_observer.rb
config/application.rb
spec/models/user_observer_spec.rb
spec/requests/admin/admin_users_spec.rb
 class MailerObserver < ActiveRecord::Observer
-  observe :issue, :user, :note, :merge_request
+  observe :issue, :note, :merge_request
   cattr_accessor :current_user
   def after_create(model)
-    new_user(model) if model.kind_of?(User)
     new_note(model) if model.kind_of?(Note)
     new_merge_request(model) if model.kind_of?(MergeRequest)
   end
@@ -14,10 +13,6 @@ class MailerObserver &lt; ActiveRecord::Observer
   protected
-  def new_user(user)
-    Notify.new_user_email(user.id, user.password).deliver
-  end
-
   def new_note(note)
     if note.notify
       # Notify whole team except author of note
@@ -0,0 +1,5 @@
+class UserObserver < ActiveRecord::Observer
+  def after_create(user)
+    Notify.new_user_email(user.id, user.password).deliver
+  end
+end
@@ -23,7 +23,7 @@ module Gitlab
     # config.plugins = [ :exception_notification, :ssl_requirement, :all ]
     # Activate observers that should always be running.
-    config.active_record.observers = :mailer_observer, :activity_observer, :project_observer, :key_observer, :issue_observer
+    config.active_record.observers = :mailer_observer, :activity_observer, :project_observer, :key_observer, :issue_observer, :user_observer
     # Set Time.zone default to the specified zone and make Active Record auto-convert to this zone.
     # Run "rake -D time" for a list of tasks for finding time zone names. Default is UTC.
@@ -0,0 +1,26 @@
+require 'spec_helper'
+
+describe UserObserver do
+  subject { UserObserver.instance }
+
+  it 'calls #after_create when new users are created' do
+    new_user = Factory.new(:user)
+    subject.should_receive(:after_create).with(new_user)
+
+    User.observers.enable :user_observer do
+      new_user.save
+    end
+  end
+
+  context 'when a new user is created' do
+    let(:user) { double(:user, id: 42, password: 'P@ssword!') }
+    let(:notification) { double :notification }
+
+    it 'sends an email' do
+      notification.should_receive(:deliver)
+      Notify.should_receive(:new_user_email).with(user.id, user.password).and_return(notification)
+
+      subject.after_create(user)
+    end
+  end
+end
@@ -40,14 +40,15 @@ describe &quot;Admin::Users&quot; do
     end
     it "should call send mail" do
-      User.observers.enable :mailer_observer do
-        Notify.should_receive(:new_user_email).and_return(stub(:deliver => true))
+      Notify.should_receive(:new_user_email).and_return(stub(:deliver => true))
+
+      User.observers.enable :user_observer do
         click_button "Save"
       end
     end
     it "should send valid email to user with email & password" do
-      User.observers.enable :mailer_observer do
+      User.observers.enable :user_observer do
         with_resque do
           click_button "Save"
         end
@@ -0,0 +1,5 @@		@@ -0,0 +1,5 @@
	1	+class UserObserver < ActiveRecord::Observer
	2	+ def after_create(user)
	3	+ Notify.new_user_email(user.id, user.password).deliver
	4	+ end
	5	+end
	@@ -23,7 +23,7 @@ module Gitlab		@@ -23,7 +23,7 @@ module Gitlab
23	# config.plugins = [ :exception_notification, :ssl_requirement, :all ]	23	# config.plugins = [ :exception_notification, :ssl_requirement, :all ]
24		24
25	# Activate observers that should always be running.	25	# Activate observers that should always be running.
26	- config.active_record.observers = :mailer_observer, :activity_observer, :project_observer, :key_observer, :issue_observer	26	+ config.active_record.observers = :mailer_observer, :activity_observer, :project_observer, :key_observer, :issue_observer, :user_observer
27		27
28	# Set Time.zone default to the specified zone and make Active Record auto-convert to this zone.	28	# Set Time.zone default to the specified zone and make Active Record auto-convert to this zone.
29	# Run "rake -D time" for a list of tasks for finding time zone names. Default is UTC.	29	# Run "rake -D time" for a list of tasks for finding time zone names. Default is UTC.
@@ -0,0 +1,26 @@		@@ -0,0 +1,26 @@
	1	+require 'spec_helper'
	2	+
	3	+describe UserObserver do
	4	+ subject { UserObserver.instance }
	5	+
	6	+ it 'calls #after_create when new users are created' do
	7	+ new_user = Factory.new(:user)
	8	+ subject.should_receive(:after_create).with(new_user)
	9	+
	10	+ User.observers.enable :user_observer do
	11	+ new_user.save
	12	+ end
	13	+ end
	14	+
	15	+ context 'when a new user is created' do
	16	+ let(:user) { double(:user, id: 42, password: 'P@ssword!') }
	17	+ let(:notification) { double :notification }
	18	+
	19	+ it 'sends an email' do
	20	+ notification.should_receive(:deliver)
	21	+ Notify.should_receive(:new_user_email).with(user.id, user.password).and_return(notification)
	22	+
	23	+ subject.after_create(user)
	24	+ end
	25	+ end
	26	+end