summaryrefslogtreecommitdiff
path: root/spec/workers
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-02-05 12:47:50 +0200
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-02-05 12:47:50 +0200
commit70e3bffd95eb5736dd108e0836abaa85a2f1c742 (patch)
treeeffcda0ec2a1b5e8437740cfe848226abd3200a2 /spec/workers
parent39e37677f291c344e25583916a1811a052e38db6 (diff)
downloadgitlab-ce-70e3bffd95eb5736dd108e0836abaa85a2f1c742.tar.gz
Fixed: post-receive, project remove, tests
Diffstat (limited to 'spec/workers')
-rw-r--r--spec/workers/post_receive_spec.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/workers/post_receive_spec.rb b/spec/workers/post_receive_spec.rb
index f408c89afdd..f1a69b1b2e4 100644
--- a/spec/workers/post_receive_spec.rb
+++ b/spec/workers/post_receive_spec.rb
@@ -11,7 +11,7 @@ describe PostReceive do
context "web hook" do
let(:project) { create(:project) }
let(:key) { create(:key, user: project.owner) }
- let(:key_id) { key.identifier }
+ let(:key_id) { key.shell_id }
it "fetches the correct project" do
Project.should_receive(:find_with_namespace).with(project.path_with_namespace).and_return(project)
@@ -19,7 +19,7 @@ describe PostReceive do
end
it "does not run if the author is not in the project" do
- Key.stub(find_by_identifier: nil)
+ Key.stub(find_by_id: nil)
project.should_not_receive(:observe_push)
project.should_not_receive(:execute_hooks)