OSDN Git Service

fix key observer tests
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Mon, 28 Jan 2013 21:03:38 +0000 (23:03 +0200)
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Mon, 28 Jan 2013 21:03:38 +0000 (23:03 +0200)
app/observers/project_observer.rb
spec/observers/key_observer_spec.rb

index cc454ae..ccdb146 100644 (file)
@@ -15,7 +15,7 @@ class ProjectObserver < 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
index ae7b0f7..11f975c 100644 (file)
@@ -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