diff options
author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-09-02 12:05:51 +0400 |
---|---|---|
committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-09-02 12:05:51 +0400 |
commit | fc65f71747a9b07cac3cb765c043150877a98565 (patch) | |
tree | e36ba610031ae3d8b1aebc63061b80598b015763 /spec/workers | |
parent | 730712f77e4ebaf10b6181672b5f85cf984ac27f (diff) |
Fix post-receive specs
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'spec/workers')
-rw-r--r-- | spec/workers/post_receive_spec.rb | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/spec/workers/post_receive_spec.rb b/spec/workers/post_receive_spec.rb index e6bf79b853c..4273fd1019a 100644 --- a/spec/workers/post_receive_spec.rb +++ b/spec/workers/post_receive_spec.rb @@ -1,7 +1,6 @@ require 'spec_helper' describe PostReceive do - context "as a resque worker" do it "reponds to #perform" do PostReceive.new.should respond_to(:perform) @@ -15,7 +14,7 @@ describe PostReceive do it "fetches the correct project" do Project.should_receive(:find_with_namespace).with(project.path_with_namespace).and_return(project) - PostReceive.new.perform(pwd(project), 'sha-old', 'sha-new', 'refs/heads/master', key_id) + PostReceive.new.perform(pwd(project), key_id, changes) end it "does not run if the author is not in the project" do @@ -23,7 +22,7 @@ describe PostReceive do project.should_not_receive(:execute_hooks) - PostReceive.new.perform(pwd(project), 'sha-old', 'sha-new', 'refs/heads/master', key_id).should be_false + PostReceive.new.perform(pwd(project), key_id, changes).should be_false end it "asks the project to trigger all hooks" do @@ -32,11 +31,15 @@ describe PostReceive do project.should_receive(:execute_services) project.should_receive(:update_merge_requests) - PostReceive.new.perform(pwd(project), 'sha-old', 'sha-new', 'refs/heads/master', key_id) + PostReceive.new.perform(pwd(project), key_id, changes) end end def pwd(project) File.join(Gitlab.config.gitlab_shell.repos_path, project.path_with_namespace) end + + def changes + 'd14d6c0abdd253381df51a723d58691b2ee1ab08 570e7b2abdd848b95f2f578043fc23bd6f6fd24d refs/heads/master' + end end |