summaryrefslogtreecommitdiffstats
path: root/test/functional/watchers_controller_test.rb
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2012-04-25 17:17:49 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2012-04-25 17:17:49 +0000
commit5e57a1a9d9478162ac4f27ae96b2ccaf55a1aba7 (patch)
tree93e57765139714bd82dede475725516c448c0d55 /test/functional/watchers_controller_test.rb
parent34e20c4373b7f5a20ab3a132feae3f70f21ec477 (diff)
downloadredmine-5e57a1a9d9478162ac4f27ae96b2ccaf55a1aba7.tar.gz
redmine-5e57a1a9d9478162ac4f27ae96b2ccaf55a1aba7.zip
Merged rails-3.2 branch.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9528 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'test/functional/watchers_controller_test.rb')
-rw-r--r--test/functional/watchers_controller_test.rb11
1 files changed, 10 insertions, 1 deletions
diff --git a/test/functional/watchers_controller_test.rb b/test/functional/watchers_controller_test.rb
index 9247b6631..e477af5e8 100644
--- a/test/functional/watchers_controller_test.rb
+++ b/test/functional/watchers_controller_test.rb
@@ -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