Diff
Modified: branches/rails2/test/functional/announcements_controller_test.rb (2808 => 2809)
--- branches/rails2/test/functional/announcements_controller_test.rb 2011-11-15 16:21:26 UTC (rev 2808)
+++ branches/rails2/test/functional/announcements_controller_test.rb 2011-11-16 01:18:23 UTC (rev 2809)
@@ -1,18 +1,11 @@
require File.dirname(__FILE__) + '/../test_helper'
require 'announcements_controller'
-# Re-raise errors caught by the controller.
-class AnnouncementsController; def rescue_action(e) raise e end; end
-
-class AnnouncementsControllerTest < ActiveSupport::TestCase
+class AnnouncementsControllerTest < ActionController::TestCase
fixtures :announcements
fixtures :users
def setup
- @controller = AnnouncementsController.new
- @request = ActionController::TestRequest.new
- @response = ActionController::TestResponse.new
-
@first_id = announcements(:first_announcement).id
end
Modified: branches/rails2/test/functional/api_controller_test.rb (2808 => 2809)
--- branches/rails2/test/functional/api_controller_test.rb 2011-11-15 16:21:26 UTC (rev 2808)
+++ branches/rails2/test/functional/api_controller_test.rb 2011-11-16 01:18:23 UTC (rev 2809)
@@ -6,19 +6,10 @@
include ActionView::Helpers::UrlHelper
include ActionController::UrlWriter
-# Re-raise errors caught by the controller.
-class ApiController; def rescue_action(e) raise e end; end
+class ApiControllerTest < ActionController::TestCase
-class ApiControllerTest < ActiveSupport::TestCase
-
fixtures :workflows, :users, :content_types, :licenses, :ontologies, :predicates, :packs
- def setup
- @controller = ApiController.new
- @request = TestRequestWithQuery.new
- @response = ActionController::TestResponse.new
- end
-
def test_workflows
existing_workflows = Workflow.find(:all)
Modified: branches/rails2/test/functional/authorization_test.rb (2808 => 2809)
--- branches/rails2/test/functional/authorization_test.rb 2011-11-15 16:21:26 UTC (rev 2808)
+++ branches/rails2/test/functional/authorization_test.rb 2011-11-16 01:18:23 UTC (rev 2809)
@@ -6,10 +6,7 @@
require File.dirname(__FILE__) + '/../test_helper'
require 'workflows_controller'
-# Re-raise errors caught by the controller.
-class WorkflowsController; def rescue_action(e) raise e end; end
-
-class AuthorizationTest < ActiveSupport::TestCase
+class AuthorizationTest < ActionController::TestCase
fixtures :workflows, :users, :contributions, :workflow_versions, :content_blobs, :blobs, :packs, :policies, :permissions, :networks, :friendships, :memberships, :licenses
def test_truth
Modified: branches/rails2/test/functional/blobs_controller_test.rb (2808 => 2809)
--- branches/rails2/test/functional/blobs_controller_test.rb 2011-11-15 16:21:26 UTC (rev 2808)
+++ branches/rails2/test/functional/blobs_controller_test.rb 2011-11-16 01:18:23 UTC (rev 2809)
@@ -6,18 +6,9 @@
require File.dirname(__FILE__) + '/../test_helper'
require 'blobs_controller'
-# Re-raise errors caught by the controller.
-class BlobsController; def rescue_action(e) raise e end; end
-
-class BlobsControllerTest < ActiveSupport::TestCase
+class BlobsControllerTest < ActionController::TestCase
fixtures :blobs, :users, :contributions, :content_blobs, :workflows, :packs, :policies, :permissions, :networks, :content_types
- def setup
- @controller = BlobsController.new
- @request = ActionController::TestRequest.new
- @response = ActionController::TestResponse.new
- end
-
def test_should_get_index
get :index
assert_response :success
Modified: branches/rails2/test/functional/blog_posts_controller_test.rb (2808 => 2809)
--- branches/rails2/test/functional/blog_posts_controller_test.rb 2011-11-15 16:21:26 UTC (rev 2808)
+++ branches/rails2/test/functional/blog_posts_controller_test.rb 2011-11-16 01:18:23 UTC (rev 2809)
@@ -6,11 +6,8 @@
require File.dirname(__FILE__) + '/../test_helper'
require 'blog_posts_controller'
-# Re-raise errors caught by the controller.
-class BlogPostsController; def rescue_action(e) raise e end; end
+class BlogPostsControllerTest < ActionController::TestCase
-class BlogPostsControllerTest < ActiveSupport::TestCase
-
def test_true
assert true
end
Modified: branches/rails2/test/functional/blogs_controller_test.rb (2808 => 2809)
--- branches/rails2/test/functional/blogs_controller_test.rb 2011-11-15 16:21:26 UTC (rev 2808)
+++ branches/rails2/test/functional/blogs_controller_test.rb 2011-11-16 01:18:23 UTC (rev 2809)
@@ -6,11 +6,8 @@
require File.dirname(__FILE__) + '/../test_helper'
require 'blogs_controller'
-# Re-raise errors caught by the controller.
-class BlogsController; def rescue_action(e) raise e end; end
+class BlogsControllerTest < ActionController::TestCase
-class BlogsControllerTest < ActiveSupport::TestCase
-
def test_true
assert true
end
Modified: branches/rails2/test/functional/bookmarks_controller_test.rb (2808 => 2809)
--- branches/rails2/test/functional/bookmarks_controller_test.rb 2011-11-15 16:21:26 UTC (rev 2808)
+++ branches/rails2/test/functional/bookmarks_controller_test.rb 2011-11-16 01:18:23 UTC (rev 2809)
@@ -6,16 +6,8 @@
require File.dirname(__FILE__) + '/../test_helper'
require 'bookmarks_controller'
-# Re-raise errors caught by the controller.
-class BookmarksController; def rescue_action(e) raise e end; end
+class BookmarksControllerTest < ActionController::TestCase
-class BookmarksControllerTest < ActiveSupport::TestCase
- def setup
- @controller = BookmarksController.new
- @request = ActionController::TestRequest.new
- @response = ActionController::TestResponse.new
- end
-
# Replace this with your real tests.
def test_truth
assert true
Modified: branches/rails2/test/functional/citations_controller_test.rb (2808 => 2809)
--- branches/rails2/test/functional/citations_controller_test.rb 2011-11-15 16:21:26 UTC (rev 2808)
+++ branches/rails2/test/functional/citations_controller_test.rb 2011-11-16 01:18:23 UTC (rev 2809)
@@ -1,18 +1,9 @@
require File.dirname(__FILE__) + '/../test_helper'
require 'citations_controller'
-# Re-raise errors caught by the controller.
-class CitationsController; def rescue_action(e) raise e end; end
-
-class CitationsControllerTest < ActiveSupport::TestCase
+class CitationsControllerTest < ActionController::TestCase
fixtures :citations, :workflows, :workflow_versions, :content_blobs, :users, :contributions, :blobs, :packs, :policies, :permissions
- def setup
- @controller = CitationsController.new
- @request = ActionController::TestRequest.new
- @response = ActionController::TestResponse.new
- end
-
def test_should_get_index
login_as(:john)
get :index, :workflow_id => '1'
Modified: branches/rails2/test/functional/experiments_controller_test.rb (2808 => 2809)
--- branches/rails2/test/functional/experiments_controller_test.rb 2011-11-15 16:21:26 UTC (rev 2808)
+++ branches/rails2/test/functional/experiments_controller_test.rb 2011-11-16 01:18:23 UTC (rev 2809)
@@ -1,17 +1,10 @@
require File.dirname(__FILE__) + '/../test_helper'
require 'experiments_controller'
-# Re-raise errors caught by the controller.
-class ExperimentsController; def rescue_action(e) raise e end; end
-
-class ExperimentsControllerTest < ActiveSupport::TestCase
+class ExperimentsControllerTest < ActionController::TestCase
fixtures :experiments, :users
def setup
- @controller = ExperimentsController.new
- @request = ActionController::TestRequest.new
- @response = ActionController::TestResponse.new
-
@first_id = experiments(:experiment_1).id
end
Modified: branches/rails2/test/functional/feedback_controller_test.rb (2808 => 2809)
--- branches/rails2/test/functional/feedback_controller_test.rb 2011-11-15 16:21:26 UTC (rev 2808)
+++ branches/rails2/test/functional/feedback_controller_test.rb 2011-11-16 01:18:23 UTC (rev 2809)
@@ -1,16 +1,8 @@
require File.dirname(__FILE__) + '/../test_helper'
require 'feedback_controller'
-# Re-raise errors caught by the controller.
-class FeedbackController; def rescue_action(e) raise e end; end
+class FeedbackControllerTest < ActionController::TestCase
-class FeedbackControllerTest < ActiveSupport::TestCase
- def setup
- @controller = FeedbackController.new
- @request = ActionController::TestRequest.new
- @response = ActionController::TestResponse.new
- end
-
# Replace this with your real tests.
def test_truth
assert true
Modified: branches/rails2/test/functional/friendships_controller_test.rb (2808 => 2809)
--- branches/rails2/test/functional/friendships_controller_test.rb 2011-11-15 16:21:26 UTC (rev 2808)
+++ branches/rails2/test/functional/friendships_controller_test.rb 2011-11-16 01:18:23 UTC (rev 2809)
@@ -6,18 +6,9 @@
require File.dirname(__FILE__) + '/../test_helper'
require 'friendships_controller'
-# Re-raise errors caught by the controller.
-class FriendshipsController; def rescue_action(e) raise e end; end
-
-class FriendshipsControllerTest < ActiveSupport::TestCase
+class FriendshipsControllerTest < ActionController::TestCase
fixtures :friendships, :users, :profiles
- def setup
- @controller = FriendshipsController.new
- @request = ActionController::TestRequest.new
- @response = ActionController::TestResponse.new
- end
-
def test_should_get_index
login_as(:john)
get :index, :user_id => users(:john).id
Modified: branches/rails2/test/functional/group_announcements_controller_test.rb (2808 => 2809)
--- branches/rails2/test/functional/group_announcements_controller_test.rb 2011-11-15 16:21:26 UTC (rev 2808)
+++ branches/rails2/test/functional/group_announcements_controller_test.rb 2011-11-16 01:18:23 UTC (rev 2809)
@@ -1,18 +1,9 @@
require File.dirname(__FILE__) + '/../test_helper'
require 'group_announcements_controller'
-# Re-raise errors caught by the controller.
-class GroupAnnouncementsController; def rescue_action(e) raise e end; end
-
-class GroupAnnouncementsControllerTest < ActiveSupport::TestCase
+class GroupAnnouncementsControllerTest < ActionController::TestCase
fixtures :group_announcements, :networks, :users
- def setup
- @controller = GroupAnnouncementsController.new
- @request = ActionController::TestRequest.new
- @response = ActionController::TestResponse.new
- end
-
def test_should_get_index
get :index, :group_id => networks(:dilbert_appreciation_network).id
assert_response :success
Modified: branches/rails2/test/functional/home_controller_test.rb (2808 => 2809)
--- branches/rails2/test/functional/home_controller_test.rb 2011-11-15 16:21:26 UTC (rev 2808)
+++ branches/rails2/test/functional/home_controller_test.rb 2011-11-16 01:18:23 UTC (rev 2809)
@@ -1,16 +1,7 @@
require File.dirname(__FILE__) + '/../test_helper'
require 'home_controller'
-# Re-raise errors caught by the controller.
-class HomeController; def rescue_action(e) raise e end; end
-
-class HomeControllerTest < ActiveSupport::TestCase
- def setup
- @controller = HomeController.new
- @request = ActionController::TestRequest.new
- @response = ActionController::TestResponse.new
- end
-
+class HomeControllerTest < ActionController::TestCase
# Replace this with your real tests.
def test_truth
assert true
Modified: branches/rails2/test/functional/jobs_controller_test.rb (2808 => 2809)
--- branches/rails2/test/functional/jobs_controller_test.rb 2011-11-15 16:21:26 UTC (rev 2808)
+++ branches/rails2/test/functional/jobs_controller_test.rb 2011-11-16 01:18:23 UTC (rev 2809)
@@ -1,18 +1,11 @@
require File.dirname(__FILE__) + '/../test_helper'
require 'jobs_controller'
-# Re-raise errors caught by the controller.
-class JobsController; def rescue_action(e) raise e end; end
-
# tests should be uncommented and fixed when fixture data for jobs is available
-class JobsControllerTest < ActiveSupport::TestCase
+class JobsControllerTest < ActionController::TestCase
fixtures :jobs
def setup
- @controller = JobsController.new
- @request = ActionController::TestRequest.new
- @response = ActionController::TestResponse.new
-
# no fixtures for jobs currently
address@hidden = jobs(:first).id
end
Modified: branches/rails2/test/functional/key_permissions_controller_test.rb (2808 => 2809)
--- branches/rails2/test/functional/key_permissions_controller_test.rb 2011-11-15 16:21:26 UTC (rev 2808)
+++ branches/rails2/test/functional/key_permissions_controller_test.rb 2011-11-16 01:18:23 UTC (rev 2809)
@@ -1,16 +1,7 @@
require File.dirname(__FILE__) + '/../test_helper'
require 'key_permissions_controller'
-# Re-raise errors caught by the controller.
-class KeyPermissionsController; def rescue_action(e) raise e end; end
-
-class KeyPermissionsControllerTest < ActiveSupport::TestCase
- def setup
- @controller = KeyPermissionsController.new
- @request = ActionController::TestRequest.new
- @response = ActionController::TestResponse.new
- end
-
+class KeyPermissionsControllerTest < ActionController::TestCase
# Replace this with your real tests.
def test_truth
assert true
Modified: branches/rails2/test/functional/license_attributes_controller_test.rb (2808 => 2809)
--- branches/rails2/test/functional/license_attributes_controller_test.rb 2011-11-15 16:21:26 UTC (rev 2808)
+++ branches/rails2/test/functional/license_attributes_controller_test.rb 2011-11-16 01:18:23 UTC (rev 2809)
@@ -1,16 +1,8 @@
require File.dirname(__FILE__) + '/../test_helper'
require 'license_attributes_controller'
-# Re-raise errors caught by the controller.
-class LicenseAttributesController; def rescue_action(e) raise e end; end
+class LicenseAttributesControllerTest < ActionController::TestCase
-class LicenseAttributesControllerTest < ActiveSupport::TestCase
- def setup
- @controller = LicenseAttributesController.new
- @request = ActionController::TestRequest.new
- @response = ActionController::TestResponse.new
- end
-
# Replace this with your real tests.
def test_truth
assert true
Modified: branches/rails2/test/functional/licenses_controller_test.rb (2808 => 2809)
--- branches/rails2/test/functional/licenses_controller_test.rb 2011-11-15 16:21:26 UTC (rev 2808)
+++ branches/rails2/test/functional/licenses_controller_test.rb 2011-11-16 01:18:23 UTC (rev 2809)
@@ -1,16 +1,8 @@
require File.dirname(__FILE__) + '/../test_helper'
require 'licenses_controller'
-# Re-raise errors caught by the controller.
-class LicensesController; def rescue_action(e) raise e end; end
+class LicensesControllerTest < ActionController::TestCase
-class LicensesControllerTest < ActiveSupport::TestCase
- def setup
- @controller = LicensesController.new
- @request = ActionController::TestRequest.new
- @response = ActionController::TestResponse.new
- end
-
# Replace this with your real tests.
def test_truth
assert true
Modified: branches/rails2/test/functional/mashup_controller_test.rb (2808 => 2809)
--- branches/rails2/test/functional/mashup_controller_test.rb 2011-11-15 16:21:26 UTC (rev 2808)
+++ branches/rails2/test/functional/mashup_controller_test.rb 2011-11-16 01:18:23 UTC (rev 2809)
@@ -1,16 +1,8 @@
require File.dirname(__FILE__) + '/../test_helper'
require 'mashup_controller'
-# Re-raise errors caught by the controller.
-class MashupController; def rescue_action(e) raise e end; end
+class MashupControllerTest < ActionController::TestCase
-class MashupControllerTest < ActiveSupport::TestCase
- def setup
- @controller = MashupController.new
- @request = ActionController::TestRequest.new
- @response = ActionController::TestResponse.new
- end
-
# Replace this with your real tests.
def test_truth
assert true
Modified: branches/rails2/test/functional/memberships_controller_test.rb (2808 => 2809)
--- branches/rails2/test/functional/memberships_controller_test.rb 2011-11-15 16:21:26 UTC (rev 2808)
+++ branches/rails2/test/functional/memberships_controller_test.rb 2011-11-16 01:18:23 UTC (rev 2809)
@@ -6,18 +6,9 @@
require File.dirname(__FILE__) + '/../test_helper'
require 'memberships_controller'
-# Re-raise errors caught by the controller.
-class MembershipsController; def rescue_action(e) raise e end; end
-
-class MembershipsControllerTest < ActiveSupport::TestCase
+class MembershipsControllerTest < ActionController::TestCase
fixtures :memberships, :users, :networks
- def setup
- @controller = MembershipsController.new
- @request = ActionController::TestRequest.new
- @response = ActionController::TestResponse.new
- end
-
def test_should_get_index
login_as(:john)
get :index, :user_id => users(:john).id
Modified: branches/rails2/test/functional/messages_controller_test.rb (2808 => 2809)
--- branches/rails2/test/functional/messages_controller_test.rb 2011-11-15 16:21:26 UTC (rev 2808)
+++ branches/rails2/test/functional/messages_controller_test.rb 2011-11-16 01:18:23 UTC (rev 2809)
@@ -6,18 +6,9 @@
require File.dirname(__FILE__) + '/../test_helper'
require 'messages_controller'
-# Re-raise errors caught by the controller.
-class MessagesController; def rescue_action(e) raise e end; end
-
-class MessagesControllerTest < ActiveSupport::TestCase
+class MessagesControllerTest < ActionController::TestCase
fixtures :messages, :users
- def setup
- @controller = MessagesController.new
- @request = ActionController::TestRequest.new
- @response = ActionController::TestResponse.new
- end
-
def test_should_get_index
login_as(:john)
get :index
Modified: branches/rails2/test/functional/networks_controller_test.rb (2808 => 2809)
--- branches/rails2/test/functional/networks_controller_test.rb 2011-11-15 16:21:26 UTC (rev 2808)
+++ branches/rails2/test/functional/networks_controller_test.rb 2011-11-16 01:18:23 UTC (rev 2809)
@@ -6,18 +6,9 @@
require File.dirname(__FILE__) + '/../test_helper'
require 'networks_controller'
-# Re-raise errors caught by the controller.
-class NetworksController; def rescue_action(e) raise e end; end
-
-class NetworksControllerTest < ActiveSupport::TestCase
+class NetworksControllerTest < ActionController::TestCase
fixtures :networks, :users, :content_types
- def setup
- @controller = NetworksController.new
- @request = ActionController::TestRequest.new
- @response = ActionController::TestResponse.new
- end
-
def test_should_get_index
get :index
assert_response :success
Modified: branches/rails2/test/functional/openid_controller_test.rb (2808 => 2809)
--- branches/rails2/test/functional/openid_controller_test.rb 2011-11-15 16:21:26 UTC (rev 2808)
+++ branches/rails2/test/functional/openid_controller_test.rb 2011-11-16 01:18:23 UTC (rev 2809)
@@ -1,17 +1,9 @@
require File.dirname(__FILE__) + '/../test_helper'
require 'openid_controller'
-# Re-raise errors caught by the controller.
-class OpenidController; def rescue_action(e) raise e end; end
-
# NOTE: if you get the message 'undefined method `require_gem' for main:Object (NoMethodError)'
# when running these tests, change 'require_gem' to 'gem' in openid_controller
-class OpenidControllerTest < ActiveSupport::TestCase
- def setup
- @controller = OpenidController.new
- @request = ActionController::TestRequest.new
- @response = ActionController::TestResponse.new
- end
+class OpenidControllerTest < ActionController::TestCase
# Replace this with your real tests.
def test_truth
Modified: branches/rails2/test/functional/packs_controller_test.rb (2808 => 2809)
--- branches/rails2/test/functional/packs_controller_test.rb 2011-11-15 16:21:26 UTC (rev 2808)
+++ branches/rails2/test/functional/packs_controller_test.rb 2011-11-16 01:18:23 UTC (rev 2809)
@@ -1,17 +1,10 @@
require File.dirname(__FILE__) + '/../test_helper'
require 'packs_controller'
-# Re-raise errors caught by the controller.
-class PacksController; def rescue_action(e) raise e end; end
-
-class PacksControllerTest < ActiveSupport::TestCase
+class PacksControllerTest < ActionController::TestCase
fixtures :packs, :users, :contributions, :workflows, :blobs, :content_blobs, :policies, :permissions, :networks
def setup
- @controller = PacksController.new
- @request = ActionController::TestRequest.new
- @response = ActionController::TestResponse.new
-
@first_id = packs(:pack_1).id
end
Modified: branches/rails2/test/functional/pictures_controller_test.rb (2808 => 2809)
--- branches/rails2/test/functional/pictures_controller_test.rb 2011-11-15 16:21:26 UTC (rev 2808)
+++ branches/rails2/test/functional/pictures_controller_test.rb 2011-11-16 01:18:23 UTC (rev 2809)
@@ -6,18 +6,9 @@
require File.dirname(__FILE__) + '/../test_helper'
require 'pictures_controller'
-# Re-raise errors caught by the controller.
-class PicturesController; def rescue_action(e) raise e end; end
-
-class PicturesControllerTest < ActiveSupport::TestCase
+class PicturesControllerTest < ActionController::TestCase
fixtures :pictures, :users, :picture_selections, :profiles
- def setup
- @controller = PicturesController.new
- @request = ActionController::TestRequest.new
- @response = ActionController::TestResponse.new
- end
-
def test_should_get_index
login_as(:john)
get :index, :user_id => users(:john).id
Modified: branches/rails2/test/functional/profiles_controller_test.rb (2808 => 2809)
--- branches/rails2/test/functional/profiles_controller_test.rb 2011-11-15 16:21:26 UTC (rev 2808)
+++ branches/rails2/test/functional/profiles_controller_test.rb 2011-11-16 01:18:23 UTC (rev 2809)
@@ -6,18 +6,9 @@
require File.dirname(__FILE__) + '/../test_helper'
require 'profiles_controller'
-# Re-raise errors caught by the controller.
-class ProfilesController; def rescue_action(e) raise e end; end
-
-class ProfilesControllerTest < ActiveSupport::TestCase
+class ProfilesControllerTest < ActionController::TestCase
fixtures :profiles, :users, :pictures, :picture_selections
- def setup
- @controller = ProfilesController.new
- @request = ActionController::TestRequest.new
- @response = ActionController::TestResponse.new
- end
-
def test_should_get_index
get :index
assert_response :success
Modified: branches/rails2/test/functional/reviews_controller_test.rb (2808 => 2809)
--- branches/rails2/test/functional/reviews_controller_test.rb 2011-11-15 16:21:26 UTC (rev 2808)
+++ branches/rails2/test/functional/reviews_controller_test.rb 2011-11-16 01:18:23 UTC (rev 2809)
@@ -1,17 +1,10 @@
require File.dirname(__FILE__) + '/../test_helper'
require 'reviews_controller'
-# Re-raise errors caught by the controller.
-class ReviewsController; def rescue_action(e) raise e end; end
-
-class ReviewsControllerTest < ActiveSupport::TestCase
+class ReviewsControllerTest < ActionController::TestCase
fixtures :reviews, :users, :workflows, :workflow_versions, :contributions, :blobs, :packs, :policies, :permissions, :content_types
def setup
- @controller = ReviewsController.new
- @request = ActionController::TestRequest.new
- @response = ActionController::TestResponse.new
-
@first_id = reviews(:dilbert_review).id
end
Modified: branches/rails2/test/functional/runners_controller_test.rb (2808 => 2809)
--- branches/rails2/test/functional/runners_controller_test.rb 2011-11-15 16:21:26 UTC (rev 2808)
+++ branches/rails2/test/functional/runners_controller_test.rb 2011-11-16 01:18:23 UTC (rev 2809)
@@ -1,17 +1,10 @@
require File.dirname(__FILE__) + '/../test_helper'
require 'runners_controller'
-# Re-raise errors caught by the controller.
-class RunnersController; def rescue_action(e) raise e end; end
-
-class RunnersControllerTest < ActiveSupport::TestCase
+class RunnersControllerTest < ActionController::TestCase
fixtures :taverna_enactors, :users
def setup
- @controller = RunnersController.new
- @request = ActionController::TestRequest.new
- @response = ActionController::TestResponse.new
-
@first_id = taverna_enactors(:taverna_enactor_1).id
end
Modified: branches/rails2/test/functional/search_controller_test.rb (2808 => 2809)
--- branches/rails2/test/functional/search_controller_test.rb 2011-11-15 16:21:26 UTC (rev 2808)
+++ branches/rails2/test/functional/search_controller_test.rb 2011-11-16 01:18:23 UTC (rev 2809)
@@ -1,16 +1,8 @@
require File.dirname(__FILE__) + '/../test_helper'
require 'search_controller'
-# Re-raise errors caught by the controller.
-class SearchController; def rescue_action(e) raise e end; end
+class SearchControllerTest < ActionController::TestCase
-class SearchControllerTest < ActiveSupport::TestCase
- def setup
- @controller = SearchController.new
- @request = ActionController::TestRequest.new
- @response = ActionController::TestResponse.new
- end
-
# Replace this with your real tests.
def test_truth
assert true
Modified: branches/rails2/test/functional/sessions_controller_test.rb (2808 => 2809)
--- branches/rails2/test/functional/sessions_controller_test.rb 2011-11-15 16:21:26 UTC (rev 2808)
+++ branches/rails2/test/functional/sessions_controller_test.rb 2011-11-16 01:18:23 UTC (rev 2809)
@@ -6,16 +6,8 @@
require File.dirname(__FILE__) + '/../test_helper'
require 'sessions_controller'
-# Re-raise errors caught by the controller.
-class SessionsController; def rescue_action(e) raise e end; end
+class SessionsControllerTest < ActionController::TestCase
-class SessionsControllerTest < ActiveSupport::TestCase
- def setup
- @controller = SessionsController.new
- @request = ActionController::TestRequest.new
- @response = ActionController::TestResponse.new
- end
-
# Replace this with your real tests.
def test_truth
assert true
Modified: branches/rails2/test/functional/status_controller_test.rb (2808 => 2809)
--- branches/rails2/test/functional/status_controller_test.rb 2011-11-15 16:21:26 UTC (rev 2808)
+++ branches/rails2/test/functional/status_controller_test.rb 2011-11-16 01:18:23 UTC (rev 2809)
@@ -1,16 +1,8 @@
require File.dirname(__FILE__) + '/../test_helper'
require 'status_controller'
-# Re-raise errors caught by the controller.
-class StatusController; def rescue_action(e) raise e end; end
+class StatusControllerTest < ActionController::TestCase
-class StatusControllerTest < ActiveSupport::TestCase
- def setup
- @controller = StatusController.new
- @request = ActionController::TestRequest.new
- @response = ActionController::TestResponse.new
- end
-
# Replace this with your real tests.
def test_truth
assert true
Modified: branches/rails2/test/functional/tags_controller_test.rb (2808 => 2809)
--- branches/rails2/test/functional/tags_controller_test.rb 2011-11-15 16:21:26 UTC (rev 2808)
+++ branches/rails2/test/functional/tags_controller_test.rb 2011-11-16 01:18:23 UTC (rev 2809)
@@ -6,16 +6,8 @@
require File.dirname(__FILE__) + '/../test_helper'
require 'tags_controller'
-# Re-raise errors caught by the controller.
-class TagsController; def rescue_action(e) raise e end; end
+class TagsControllerTest < ActionController::TestCase
-class TagsControllerTest < ActiveSupport::TestCase
- def setup
- @controller = TagsController.new
- @request = ActionController::TestRequest.new
- @response = ActionController::TestResponse.new
- end
-
# Replace this with your real tests.
def test_truth
assert true
Modified: branches/rails2/test/functional/users_controller_test.rb (2808 => 2809)
--- branches/rails2/test/functional/users_controller_test.rb 2011-11-15 16:21:26 UTC (rev 2808)
+++ branches/rails2/test/functional/users_controller_test.rb 2011-11-16 01:18:23 UTC (rev 2809)
@@ -6,18 +6,9 @@
require File.dirname(__FILE__) + '/../test_helper'
require 'users_controller'
-# Re-raise errors caught by the controller.
-class UsersController; def rescue_action(e) raise e end; end
-
-class UsersControllerTest < ActiveSupport::TestCase
+class UsersControllerTest < ActionController::TestCase
fixtures :users, :profiles
- def setup
- @controller = UsersController.new
- @request = ActionController::TestRequest.new
- @response = ActionController::TestResponse.new
- end
-
def test_should_get_index
get :index
assert_response :success
Modified: branches/rails2/test/functional/workflows_controller_test.rb (2808 => 2809)
--- branches/rails2/test/functional/workflows_controller_test.rb 2011-11-15 16:21:26 UTC (rev 2808)
+++ branches/rails2/test/functional/workflows_controller_test.rb 2011-11-16 01:18:23 UTC (rev 2809)
@@ -6,18 +6,9 @@
require File.dirname(__FILE__) + '/../test_helper'
require 'workflows_controller'
-# Re-raise errors caught by the controller.
-class WorkflowsController; def rescue_action(e) raise e end; end
-
-class WorkflowsControllerTest < ActiveSupport::TestCase
+class WorkflowsControllerTest < ActionController::TestCase
fixtures :workflows, :users, :contributions, :workflow_versions, :content_blobs, :blobs, :packs, :policies, :permissions, :networks, :content_types
- def setup
- @controller = WorkflowsController.new
- @request = ActionController::TestRequest.new
- @response = ActionController::TestResponse.new
- end
-
def test_should_get_index
get :index
assert_response :success