From b61f6f59805eec4f5bb873a85910c9fe00e839a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Valim?= Date: Tue, 23 Mar 2010 13:40:19 +0100 Subject: Load generators from both lib/rails/generators and lib/generators. Using the former since it's less obstrusive. --- .../rails/app/templates/test/fixtures/.empty_directory | 0 .../rails/app/templates/test/functional/.empty_directory | 0 .../rails/app/templates/test/integration/.empty_directory | 0 .../rails/app/templates/test/performance/browsing_test.rb | 9 --------- .../lib/generators/rails/app/templates/test/test_helper.rb | 13 ------------- .../rails/app/templates/test/unit/.empty_directory | 0 6 files changed, 22 deletions(-) delete mode 100644 railties/lib/generators/rails/app/templates/test/fixtures/.empty_directory delete mode 100644 railties/lib/generators/rails/app/templates/test/functional/.empty_directory delete mode 100644 railties/lib/generators/rails/app/templates/test/integration/.empty_directory delete mode 100644 railties/lib/generators/rails/app/templates/test/performance/browsing_test.rb delete mode 100644 railties/lib/generators/rails/app/templates/test/test_helper.rb delete mode 100644 railties/lib/generators/rails/app/templates/test/unit/.empty_directory (limited to 'railties/lib/generators/rails/app/templates/test') diff --git a/railties/lib/generators/rails/app/templates/test/fixtures/.empty_directory b/railties/lib/generators/rails/app/templates/test/fixtures/.empty_directory deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/railties/lib/generators/rails/app/templates/test/functional/.empty_directory b/railties/lib/generators/rails/app/templates/test/functional/.empty_directory deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/railties/lib/generators/rails/app/templates/test/integration/.empty_directory b/railties/lib/generators/rails/app/templates/test/integration/.empty_directory deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/railties/lib/generators/rails/app/templates/test/performance/browsing_test.rb b/railties/lib/generators/rails/app/templates/test/performance/browsing_test.rb deleted file mode 100644 index a3dc38d9e4..0000000000 --- a/railties/lib/generators/rails/app/templates/test/performance/browsing_test.rb +++ /dev/null @@ -1,9 +0,0 @@ -require 'test_helper' -require 'rails/performance_test_help' - -# Profiling results for each test method are written to tmp/performance. -class BrowsingTest < ActionController::PerformanceTest - def test_homepage - get '/' - end -end diff --git a/railties/lib/generators/rails/app/templates/test/test_helper.rb b/railties/lib/generators/rails/app/templates/test/test_helper.rb deleted file mode 100644 index 8bf1192ffe..0000000000 --- a/railties/lib/generators/rails/app/templates/test/test_helper.rb +++ /dev/null @@ -1,13 +0,0 @@ -ENV["RAILS_ENV"] = "test" -require File.expand_path('../../config/environment', __FILE__) -require 'rails/test_help' - -class ActiveSupport::TestCase - # Setup all fixtures in test/fixtures/*.(yml|csv) for all tests in alphabetical order. - # - # Note: You'll currently still have to declare fixtures explicitly in integration tests - # -- they do not yet inherit this setting - fixtures :all - - # Add more helper methods to be used by all tests here... -end diff --git a/railties/lib/generators/rails/app/templates/test/unit/.empty_directory b/railties/lib/generators/rails/app/templates/test/unit/.empty_directory deleted file mode 100644 index e69de29bb2..0000000000 -- cgit v1.2.3