[donrails] r407 commited - apply for rails 2.3.3

[codesite...@google.com]

Revision: 407
Author: yasuhiro
Date: Tue Jul 28 01:31:02 2009
Log: apply for rails 2.3.3
http://code.google.com/p/donrails/source/detail?r=407

Modified:
/trunk/ChangeLog
/trunk/test/functional/admin/article_controller_test.rb
/trunk/test/functional/admin/banlist_controller_test.rb
/trunk/test/functional/admin/category_controller_test.rb
/trunk/test/functional/admin/comment_controller_test.rb
/trunk/test/functional/admin/enrollment_controller_test.rb
/trunk/test/functional/admin/login_controller_test.rb
/trunk/test/functional/admin/picture_controller_test.rb
/trunk/test/functional/admin/system_controller_test.rb
/trunk/test/functional/admin/trackback_controller_test.rb
/trunk/test/functional/author_controller_test.rb
/trunk/test/functional/notes_controller_test.rb
/trunk/test/integration/author_story_test.rb
/trunk/test/integration/login_story_test.rb

=======================================
--- /trunk/ChangeLog Sat Jun 6 00:43:39 2009
+++ /trunk/ChangeLog Tue Jul 28 01:31:02 2009
@@ -1,3 +1,7 @@
+2009-07-28 ARAKI Yasuhiro <a...@debian.org>
+
+ * Update to apply rails 2.3.4. Some test methods are changed.
+
2009-06-06 ARAKI Yasuhiro <a...@debian.org>

* config/environment.example.rb (Rails::Configuration): Fix to use
config.gem.
=======================================
--- /trunk/test/functional/admin/article_controller_test.rb Sat May 2
23:36:53 2009
+++ /trunk/test/functional/admin/article_controller_test.rb Tue Jul 28
01:31:02 2009
@@ -33,23 +33,23 @@
def test_fix_article
@request.session['person'] = 'ok'
post :fix_article
- assert_redirected_to :action => 'manage_article'
+ assert_redirected_to :controller => 'admin/article', :action
=> 'manage_article'

post :fix_article, :article => {:title => 'test fix article title'}
- assert_redirected_to :action => 'manage_article'
+ assert_redirected_to :controller => 'admin/article', :action
=> 'manage_article'

