Merged rails-3.2 branch.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9528 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-04-25 17:17:49 +00:00
parent 34e20c4373
commit 5e57a1a9d9
457 changed files with 20215 additions and 5352 deletions
@@ -84,10 +84,19 @@ class WatchersControllerTest < ActionController::TestCase
    assert_select_rjs :replace_html, 'ajax-modal'
  end

-  def test_new_for_new_record
+  def test_new_for_new_record_with_id
    @request.session[:user_id] = 2
    xhr :get, :new, :project_id => 1
    assert_response :success
+    assert_equal Project.find(1), assigns(:project)
+    assert_select_rjs :replace_html, 'ajax-modal'
+  end
+
+  def test_new_for_new_record_with_identifier
+    @request.session[:user_id] = 2
+    xhr :get, :new, :project_id => 'ecookbook'
+    assert_response :success
+    assert_equal Project.find(1), assigns(:project)
    assert_select_rjs :replace_html, 'ajax-modal'
  end