Remove outdated specs and fixed key remove

4 files changed, 4 insertions, 27 deletions

diff --git a/app/observers/key_observer.rb b/app/observers/key_observer.rb
index 261e2245b97..ad371d304c3 100644
--- a/app/observers/key_observer.rb
+++ b/app/observers/key_observer.rb
@@ -12,6 +12,7 @@ class KeyObserver < ActiveRecord::Observer
   def after_destroy(key)
     GitoliteWorker.perform_async(
       :remove_key,
+      key.owner_name,
       key.key,
     )
   end
diff --git a/lib/gitlab/backend/shell.rb b/lib/gitlab/backend/shell.rb
index 7423b106a45..c596148b13c 100644
--- a/lib/gitlab/backend/shell.rb
+++ b/lib/gitlab/backend/shell.rb
@@ -38,8 +38,8 @@ module Gitlab
     # Ex.
     #   remove_key("sha-rsa")
     #
-    def remove_key(key_content)
-      system("/home/git/gitlab-shell/bin/gitlab-keys rm-key \"#{key_content}\"")
+    def remove_key(username, key_content)
+      system("/home/git/gitlab-shell/bin/gitlab-keys rm-key #{username} \"#{key_content}\"")
     end
 
 
diff --git a/spec/lib/gitolite_config_spec.rb b/spec/lib/gitolite_config_spec.rb
deleted file mode 100644
index c3ce0db569a..00000000000
--- a/spec/lib/gitolite_config_spec.rb
+++ /dev/null
@@ -1,16 +0,0 @@
-require 'spec_helper'
-
-describe Gitlab::GitoliteConfig do
-  let(:gitolite) { Gitlab::GitoliteConfig.new }
-
-  it { should respond_to :write_key }
-  it { should respond_to :rm_key }
-  it { should respond_to :update_project }
-  it { should respond_to :update_project! }
-  it { should respond_to :update_projects }
-  it { should respond_to :destroy_project }
-  it { should respond_to :destroy_project! }
-  it { should respond_to :apply }
-  it { should respond_to :admin_all_repo }
-  it { should respond_to :admin_all_repo! }
-end
diff --git a/spec/lib/gitolite_spec.rb b/spec/lib/gitolite_spec.rb
index 7ba4a633fb1..2705298876f 100644
--- a/spec/lib/gitolite_spec.rb
+++ b/spec/lib/gitolite_spec.rb
@@ -2,25 +2,17 @@ require 'spec_helper'
 
 describe Gitlab::Gitolite do
   let(:project) { double('Project', id: 7, path: 'diaspora') }
-  let(:gitolite_config) { double('Gitlab::GitoliteConfig') }
   let(:gitolite) { Gitlab::Gitolite.new }
 
   before do
-    gitolite.stub(config: gitolite_config)
     Project.stub(find: project)
   end
 
   it { should respond_to :set_key }
   it { should respond_to :remove_key }
 
-  it { should respond_to :update_repository }
-  it { should respond_to :create_repository }
+  it { should respond_to :add_repository }
   it { should respond_to :remove_repository }
 
   it { gitolite.url_to_repo('diaspora').should == Gitlab.config.gitolite.ssh_path_prefix + "diaspora.git" }
-
-  it "should call config update" do
-    gitolite_config.should_receive(:update_project!)
-    gitolite.update_repository(project.id)
-  end
 end