diff options
| author | Pratik Naik <pratiknaik@gmail.com> | 2009-09-30 22:27:02 +0100 |
|---|---|---|
| committer | Pratik Naik <pratiknaik@gmail.com> | 2009-09-30 22:27:02 +0100 |
| commit | dd2779e1b83b4d867d47dd286ec0c919f5df12a9 (patch) | |
| tree | 6e52ea0a329c24429f4d1d41b065e082f0ed6baa /actionpack/lib/action_controller/deprecated | |
| parent | 329b14aa8fdd291a00d17ba12c2e0ab4c3a157cc (diff) | |
| parent | 420004e030e96f2ace6e27fd622c90ee9e986677 (diff) | |
| download | rails-dd2779e1b83b4d867d47dd286ec0c919f5df12a9.tar.gz rails-dd2779e1b83b4d867d47dd286ec0c919f5df12a9.tar.bz2 rails-dd2779e1b83b4d867d47dd286ec0c919f5df12a9.zip | |
Merge commit 'mainstream/master'
Diffstat (limited to 'actionpack/lib/action_controller/deprecated')
| -rw-r--r-- | actionpack/lib/action_controller/deprecated/integration_test.rb | 2 | ||||
| -rw-r--r-- | actionpack/lib/action_controller/deprecated/performance_test.rb | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/actionpack/lib/action_controller/deprecated/integration_test.rb b/actionpack/lib/action_controller/deprecated/integration_test.rb new file mode 100644 index 0000000000..86336b6bc4 --- /dev/null +++ b/actionpack/lib/action_controller/deprecated/integration_test.rb @@ -0,0 +1,2 @@ +ActionController::Integration = ActionDispatch::Integration +ActionController::IntegrationTest = ActionDispatch::IntegrationTest diff --git a/actionpack/lib/action_controller/deprecated/performance_test.rb b/actionpack/lib/action_controller/deprecated/performance_test.rb new file mode 100644 index 0000000000..fcf47d31a7 --- /dev/null +++ b/actionpack/lib/action_controller/deprecated/performance_test.rb @@ -0,0 +1 @@ +ActionController::PerformanceTest = ActionDispatch::PerformanceTest |