diff options
| author | Stefan Sprenger <stefan.sprenger@dkd.de> | 2011-05-26 12:06:17 +0200 |
|---|---|---|
| committer | Stefan Sprenger <stefan.sprenger@dkd.de> | 2011-05-26 12:06:17 +0200 |
| commit | 4686ace999467935e659260d1a23c6617bc51986 (patch) | |
| tree | fba632b402a53c672ac19a74356a1d1fb9f42a6b /railties | |
| parent | 11862932ecfe528e7bc12c983e3b85b65350c24d (diff) | |
| download | rails-4686ace999467935e659260d1a23c6617bc51986.tar.gz rails-4686ace999467935e659260d1a23c6617bc51986.tar.bz2 rails-4686ace999467935e659260d1a23c6617bc51986.zip | |
Use global namespace Rails
Diffstat (limited to 'railties')
| -rw-r--r-- | railties/lib/rails/generators/rails/plugin_new/templates/lib/%name%/engine.rb | 2 | ||||
| -rw-r--r-- | railties/test/generators/plugin_new_generator_test.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/railties/lib/rails/generators/rails/plugin_new/templates/lib/%name%/engine.rb b/railties/lib/rails/generators/rails/plugin_new/templates/lib/%name%/engine.rb index aa8ea77bae..967668fe66 100644 --- a/railties/lib/rails/generators/rails/plugin_new/templates/lib/%name%/engine.rb +++ b/railties/lib/rails/generators/rails/plugin_new/templates/lib/%name%/engine.rb @@ -1,5 +1,5 @@ module <%= camelized %> - class Engine < Rails::Engine + class Engine < ::Rails::Engine <% if mountable? -%> isolate_namespace <%= camelized %> <% end -%> diff --git a/railties/test/generators/plugin_new_generator_test.rb b/railties/test/generators/plugin_new_generator_test.rb index b93e33f61a..528c73ffaf 100644 --- a/railties/test/generators/plugin_new_generator_test.rb +++ b/railties/test/generators/plugin_new_generator_test.rb @@ -148,7 +148,7 @@ class PluginNewGeneratorTest < Rails::Generators::TestCase assert_file "app/views" assert_file "app/helpers" assert_file "config/routes.rb", /Rails.application.routes.draw do/ - assert_file "lib/bukkits/engine.rb", /module Bukkits\n class Engine < Rails::Engine\n end\nend/ + assert_file "lib/bukkits/engine.rb", /module Bukkits\n class Engine < ::Rails::Engine\n end\nend/ assert_file "lib/bukkits.rb", /require "bukkits\/engine"/ end |