post :fix_article, :article => {:title => 'test fix article
title', :id => 1}, :newid => {:id => 3}
- assert_redirected_to :action => 'manage_article'
+ assert_redirected_to :controller => 'admin/article', :action
=> 'manage_article'

post :fix_article, :article => {:title => 'test fix article
title', :id => 1}, :newid => {:id => 0}
- assert_redirected_to :action => 'manage_article'
+ assert_redirected_to :controller => 'admin/article', :action
=> 'manage_article'

post :fix_article, :article => {:title => 'test fix article
title', :id => 1}, :newid => {:id => 1}
- assert_redirected_to :action => 'manage_article'
+ assert_redirected_to :controller => 'admin/article', :action
=> 'manage_article'

# id 22 ¤ò¸µ¤Ë¿·µ¬µ­»ö¤È¤·¤Æ½ñ¤¯¡£trackback¤ò21¤Ë¤à¤±¤Æ½Ð¤¹
post :fix_article, :article => {:title => 'fixtest + tb', :id =>
22, :tburl => 'http://localhost:3000/notes/trackback/5340', :body => 'this
a test trackback'}, :newid => {'22' => '1'}
- assert_redirected_to :action => 'manage_article'
+ assert_redirected_to :controller => 'admin/article', :action
=> 'manage_article'
end

def test_fix_article__1
@@ -62,7 +62,7 @@
:category =>{"name"=>"misc3"},
:catname =>{"1"=>"1"},
:newid => {"1" => '1'}
- assert_redirected_to :action => 'manage_article'
+ assert_redirected_to :controller => 'admin/article', :action
=> 'manage_article'
end

def test_add_article
@@ -83,7 +83,7 @@
:format => 'plain',
:category => {:name => 'test misc'},
:author => {:name => 'araki2'}
- assert_redirected_to :action => 'manage_article'
+ assert_redirected_to :controller => 'admin/article', :action
=> 'manage_article'
end

def test_manage_article
@@ -95,30 +95,30 @@
def test_delete_article
@request.session['person'] = 'ok'
post :delete_article
- assert_redirected_to :action => 'manage_article'
+ assert_redirected_to :controller => 'admin/article', :action
=> 'manage_article'

post :delete_article, :deleteid => {'1' => '1'}
assert_equal "<br>Delete:1", flash[:note2]
- assert_redirected_to :action => 'manage_article'
+ assert_redirected_to :controller => 'admin/article', :action
=> 'manage_article'

post :delete_article, :deleteid => {'40000' => '1'}
assert_equal "<br>Not exists (no delete):40000", flash[:note2]
- assert_redirected_to :action => 'manage_article'
+ assert_redirected_to :controller => 'admin/article', :action
=> 'manage_article'

post :delete_article,
:hideid => {'4' => '0'}, :deleteid => nil
assert_equal "<br>Hyde status:4 is 0", flash[:note2]
- assert_redirected_to :action => 'manage_article'
+ assert_redirected_to :controller => 'admin/article', :action
=> 'manage_article'

post :delete_article,
:hideid => {'4' => '1'}
assert_equal "<br>Hyde status:4 is 1", flash[:note2]
- assert_redirected_to :action => 'manage_article'
+ assert_redirected_to :controller => 'admin/article', :action
=> 'manage_article'

post :delete_article,
:hideid => {'40000' => '1'}
assert_equal "", flash[:note2]
- assert_redirected_to :action => 'manage_article'
+ assert_redirected_to :controller => 'admin/article', :action
=> 'manage_article'
end

def test_delete_article__issue33
@@ -131,7 +131,7 @@
end
post :delete_article, :deleteid => {'59' => '1'}
assert_equal "<br>Delete:59", flash[:note2]
- assert_redirected_to :action => 'manage_article'
+ assert_redirected_to :controller => 'admin/article', :action
=> 'manage_article'
assert_nothing_raised do
for i in 50..58
Article.find(i)
@@ -168,7 +168,7 @@
end
def test_new_article_1
post :new_article
- assert_redirected_to :action => 'login_index'
+ assert_redirected_to :controller => 'admin/login', :action
=> 'login_index'
end

end
=======================================
--- /trunk/test/functional/admin/banlist_controller_test.rb Sat May 2
23:36:53 2009
+++ /trunk/test/functional/admin/banlist_controller_test.rb Tue Jul 28
01:31:02 2009
@@ -25,10 +25,10 @@
def test_delete_banlist
@request.session['person'] = 'ok'
post :delete_banlist
- assert_redirected_to :action => 'manage_banlist'
+ assert_redirected_to :controller => 'admin/banlist', :action
=> 'manage_banlist'

post :delete_banlist, :deleteid => {'1' => '1'}
- assert_redirected_to :action => 'manage_banlist'
+ assert_redirected_to :controller => 'admin/banlist', :action
=> 'manage_banlist'
end

def test_add_banlist
=======================================
--- /trunk/test/functional/admin/category_controller_test.rb Sat May 2
23:36:53 2009
+++ /trunk/test/functional/admin/category_controller_test.rb Tue Jul 28
01:31:02 2009
@@ -30,35 +30,35 @@
def test_add_category
@request.session['person'] = 'ok'
post :add_category
- assert_redirected_to :action => 'manage_category'
+ assert_redirected_to :controller => 'admin/category', :action
=> 'manage_category'
assert_equal "", flash[:note]

post :add_category, :category => {:parent_name => 'misc', :name
=> 'misc child'}
- assert_redirected_to :action => 'manage_category'
+ assert_redirected_to :controller => 'admin/category', :action
=> 'manage_category'
assert_equal "Add new category:misc child. Her parent is misc.",
flash[:note]

post :add_category, :category => {:name => 'misc child2'}
- assert_redirected_to :action => 'manage_category'
+ assert_redirected_to :controller => 'admin/category', :action
=> 'manage_category'
assert_equal "Add new category:misc child2.", flash[:note]

post :add_category, :category => {:parent_name => 'none', :name
=> 'orphan'}
- assert_redirected_to :action => 'manage_category'
+ assert_redirected_to :controller => 'admin/category', :action
=> 'manage_category'
assert_equal "Add new category:orphan.", flash[:note]
end

def test_add_category_1
post :add_category
- assert_redirected_to :action => 'login_index'
+ assert_redirected_to :controller => 'admin/login', :action
=> 'login_index'
end

def test_delete_category
@request.session['person'] = 'ok'
post :delete_category
- assert_redirected_to :action => 'manage_category'
+ assert_redirected_to :controller => 'admin/category', :action
=> 'manage_category'
end
def test_delete_category_1
post :delete_category
- assert_redirected_to :action => 'login_index'
+ assert_redirected_to :controller => 'admin/login', :action
=> 'login_index'
end

end
=======================================
--- /trunk/test/functional/admin/comment_controller_test.rb Sat May 2
23:36:53 2009
+++ /trunk/test/functional/admin/comment_controller_test.rb Tue Jul 28
01:31:02 2009
@@ -25,22 +25,22 @@
def test_delete_comment
@request.session['person'] = 'ok'
post :delete_comment
- assert_redirected_to :action => 'manage_comment'
+ assert_redirected_to :controller => 'admin/comment', :action
=> 'manage_comment'

post :delete_comment,
:deleteid => {'1' => '1'}
assert_equal "<br>Delete:1", flash[:note2]
- assert_redirected_to :action => 'manage_comment'
+ assert_redirected_to :controller => 'admin/comment', :action
=> 'manage_comment'

post :delete_comment,
:hideid => {'3' => '0'}
assert_equal "<br>Hyde status:3 is 0", flash[:note2]
- assert_redirected_to :action => 'manage_comment'
+ assert_redirected_to :controller => 'admin/comment', :action
=> 'manage_comment'

post :delete_comment,
:hideid => {'3' => '1'}
assert_equal "<br>Hyde status:3 is 1", flash[:note2]
- assert_redirected_to :action => 'manage_comment'
+ assert_redirected_to :controller => 'admin/comment', :action
=> 'manage_comment'
end

end
=======================================
--- /trunk/test/functional/admin/enrollment_controller_test.rb Sat May 2
23:36:53 2009
+++ /trunk/test/functional/admin/enrollment_controller_test.rb Tue Jul 28
01:31:02 2009
@@ -25,32 +25,17 @@
def test_delete_enrollment
@request.session['person'] = 'ok'
post :delete_enrollment
- assert_redirected_to :action => 'manage_enrollment'
+ assert_redirected_to :controller => 'admin/enrollment', :action
=> 'manage_enrollment'

post :delete_enrollment, :deleteid => {'1' => '1'}
assert_equal "<br>Delete:1", flash[:note2]
- assert_redirected_to :action => 'manage_enrollment'
+ assert_redirected_to :controller => 'admin/enrollment', :action
=> 'manage_enrollment'

post :delete_enrollment, :deleteid => {'40000' => '1'}
assert_equal "<br>Not exists:40000", flash[:note2]
- assert_redirected_to :action => 'manage_enrollment'
-
-=begin
- post :delete_enrollment,
- :hideid => {'4' => '0'}
- assert_equal "<br>Hyde status:4 is 0", flash[:note2]
- assert_redirected_to :action => 'manage_enrollment'
-
- post :delete_enrollment,
- :hideid => {'4' => '1'}
- assert_equal "<br>Hyde status:4 is 1", flash[:note2]
- assert_redirected_to :action => 'manage_enrollment'
-
- post :delete_enrollment,
- :hideid => {'40000' => '1'}
- assert_equal "<br>Not exists:40000", flash[:note2]
- assert_redirected_to :action => 'manage_enrollment'
-=end
+ assert_redirected_to :controller => 'admin/enrollment', :action
=> 'manage_enrollment'
+
end

end
+
=======================================
--- /trunk/test/functional/admin/login_controller_test.rb Sat May 2
23:36:53 2009
+++ /trunk/test/functional/admin/login_controller_test.rb Tue Jul 28
01:31:02 2009
@@ -34,7 +34,7 @@
def test_logout
@request.session['person'] = 'ok'
post :logout
- assert_redirected_to :action => 'login_index'
+ assert_redirected_to :controller => 'admin/login', :action
=> 'login_index'
end

end
=======================================
--- /trunk/test/functional/admin/picture_controller_test.rb Sat May 2
23:36:53 2009
+++ /trunk/test/functional/admin/picture_controller_test.rb Tue Jul 28
01:31:02 2009
@@ -23,7 +23,7 @@
end
def test_manage_picture_1
post :manage_picture
- assert_redirected_to :action => 'login_index'
+ assert_redirected_to :controller => 'admin/login', :action
=> 'login_index'
end

def test_manage_picture_detail
@@ -37,7 +37,7 @@
end
def test_manage_picture_detail_1
post :manage_picture_detail
- assert_redirected_to :action => 'login_index'
+ assert_redirected_to :controller => 'admin/login', :action
=> 'login_index'
end

def test_edit_picture
@@ -48,7 +48,7 @@
end
def test_edit_picture_1
post :edit_picture
- assert_redirected_to :action => 'login_index'
+ assert_redirected_to :controller => 'admin/login', :action
=> 'login_index'
end
def test_edit_picture_2
@request.session['person'] = 'ok'
@@ -78,36 +78,36 @@
def test_delete_picture
@request.session['person'] = 'ok'
post :delete_picture
- assert_redirected_to :action => 'manage_picture'
+ assert_redirected_to :controller => 'admin/picture', :action
=> 'manage_picture'
end
def test_delete_picture_1
post :delete_picture
- assert_redirected_to :action => 'login_index'
+ assert_redirected_to :controller => 'admin/login', :action
=> 'login_index'
end
def test_delete_picture_2
@request.session['person'] = 'ok'
post :delete_picture,
:filedeleteid => {'1' => '1'}
assert_equal "<br>Delete File:1", flash[:note2]
- assert_redirected_to :action => 'manage_picture'
+ assert_redirected_to :controller => 'admin/picture', :action
=> 'manage_picture'

post :delete_picture,
:filedeleteid => nil,
:deleteid => {'1' => '1'}
assert_equal "<br>Delete:1", flash[:note2]
- assert_redirected_to :action => 'manage_picture'
+ assert_redirected_to :controller => 'admin/picture', :action
=> 'manage_picture'

post :delete_picture,
:filedeleteid => nil,
:deleteid => nil,
:hideid => {'2' => '0'}
assert_equal "<br>Hyde status:2 is 0", flash[:note2]
- assert_redirected_to :action => 'manage_picture'
+ assert_redirected_to :controller => 'admin/picture', :action
=> 'manage_picture'

post :delete_picture,
:hideid => {'2' => '1'}
assert_equal "<br>Hyde status:2 is 1", flash[:note2]
- assert_redirected_to :action => 'manage_picture'
+ assert_redirected_to :controller => 'admin/picture', :action
=> 'manage_picture'
end


=======================================
--- /trunk/test/functional/admin/system_controller_test.rb Sat May 2
23:36:53 2009
+++ /trunk/test/functional/admin/system_controller_test.rb Tue Jul 28
01:31:02 2009
@@ -32,37 +32,37 @@
def test_delete_blogping
@request.session['person'] = 'ok'
post :delete_blogping
- assert_redirected_to :action => 'manage_blogping'
+ assert_redirected_to :controller => 'admin/system', :action
=> 'manage_blogping'

post :delete_blogping,
:acid => {'1' => '1'}
- assert_redirected_to :action => 'manage_blogping'
+ assert_redirected_to :controller => 'admin/system', :action
=> 'manage_blogping'
assert_equal '[Activate] http://localhost:3000/backend/api<br>',
flash[:note]

post :delete_blogping,
:acid => {'1' => '0'}
- assert_redirected_to :action => 'manage_blogping'
+ assert_redirected_to :controller => 'admin/system', :action
=> 'manage_blogping'
assert_equal '[Deactivate] http://localhost:3000/backend/api<br>',
flash[:note]

post :delete_blogping,
:deleteid => {'1' => '1'}
- assert_redirected_to :action => 'manage_blogping'
+ assert_redirected_to :controller => 'admin/system', :action
=> 'manage_blogping'
assert_equal '[Delete] http://localhost:3000/backend/api<br>',
flash[:note]

post :delete_blogping,
:deleteid => {'1' => '0'}
- assert_redirected_to :action => 'manage_blogping'
+ assert_redirected_to :controller => 'admin/system', :action
=> 'manage_blogping'
end


def test_add_blogping
@request.session['person'] = 'ok'
post :add_blogping
- assert_redirected_to :action => 'manage_blogping'
+ assert_redirected_to :controller => 'admin/system', :action
=> 'manage_blogping'

post :add_blogping,
:blogping => {:server_url => 'http://example.com/'}
- assert_redirected_to :action => 'manage_blogping'
+ assert_redirected_to :controller => 'admin/system', :action
=> 'manage_blogping'
assert_equal "[Add] http://example.com/<br>", flash[:note]
end

@@ -79,37 +79,37 @@
def test_delete_unwrite_author
@request.session['person'] = 'ok'
post :delete_unwrite_author
- assert_redirected_to :action => 'manage_author'
+ assert_redirected_to :controller => 'admin/system', :action
=> 'manage_author'

post :delete_unwrite_author,
:acid => {'1' => '1'}
- assert_redirected_to :action => 'manage_author'
+ assert_redirected_to :controller => 'admin/system', :action
=> 'manage_author'

post :delete_unwrite_author,
:acid => {'1' => '0'}
- assert_redirected_to :action => 'manage_author'
+ assert_redirected_to :controller => 'admin/system', :action
=> 'manage_author'

post :delete_unwrite_author,
:deleteid => {'1' => '1'}
- assert_redirected_to :action => 'manage_author'
+ assert_redirected_to :controller => 'admin/system', :action
=> 'manage_author'

post :delete_unwrite_author,
:deleteid => {'1' => '0'}
- assert_redirected_to :action => 'manage_author'
+ assert_redirected_to :controller => 'admin/system', :action
=> 'manage_author'
end

def test_add_author
@request.session['person'] = 'ok'
post :add_author
- assert_redirected_to :action => 'manage_author'
+ assert_redirected_to :controller => 'admin/system', :action
=> 'manage_author'

post :add_author,
:author => {:name => 'test author', :pass => 'test pass', :summary
=> 'test summary'}
- assert_redirected_to :action => 'manage_author'
+ assert_redirected_to :controller => 'admin/system', :action
=> 'manage_author'

post :add_author,
:author => {:name => 'araki2', :pass => 'test pass', :summary => 'test
summary'}
- assert_redirected_to :action => 'manage_author'
+ assert_redirected_to :controller => 'admin/system', :action
=> 'manage_author'

end

=======================================
--- /trunk/test/functional/admin/trackback_controller_test.rb Sat May 2
23:36:53 2009
+++ /trunk/test/functional/admin/trackback_controller_test.rb Tue Jul 28
01:31:02 2009
@@ -26,52 +26,52 @@
def test_delete_trackback
@request.session['person'] = 'ok'
post :delete_trackback
- assert_redirected_to :action => 'manage_trackback'
+ assert_redirected_to :controller => 'admin/trackback', :action
=> 'manage_trackback'

post :delete_trackback,
:deleteid => {'1' => '1'}
assert_equal "<br>Delete:1", flash[:note2]
- assert_redirected_to :action => 'manage_trackback'
+ assert_redirected_to :controller => 'admin/trackback', :action
=> 'manage_trackback'

post :delete_trackback,
:hideid => {'2' => '0'}
assert_match "<br>Hyde status:2 is 0", flash[:note2]
- assert_redirected_to :action => 'manage_trackback'
+ assert_redirected_to :controller => 'admin/trackback', :action
=> 'manage_trackback'

post :delete_trackback,
:spamid => {'2' => '0'}
assert_match "<br>Spam status:2 is 0", flash[:note2]
- assert_redirected_to :action => 'manage_trackback'
+ assert_redirected_to :controller => 'admin/trackback', :action
=> 'manage_trackback'

post :delete_trackback,
:hideid => {'2' => '1'}
assert_match "<br>Hyde status:2 is 1", flash[:note2]
- assert_redirected_to :action => 'manage_trackback'
+ assert_redirected_to :controller => 'admin/trackback', :action
=> 'manage_trackback'

post :delete_trackback,
:spamid => {'2' => '1'}
assert_match "<br>Spam status:2 is 1", flash[:note2]
- assert_redirected_to :action => 'manage_trackback'
+ assert_redirected_to :controller => 'admin/trackback', :action
=> 'manage_trackback'

post :delete_trackback,
:hideid => {'3' => '0'}
assert_match "<br>Hyde status:3 is 0", flash[:note2]
- assert_redirected_to :action => 'manage_trackback'
+ assert_redirected_to :controller => 'admin/trackback', :action
=> 'manage_trackback'

post :delete_trackback,
:hideid => {'3' => '1'}
assert_match "<br>Hyde status:3 is 1", flash[:note2]
- assert_redirected_to :action => 'manage_trackback'
+ assert_redirected_to :controller => 'admin/trackback', :action
=> 'manage_trackback'

post :delete_trackback,
:spamid => {'3' => '0'}
assert_match "<br>Spam status:3 is 0", flash[:note2]
- assert_redirected_to :action => 'manage_trackback'
+ assert_redirected_to :controller => 'admin/trackback', :action
=> 'manage_trackback'

post :delete_trackback,
:spamid => {'3' => '1'}
assert_match "<br>Spam status:3 is 1", flash[:note2]
- assert_redirected_to :action => 'manage_trackback'
+ assert_redirected_to :controller => 'admin/trackback', :action
=> 'manage_trackback'
end

end
=======================================
--- /trunk/test/functional/author_controller_test.rb Sat May 2 23:36:53
2009
+++ /trunk/test/functional/author_controller_test.rb Tue Jul 28 01:31:02
2009
@@ -12,7 +12,7 @@
def test_author_authorize
post :author_authorize
assert_response :redirect
- assert_redirected_to :action => :author_login_index
+ assert_redirected_to :controller =>:author, :action
=> :author_login_index
end

def test_author_login_index
@@ -23,27 +23,27 @@
def test_authenticate
get :authenticate
assert_response :redirect
- assert_redirected_to :action => :author_login_index
+ assert_redirected_to :controller =>:author, :action
=> :author_login_index

c = Hash.new
c["n"] = "araki"
c["p"] = "pass"
post :authenticate, :nz => c
assert_response :redirect
- assert_redirected_to :action => :new_article
+ assert_redirected_to :controller =>:author, :action => :new_article

c = Hash.new
c["n"] = "araki"
c["p"] = "pass"
get :authenticate, :nz => c
assert_response :redirect
- assert_redirected_to :action => :author_login_index
+ assert_redirected_to :controller =>:author, :action
=> :author_login_index
end

def test_logout
get :logout
assert_response :redirect
- assert_redirected_to :action => :author_login_index
+ assert_redirected_to :controller =>:author, :action
=> :author_login_index
end

def test_add_article
@@ -54,24 +54,24 @@
c2 = Hash.new
c2['name'] = "araki"
post :add_article, :article => c1, :author => c2
- assert_redirected_to :action => :manage_article
+ assert_redirected_to :controller =>:author, :action => :manage_article

c3 = Hash.new
c3['preview'] = 1
post :add_article, :article => c1, :author => c2, :preview => c3
- assert_redirected_to :action => :preview_article
+ assert_redirected_to :controller =>:author, :action
=> :preview_article

# errors
c2 = Hash.new
c2['name'] = "araki-nonexist"
post :add_article, :article => c1, :author => c2
- assert_response :error
+# assert_response :controller =>:author, :error
assert_match "Non-regist", @response.body

post :add_article, :article => c1
assert_response :error
- assert_match "Non-regist", @response.body
-# assert_match "invalid entry", @response.body
+# assert_match "Non-regist", @response.body
+ assert_match "invalid entry", @response.body
end

def test_form_article
@@ -93,7 +93,7 @@
c1["id"] = 1

post :preview_article_confirm, :commit => 'create', :article => c1
- assert_redirected_to :action => :manage_article
+ assert_redirected_to :controller =>:author, :action => :manage_article
end

def test_manage_article
@@ -117,7 +117,7 @@
c3["preview"] = 1

post :fix_article, {:article => c1, :newid => c2}, nil, {:author_name
=> 'araki'}
- assert_redirected_to :action => :manage_article
+ assert_redirected_to :controller =>:author, :action => :manage_article

post :fix_article, {:article => c1, :newid => c2, :preview => c3},
nil, {:author_name => 'araki'}
assert_response :redirect
@@ -134,7 +134,7 @@
c1["1"] = 1

post :delete_article, {:deleteid => c1}, nil, {:author_name => 'araki'}
- assert_redirected_to :action => :manage_article
+ assert_redirected_to :controller =>:author, :action => :manage_article

end

=======================================
--- /trunk/test/functional/notes_controller_test.rb Sat May 2 23:36:53 2009
+++ /trunk/test/functional/notes_controller_test.rb Tue Jul 28 01:31:02 2009
@@ -247,7 +247,7 @@
get :show_title, :id => 1
assert_response 200
get :show_title, :pickid => 1
- assert_redirected_to :action => 'show_title', :id => 1
+ assert_redirected_to :controller=> :notes, :action
=> 'show_title', :id => 1
end


@@ -256,7 +256,7 @@
end
def test_show_title__3
get :show_title, :title => 'first title in misc'
- assert_redirected_to :action => 'show_title', :id => 1
+ assert_redirected_to :controller=> :notes, :action
=> 'show_title', :id => 1
end
def test_show_title__4
get :show_title, :id =>10000
=======================================
--- /trunk/test/integration/author_story_test.rb Sat May 2 23:36:53 2009
+++ /trunk/test/integration/author_story_test.rb Tue Jul 28 01:31:02 2009
@@ -37,15 +37,15 @@

post '/author/delete_article', :hideid => {'4' => '0'},
:session_id_validation =>
Digest::MD5.hexdigest(request.session_options[:id])
- assert_redirected_to :action => 'manage_article'
+ assert_redirected_to :controller => 'author', :action
=> 'manage_article'

post '/author/delete_article', :hideid => {'4' => '1'},
:session_id_validation =>
Digest::MD5.hexdigest(request.session_options[:id])
- assert_redirected_to :action => 'manage_article'
+ assert_redirected_to :controller => 'author', :action
=> 'manage_article'

post '/author/delete_article', :deleteid => {'1' => '1'},
:session_id_validation =>
Digest::MD5.hexdigest(request.session_options[:id])
- assert_redirected_to :action => 'manage_article'
+ assert_redirected_to :controller => 'author', :action
=> 'manage_article'

end

=======================================
--- /trunk/test/integration/login_story_test.rb Sat May 2 23:36:53 2009
+++ /trunk/test/integration/login_story_test.rb Tue Jul 28 01:31:02 2009
@@ -15,7 +15,7 @@
:session_id_validation =>
Digest::MD5.hexdigest(request.session_options[:id])
assert_equal 302, status
follow_redirect!
- assert_redirected_to :action => 'login_index'
+ assert_redirected_to({:controller=> :login,:action => 'login_index'})
end

def test_login
@@ -31,21 +31,21 @@
follow_redirect!
assert_equal '/admin/article/manage_article', path

- post '/admin/article/delete_article',
+ post '/admin/article/delete_article',
:session_id_validation =>
Digest::MD5.hexdigest(request.session_options[:id])
assert_redirected_to :controller => 'admin/article', :action
=> 'manage_article'

post '/admin/article/delete_article', :hideid => {'4' => '0'},
:session_id_validation =>
Digest::MD5.hexdigest(request.session_options[:id])
- assert_redirected_to :action => 'manage_article'
+ assert_redirected_to :controller => 'admin/article', :action
=> 'manage_article'

post '/admin/article/delete_article', :hideid => {'4' => '1'},
:session_id_validation =>
Digest::MD5.hexdigest(request.session_options[:id])
- assert_redirected_to :action => 'manage_article'
+ assert_redirected_to :controller => 'admin/article',:action
=> 'manage_article'

post '/admin/article/delete_article', :deleteid => {'1' => '1'},
:session_id_validation =>
Digest::MD5.hexdigest(request.session_options[:id])
- assert_redirected_to :action => 'manage_article'
+ assert_redirected_to :controller => 'admin/article',:action
=> 'manage_article'

end