Load the correct merge request in various scenarios

- Repositories#config scopes merge requests on repository
- MergeRequestProcessor looks up by sequence number, not id
- PushEventProcessor finds merge request in repo, not directly by sequence_number
- MergeRequests#show use to_param in title

2 files changed, 2 insertions, 14 deletions

diff --git a/test/unit/processors/merge_request_git_backend_processor_test.rb b/test/unit/processors/merge_request_git_backend_processor_test.rb
index ee8a99e..fc77113 100644
--- a/test/unit/processors/merge_request_git_backend_processor_test.rb
+++ b/test/unit/processors/merge_request_git_backend_processor_test.rb
@@ -38,9 +38,7 @@ class MergeRequestGitBackendProcessorTest < ActiveSupport::TestCase
       @source_git_repo.stubs(:git).returns(@source_git)
       @merge_request.source_repository.stubs(:git).returns(@source_git_repo)
       @msg = {
-        :merge_request_id => @merge_request.to_param,
         :action => "delete",
-        :target_path => @merge_request.target_repository.full_repository_path,
         :target_name => @merge_request.target_repository.url_path,
         :merge_branch_name => @merge_request.merge_branch_name,
         :source_repository_id => @merge_request.source_repository.id,
@@ -71,16 +69,5 @@ class MergeRequestGitBackendProcessorTest < ActiveSupport::TestCase
       assert_equal :delete, @processor.action
     end
     
-    should "understand the close command" do
-      msg = {:merge_request_id => @merge_request.to_param, :action => "close"}
-      @processor.expects(:do_close)
-      @processor.on_message(msg.to_json)
-    end
-    
-    should "understand the reopen command" do
-      msg = {:merge_request_id => @merge_request.to_param, :action => "reopen"}
-      @processor.expects(:do_reopen)
-      @processor.on_message(msg.to_json)
-    end
   end
 end
diff --git a/test/unit/processors/merge_request_processor_test.rb b/test/unit/processors/merge_request_processor_test.rb
index 9c15e05..e691e09 100644
--- a/test/unit/processors/merge_request_processor_test.rb
+++ b/test/unit/processors/merge_request_processor_test.rb
@@ -26,7 +26,8 @@ class MergeRequestProcessorTest < ActiveSupport::TestCase
     @merge_request = merge_requests(:moes_to_johans_open)
     @target_repo = @merge_request.target_repository
     @merge_request.stubs(:target_repository).returns(@target_repo)
-    MergeRequest.stubs(:find).returns(@merge_request)
+    MergeRequest.expects(:find_by_sequence_number!).with(@merge_request.to_param)
+      .returns(@merge_request)
     @tracking_repo = mock("Tracking repository")
     @tracking_repo.stubs(:real_gitdir).returns("ff0/bbc/234")
     @target_repo.stubs(:create_tracking_repository).returns(@tracking_repo)