Merge branch 'users_group_observer' of /home/git/repositories/gitlab/gitlabhq

Dmitriy Zaporozhets
2 parents 845b98ec 1af65c96
Showing 2 changed files with 6 additions and 1 deletions Show diff stats
app/observers/users_group_observer.rb
spec/observers/users_group_observer_spec.rb
@@ -4,6 +4,6 @@ class UsersGroupObserver &lt; BaseObserver
   end
  
   def after_update(membership)
-    notification.update_group_member(membership)
+    notification.update_group_member(membership) if membership.group_access_changed?
   end
 end
@@ -23,5 +23,10 @@ describe UsersGroupObserver do
       subject.should_receive(:notification)
       @membership.update_attribute(:group_access, UsersGroup::MASTER)
     end
+
+    it "does not send an email when the access level has not changed" do
+      subject.should_not_receive(:notification)
+      @membership.update_attribute(:group_access, UsersGroup::OWNER)
+    end
   end
 end
...	...	@@ -4,6 +4,6 @@ class UsersGroupObserver < BaseObserver
4	4	end
5	5
6	6	def after_update(membership)
7		- notification.update_group_member(membership)
	7	+ notification.update_group_member(membership) if membership.group_access_changed?
8	8	end
9	9	end
...	...
...	...	@@ -23,5 +23,10 @@ describe UsersGroupObserver do
23	23	subject.should_receive(:notification)
24	24	@membership.update_attribute(:group_access, UsersGroup::MASTER)
25	25	end
	26	+
	27	+ it "does not send an email when the access level has not changed" do
	28	+ subject.should_not_receive(:notification)
	29	+ @membership.update_attribute(:group_access, UsersGroup::OWNER)
	30	+ end
26	31	end
27	32	end
...	...