0
@@ -104,5 +104,18 @@ describe CommitController do
0
       end
0
       output.should include(@merge_message)
0
     end
0
+    
0
+    it "should resolve auto add/rm merged files" do
0
+      @merge_message = "Merged"
0
+      @git.should_receive(:status).and_return([
0
+         {:path => "/base/file.yml",          :status => {:short => "M", :long => "modified", :foreground =>"#eb6400", :background=>"#f7e1ad"}, :display=> "file.yml"},
0
+         {:path => "/base/deleted_file.yml",  :status => {:short => "G", :long => "merged",   :foreground =>"#eb6400", :background=>"#f7e1ad"}, :display=> "deleted_file.yml"}
0
+       ])
0
+       @git.should_receive(:auto_add_rm).with(["deleted_file.yml"])
0
+       output = capture_output do
0
+         dispatch(:controller => "commit", :action => "merge_commit", :message => @merge_message)
0
+       end
0
+       output.should include(@merge_message)
0
+    end
0
   end
0
 end