fix key observer tests

Dmitriy Zaporozhets
1 parent 299a9a10
Showing 2 changed files with 3 additions and 9 deletions Show diff stats
app/observers/project_observer.rb
spec/observers/key_observer_spec.rb
@@ -15,7 +15,7 @@ class ProjectObserver &lt; ActiveRecord::Observer
   end
   def after_create project
-    log_info("#{project.owner.name} created a new project \"#{project.name}\"")
+    log_info("#{project.owner.name} created a new project \"#{project.name_with_namespace}\"")
   end
   protected
@@ -9,25 +9,19 @@ describe KeyObserver do
       is_deploy_key: false
     )
-    @gitolite = double('Gitlab::Gitolite',
-      set_key: true,
-      remove_key: true
-    )
-
     @observer = KeyObserver.instance
-    @observer.stub(gitolite: @gitolite)
   end
   context :after_save do
     it do
-      @gitolite.should_receive(:set_key).with(@key.identifier, @key.key, @key.projects)
+      GitoliteWorker.should_receive(:perform_async).with(:set_key, @key.identifier, @key.key, @key.projects.map(&:id))
       @observer.after_save(@key)
     end
   end
   context :after_destroy do
     it do
-      @gitolite.should_receive(:remove_key).with(@key.identifier, @key.projects)
+      GitoliteWorker.should_receive(:perform_async).with(:remove_key, @key.identifier, @key.projects.map(&:id))
       @observer.after_destroy(@key)
     end
   end
	@@ -15,7 +15,7 @@ class ProjectObserver < ActiveRecord::Observer		@@ -15,7 +15,7 @@ class ProjectObserver < ActiveRecord::Observer
15	end	15	end
16		16
17	def after_create project	17	def after_create project
18	- log_info("#{project.owner.name} created a new project \"#{project.name}\"")	18	+ log_info("#{project.owner.name} created a new project \"#{project.name_with_namespace}\"")
19	end	19	end
20		20
21	protected	21	protected