Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Updated tests to use scope(:module => :engine_name) instead of namesp…

…ace and updated mounted engine tests to actually use the namespacing
  • Loading branch information...
commit 16dcaf83681d9d84c26cfab23249a6f069ca5c08 1 parent b1c66f0
Piotr Sarnacki drogus authored
2  railties/test/railties/engine_test.rb
View
@@ -390,7 +390,7 @@ def to_param
@plugin.write "config/routes.rb", <<-RUBY
Bukkits::Engine.routes.draw do
- namespace(:bukkits, :path => nil, :shallow_path => nil, :as => nil) do
+ scope(:module => :bukkits) do
match "/foo" => "foo#index", :as => "foo"
match "/foo/show" => "foo#show"
match "/from_app" => "foo#from_app"
49 railties/test/railties/mounted_engine_test.rb
View
@@ -19,7 +19,7 @@ def setup
match "/engine_route_in_view" => "application_generating#engine_route_in_view"
match "/url_for_engine_route" => "application_generating#url_for_engine_route"
scope "/:user", :user => "anonymous" do
- mount Blog::Engine => "/blog", :as => "blog_engine"
+ mount Blog::Engine => "/blog"
end
root :to => 'main#index'
end
@@ -28,34 +28,39 @@ def setup
@plugin.write "lib/blog.rb", <<-RUBY
module Blog
class Engine < ::Rails::Engine
+ namespace(Blog)
end
end
RUBY
@plugin.write "config/routes.rb", <<-RUBY
Blog::Engine.routes.draw do
- resources :posts do
- get :generate_application_route
- get :application_route_in_view
+ scope(:module => :blog) do
+ resources :posts do
+ get :generate_application_route
+ get :application_route_in_view
+ end
end
end
RUBY
- @plugin.write "app/controllers/posts_controller.rb", <<-RUBY
- class PostsController < ActionController::Base
- def index
- render :text => blog_engine.post_path(1)
- end
-
- def generate_application_route
- path = app.url_for(:controller => "main",
- :action => "index",
- :only_path => true)
- render :text => path
- end
-
- def application_route_in_view
- render :inline => "<%= app.root_path %>"
+ @plugin.write "app/controllers/blog/posts_controller.rb", <<-RUBY
+ module Blog
+ class PostsController < ActionController::Base
+ def index
+ render :text => blog.post_path(1)
+ end
+
+ def generate_application_route
+ path = app.url_for(:controller => "/main",
+ :action => "index",
+ :only_path => true)
+ render :text => path
+ end
+
+ def application_route_in_view
+ render :inline => "<%= app.root_path %>"
+ end
end
end
RUBY
@@ -63,15 +68,15 @@ def application_route_in_view
app_file "app/controllers/application_generating_controller.rb", <<-RUBY
class ApplicationGeneratingController < ActionController::Base
def engine_route
- render :text => blog_engine.posts_path
+ render :text => blog.posts_path
end
def engine_route_in_view
- render :inline => "<%= blog_engine.posts_path %>"
+ render :inline => "<%= blog.posts_path %>"
end
def url_for_engine_route
- render :text => blog_engine.url_for(:controller => "posts", :action => "index", :user => "john", :only_path => true)
+ render :text => blog.url_for(:controller => "blog/posts", :action => "index", :user => "john", :only_path => true)
end
end
RUBY
Please sign in to comment.
Something went wrong with that request. Please try again.