Download as
Browse Code »

Commit 1c931fb81477397929a31a6b95c5d65b6d582182

Authored by Dmitriy Zaporozhets
1 parent 299a9a10
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

fix key observer tests

Showing 2 changed files with 3 additions and 9 deletions   Show diff stats
app/observers/project_observer.rb
  Diff comments   View file @1c931fb
... ... @@ -15,7 +15,7 @@ class ProjectObserver < ActiveRecord::Observer
15 15 end
16 16  
17 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 19 end
20 20  
21 21 protected
... ...
spec/observers/key_observer_spec.rb
  Diff comments   View file @1c931fb
... ... @@ -9,25 +9,19 @@ describe KeyObserver do
9 9 is_deploy_key: false
10 10 )
11 11  
12   - @gitolite = double('Gitlab::Gitolite',
13   - set_key: true,
14   - remove_key: true
15   - )
16   -
17 12 @observer = KeyObserver.instance
18   - @observer.stub(gitolite: @gitolite)
19 13 end
20 14  
21 15 context :after_save do
22 16 it do
23   - @gitolite.should_receive(:set_key).with(@key.identifier, @key.key, @key.projects)
  17 + GitoliteWorker.should_receive(:perform_async).with(:set_key, @key.identifier, @key.key, @key.projects.map(&:id))
24 18 @observer.after_save(@key)
25 19 end
26 20 end
27 21  
28 22 context :after_destroy do
29 23 it do
30   - @gitolite.should_receive(:remove_key).with(@key.identifier, @key.projects)
  24 + GitoliteWorker.should_receive(:perform_async).with(:remove_key, @key.identifier, @key.projects.map(&:id))
31 25 @observer.after_destroy(@key)
32 26 end
33 27 end
... ...