rails_best_practices 1.9.0 → 1.9.1

data/spec/rails_best_practices/reviews/replace_complex_creation_with_factory_method_review_spec.rb

@@ -1,71 +1,72 @@
 require 'spec_helper'
 
-describe RailsBestPractices::Reviews::ReplaceComplexCreationWithFactoryMethodReview do
-  let(:runner) { RailsBestPractices::Core::Runner.new(:reviews => RailsBestPractices::Reviews::ReplaceComplexCreationWithFactoryMethodReview.new) }
+module RailsBestPractices
+  module Reviews
+    describe ReplaceComplexCreationWithFactoryMethodReview do
+      let(:runner) { Core::Runner.new(:reviews => ReplaceComplexCreationWithFactoryMethodReview.new) }
 
-  it "should replace complex creation with factory method" do
-    content = <<-EOF
-    class InvoiceController < ApplicationController
+      it "should replace complex creation with factory method" do
+        content = <<-EOF
+        class InvoiceController < ApplicationController
+          def create
+            @invoice = Invoice.new(params[:invoice])
+            @invoice.address = current_user.address
+            @invoice.phone = current_user.phone
+            @invoice.vip = (@invoice.amount > 1000)
 
-      def create
-        @invoice = Invoice.new(params[:invoice])
-        @invoice.address = current_user.address
-        @invoice.phone = current_user.phone
-        @invoice.vip = (@invoice.amount > 1000)
+            if Time.now.day > 15
+              @invoice.deliver_time = Time.now + 2.month
+            else
+              @invoice.deliver_time = Time.now + 1.month
+            end
 
-        if Time.now.day > 15
-          @invoice.deliver_time = Time.now + 2.month
-        else
-          @invoice.deliver_time = Time.now + 1.month
+            @invoice.save
+          end
         end
-
-        @invoice.save
+        EOF
+        runner.review('app/controllers/invoices_controller.rb', content)
+        runner.should have(1).errors
+        runner.errors[0].to_s.should == "app/controllers/invoices_controller.rb:3 - replace complex creation with factory method (@invoice attribute_assignment_count > 2)"
       end
-    end
-    EOF
-    runner.review('app/controllers/invoices_controller.rb', content)
-    runner.should have(1).errors
-    runner.errors[0].to_s.should == "app/controllers/invoices_controller.rb:3 - replace complex creation with factory method (@invoice attribute_assignment_count > 2)"
-  end
-
-  it "should not replace complex creation with factory method with simple creation" do
-    content = <<-EOF
-    class InvoiceController < ApplicationController
 
-      def create
-        @invoice = Invoice.new(params[:invoice])
-        @invoice.address = current_user.address
-        @invoice.phone = current_user.phone
-        @invoice.save
+      it "should not replace complex creation with factory method with simple creation" do
+        content = <<-EOF
+        class InvoiceController < ApplicationController
+          def create
+            @invoice = Invoice.new(params[:invoice])
+            @invoice.address = current_user.address
+            @invoice.phone = current_user.phone
+            @invoice.save
+          end
+        end
+        EOF
+        runner.review('app/controllers/invoices_controller.rb', content)
+        runner.should have(0).errors
       end
-    end
-    EOF
-    runner.review('app/controllers/invoices_controller.rb', content)
-    runner.should have(0).errors
-  end
 
-  it "should not replace complex creation with factory method when attrasgn_count is 5" do
-    content = <<-EOF
-    class InvoiceController < ApplicationController
+      it "should not replace complex creation with factory method when attrasgn_count is 5" do
+        content = <<-EOF
+        class InvoiceController < ApplicationController
+          def create
+            @invoice = Invoice.new(params[:invoice])
+            @invoice.address = current_user.address
+            @invoice.phone = current_user.phone
+            @invoice.vip = (@invoice.amount > 1000)
 
-      def create
-        @invoice = Invoice.new(params[:invoice])
-        @invoice.address = current_user.address
-        @invoice.phone = current_user.phone
-        @invoice.vip = (@invoice.amount > 1000)
+            if Time.now.day > 15
+              @invoice.deliver_time = Time.now + 2.month
+            else
+              @invoice.deliver_time = Time.now + 1.month
+            end
 
-        if Time.now.day > 15
-          @invoice.deliver_time = Time.now + 2.month
-        else
-          @invoice.deliver_time = Time.now + 1.month
+            @invoice.save
+          end
         end
-
-        @invoice.save
+        EOF
+        runner = Core::Runner.new(:reviews => ReplaceComplexCreationWithFactoryMethodReview.new('attribute_assignment_count' => 5))
+        runner.review('app/controllers/invoices_controller.rb', content)
+        runner.should have(0).errors
       end
     end
-    EOF
-    runner = RailsBestPractices::Core::Runner.new(:reviews => RailsBestPractices::Reviews::ReplaceComplexCreationWithFactoryMethodReview.new('attribute_assignment_count' => 5))
-    runner.review('app/controllers/invoices_controller.rb', content)
-    runner.should have(0).errors
   end
 end

data/spec/rails_best_practices/reviews/replace_instance_variable_with_local_variable_review_spec.rb

@@ -1,40 +1,44 @@
 require 'spec_helper'
 
-describe RailsBestPractices::Reviews::ReplaceInstanceVariableWithLocalVariableReview do
-  let(:runner) { RailsBestPractices::Core::Runner.new(:reviews => RailsBestPractices::Reviews::ReplaceInstanceVariableWithLocalVariableReview.new) }
+module RailsBestPractices
+  module Reviews
+    describe ReplaceInstanceVariableWithLocalVariableReview do
+      let(:runner) { Core::Runner.new(:reviews => ReplaceInstanceVariableWithLocalVariableReview.new) }
 
-  it "should replace instance variable with local varialbe" do
-    content = <<-EOF
-    <%= @post.title %>
-    EOF
-    runner.review('app/views/posts/_post.html.erb', content)
-    runner.should have(1).errors
-    runner.errors[0].to_s.should == "app/views/posts/_post.html.erb:1 - replace instance variable with local variable"
-  end
+      it "should replace instance variable with local varialbe" do
+        content = <<-EOF
+        <%= @post.title %>
+        EOF
+        runner.review('app/views/posts/_post.html.erb', content)
+        runner.should have(1).errors
+        runner.errors[0].to_s.should == "app/views/posts/_post.html.erb:1 - replace instance variable with local variable"
+      end
 
-  it "should replace instance variable with local varialbe in haml file" do
-    content = <<-EOF
+      it "should replace instance variable with local varialbe in haml file" do
+        content = <<-EOF
 = @post.title
-    EOF
-    runner.review('app/views/posts/_post.html.haml', content)
-    runner.should have(1).errors
-    runner.errors[0].to_s.should == "app/views/posts/_post.html.haml:1 - replace instance variable with local variable"
-  end
+        EOF
+        runner.review('app/views/posts/_post.html.haml', content)
+        runner.should have(1).errors
+        runner.errors[0].to_s.should == "app/views/posts/_post.html.haml:1 - replace instance variable with local variable"
+      end
 
-  it "should replace instance variable with local varialbe in slim file" do
-    content = <<-EOF
+      it "should replace instance variable with local varialbe in slim file" do
+        content = <<-EOF
 = @post.title
-    EOF
-    runner.review('app/views/posts/_post.html.slim', content)
-    runner.should have(1).errors
-    runner.errors[0].to_s.should == "app/views/posts/_post.html.slim:1 - replace instance variable with local variable"
-  end
+        EOF
+        runner.review('app/views/posts/_post.html.slim', content)
+        runner.should have(1).errors
+        runner.errors[0].to_s.should == "app/views/posts/_post.html.slim:1 - replace instance variable with local variable"
+      end
 
-  it "should not replace instance variable with local varialbe" do
-    content = <<-EOF
-    <%= post.title %>
-    EOF
-    runner.review('app/views/posts/_post.html.erb', content)
-    runner.should have(0).errors
+      it "should not replace instance variable with local varialbe" do
+        content = <<-EOF
+        <%= post.title %>
+        EOF
+        runner.review('app/views/posts/_post.html.erb', content)
+        runner.should have(0).errors
+      end
+    end
   end
 end

data/spec/rails_best_practices/reviews/restrict_auto_generated_routes_review_spec.rb

@@ -1,98 +1,14 @@
 require 'spec_helper'
 
-describe RailsBestPractices::Reviews::RestrictAutoGeneratedRoutesReview do
-  let(:runner) {
-    RailsBestPractices::Core::Runner.new(
-      :prepares => RailsBestPractices::Prepares::ControllerPrepare.new,
-      :reviews => RailsBestPractices::Reviews::RestrictAutoGeneratedRoutesReview.new
-    )
-  }
+module RailsBestPractices
+  module Reviews
+    describe RestrictAutoGeneratedRoutesReview do
+      let(:runner) { Core::Runner.new(:prepares => Prepares::ControllerPrepare.new, :reviews => RestrictAutoGeneratedRoutesReview.new) }
 
-  describe "resources" do
-    before :each do
-      content =<<-EOF
-      class PostsController < ApplicationController
-        def show; end
-        def new; end
-        def create; end
-        def edit; end
-        def update; end
-        def destroy; end
-      end
-      EOF
-      runner.prepare('app/controllers/posts_controller.rb', content)
-    end
-
-    describe "rails2" do
-      it "should restrict auto-generated routes" do
-        content =<<-EOF
-        ActionController::Routing::Routes.draw do |map|
-          map.resources :posts
-        end
-        EOF
-        runner.review('config/routes.rb', content)
-        runner.should have(1).errors
-        runner.errors[0].to_s.should == "config/routes.rb:2 - restrict auto-generated routes (:only => [:show, :new, :create, :edit, :update, :destroy])"
-      end
-
-      it "should not restrict auto-generated routes with only" do
-        content =<<-EOF
-        ActionController::Routing::Routes.draw do |map|
-          map.resources :posts, :only => [:show, :new, :create, :edit, :update, :destroy]
-        end
-        EOF
-        runner.review('config/routes.rb', content)
-        runner.should have(0).errors
-      end
-
-      it "should not restrict auto-generated routes with except" do
-        content =<<-EOF
-        ActionController::Routing::Routes.draw do |map|
-          map.resources :posts, :except => :index
-        end
-        EOF
-        runner.review('config/routes.rb', content)
-        runner.should have(0).errors
-      end
-
-      it "should not restrict auto-generated routes with :only => :none" do
-        content =<<-EOF
-        ActionController::Routing::Routes.draw do |map|
-          map.resources :posts, :only => :none
-        end
-        EOF
-        runner.review('config/routes.rb', content)
-        runner.should have(0).errors
-      end
-
-      it "should not restrict auto-generated routes with :except => :all" do
-        content =<<-EOF
-        ActionController::Routing::Routes.draw do |map|
-          map.resources :posts, :except => :all
-        end
-        EOF
-        runner.review('config/routes.rb', content)
-        runner.should have(0).errors
-      end
-
-      describe "specify a controller" do
-        it "should restrict auto-generated routes" do
-          content =<<-EOF
-          ActionController::Routing::Routes.draw do |map|
-            map.resources :articles, :controller => "posts"
-          end
-          EOF
-          runner.review('config/routes.rb', content)
-          runner.should have(1).errors
-          runner.errors[0].to_s.should == "config/routes.rb:2 - restrict auto-generated routes (:only => [:show, :new, :create, :edit, :update, :destroy])"
-        end
-      end
-
-      describe "nested routes" do
+      describe "resources" do
         before :each do
           content =<<-EOF
-          class CommentsController < ApplicationController
-            def index; end
+          class PostsController < ApplicationController
             def show; end
             def new; end
             def create; end
@@ -101,253 +17,336 @@ describe RailsBestPractices::Reviews::RestrictAutoGeneratedRoutesReview do
             def destroy; end
           end
           EOF
-          runner.prepare('app/controllers/comments_controller.rb', content)
+          runner.prepare('app/controllers/posts_controller.rb', content)
         end
 
-        it "should restrict auto-generated routes" do
-          content =<<-EOF
-          ActionController::Routing::Routes.draw do |map|
-            map.resources :posts do |post|
-              post.resources :comments
+        describe "rails2" do
+          it "should restrict auto-generated routes" do
+            content =<<-EOF
+            ActionController::Routing::Routes.draw do |map|
+              map.resources :posts
             end
+            EOF
+            runner.review('config/routes.rb', content)
+            runner.should have(1).errors
+            runner.errors[0].to_s.should == "config/routes.rb:2 - restrict auto-generated routes (:only => [:show, :new, :create, :edit, :update, :destroy])"
           end
-          EOF
-          runner.review('config/routes.rb', content)
-          runner.should have(1).errors
-          runner.errors[0].to_s.should == "config/routes.rb:2 - restrict auto-generated routes (:only => [:show, :new, :create, :edit, :update, :destroy])"
-        end
 
-        it "should not restrict auto-generated routes with only" do
-          content =<<-EOF
-          ActionController::Routing::Routes.draw do |map|
-            map.resources :posts, :only => [:show, :new, :create, :edit, :update, :destroy] do |post|
-              post.resources :comments
+          it "should not restrict auto-generated routes with only" do
+            content =<<-EOF
+            ActionController::Routing::Routes.draw do |map|
+              map.resources :posts, :only => [:show, :new, :create, :edit, :update, :destroy]
             end
+            EOF
+            runner.review('config/routes.rb', content)
+            runner.should have(0).errors
           end
-          EOF
-          runner.review('config/routes.rb', content)
-          runner.should have(0).errors
-        end
 
-        it "should not restrict auto-generated routes with except" do
-          content =<<-EOF
-          ActionController::Routing::Routes.draw do |map|
-            map.resources :posts, :except => :index do |post|
-              post.resources :comments
+          it "should not restrict auto-generated routes with except" do
+            content =<<-EOF
+            ActionController::Routing::Routes.draw do |map|
+              map.resources :posts, :except => :index
             end
+            EOF
+            runner.review('config/routes.rb', content)
+            runner.should have(0).errors
           end
-          EOF
-          runner.review('config/routes.rb', content)
-          runner.should have(0).errors
-        end
-      end
-    end
 
-    describe "rails3" do
-      it "should restrict auto-generated routes" do
-        content =<<-EOF
-        RailsBestPracticesCom::Application.routes.draw do
-          resources :posts
-        end
-        EOF
-        runner.review('config/routes.rb', content)
-        runner.should have(1).errors
-        runner.errors[0].to_s.should == "config/routes.rb:2 - restrict auto-generated routes (:only => [:show, :new, :create, :edit, :update, :destroy])"
-      end
+          it "should not restrict auto-generated routes with :only => :none" do
+            content =<<-EOF
+            ActionController::Routing::Routes.draw do |map|
+              map.resources :posts, :only => :none
+            end
+            EOF
+            runner.review('config/routes.rb', content)
+            runner.should have(0).errors
+          end
 
-      it "should not restrict auto-generated routes with only" do
-        content =<<-EOF
-        RailsBestPracticesCom::Application.routes.draw do
-          resources :posts, :only => [:show, :new, :create, :edit, :update, :destroy]
-        end
-        EOF
-        runner.review('config/routes.rb', content)
-        runner.should have(0).errors
-      end
+          it "should not restrict auto-generated routes with :except => :all" do
+            content =<<-EOF
+            ActionController::Routing::Routes.draw do |map|
+              map.resources :posts, :except => :all
+            end
+            EOF
+            runner.review('config/routes.rb', content)
+            runner.should have(0).errors
+          end
 
-      it "should not restrict auto-generated routes with except" do
-        content =<<-EOF
-        RailsBestPracticesCom::Application.routes.draw do
-          resources :posts, :except => :index
-        end
-        EOF
-        runner.review('config/routes.rb', content)
-        runner.should have(0).errors
-      end
+          describe "specify a controller" do
+            it "should restrict auto-generated routes" do
+              content =<<-EOF
+              ActionController::Routing::Routes.draw do |map|
+                map.resources :articles, :controller => "posts"
+              end
+              EOF
+              runner.review('config/routes.rb', content)
+              runner.should have(1).errors
+              runner.errors[0].to_s.should == "config/routes.rb:2 - restrict auto-generated routes (:only => [:show, :new, :create, :edit, :update, :destroy])"
+            end
+          end
 
-      describe "specify a controller" do
-        it "should restrict auto-generated routes" do
-          content =<<-EOF
-          RailsBestPracticesCom::Application.routes.draw do
-            resources :articles, :controller => "posts"
+          describe "nested routes" do
+            before :each do
+              content =<<-EOF
+              class CommentsController < ApplicationController
+                def index; end
+                def show; end
+                def new; end
+                def create; end
+                def edit; end
+                def update; end
+                def destroy; end
+              end
+              EOF
+              runner.prepare('app/controllers/comments_controller.rb', content)
+            end
+
+            it "should restrict auto-generated routes" do
+              content =<<-EOF
+              ActionController::Routing::Routes.draw do |map|
+                map.resources :posts do |post|
+                  post.resources :comments
+                end
+              end
+              EOF
+              runner.review('config/routes.rb', content)
+              runner.should have(1).errors
+              runner.errors[0].to_s.should == "config/routes.rb:2 - restrict auto-generated routes (:only => [:show, :new, :create, :edit, :update, :destroy])"
+            end
+
+            it "should not restrict auto-generated routes with only" do
+              content =<<-EOF
+              ActionController::Routing::Routes.draw do |map|
+                map.resources :posts, :only => [:show, :new, :create, :edit, :update, :destroy] do |post|
+                  post.resources :comments
+                end
+              end
+              EOF
+              runner.review('config/routes.rb', content)
+              runner.should have(0).errors
+            end
+
+            it "should not restrict auto-generated routes with except" do
+              content =<<-EOF
+              ActionController::Routing::Routes.draw do |map|
+                map.resources :posts, :except => :index do |post|
+                  post.resources :comments
+                end
+              end
+              EOF
+              runner.review('config/routes.rb', content)
+              runner.should have(0).errors
+            end
           end
-          EOF
-          runner.review('config/routes.rb', content)
-          runner.should have(1).errors
-          runner.errors[0].to_s.should == "config/routes.rb:2 - restrict auto-generated routes (:only => [:show, :new, :create, :edit, :update, :destroy])"
         end
-      end
 
-      describe "namespace" do
-        it "should restrict auto-generated routes" do
-          content =<<-EOF
-          class Admin::CommentsController < ApplicationController
-            def show; end
-            def new; end
-            def create; end
-            def edit; end
-            def update; end
-            def destroy; end
+        describe "rails3" do
+          it "should restrict auto-generated routes" do
+            content =<<-EOF
+            RailsBestPracticesCom::Application.routes.draw do
+              resources :posts
+            end
+            EOF
+            runner.review('config/routes.rb', content)
+            runner.should have(1).errors
+            runner.errors[0].to_s.should == "config/routes.rb:2 - restrict auto-generated routes (:only => [:show, :new, :create, :edit, :update, :destroy])"
           end
-          EOF
-          runner.prepare('app/controllers/admin/comments_controller.rb', content)
 
-          content =<<-EOF
-          RailsBestPracticesCom::Application.routes.draw do
-            namespace :admin do
-              resources :comments
+          it "should not restrict auto-generated routes with only" do
+            content =<<-EOF
+            RailsBestPracticesCom::Application.routes.draw do
+              resources :posts, :only => [:show, :new, :create, :edit, :update, :destroy]
+            end
+            EOF
+            runner.review('config/routes.rb', content)
+            runner.should have(0).errors
+          end
+
+          it "should not restrict auto-generated routes with except" do
+            content =<<-EOF
+            RailsBestPracticesCom::Application.routes.draw do
+              resources :posts, :except => :index
+            end
+            EOF
+            runner.review('config/routes.rb', content)
+            runner.should have(0).errors
+          end
+
+          describe "specify a controller" do
+            it "should restrict auto-generated routes" do
+              content =<<-EOF
+              RailsBestPracticesCom::Application.routes.draw do
+                resources :articles, :controller => "posts"
+              end
+              EOF
+              runner.review('config/routes.rb', content)
+              runner.should have(1).errors
+              runner.errors[0].to_s.should == "config/routes.rb:2 - restrict auto-generated routes (:only => [:show, :new, :create, :edit, :update, :destroy])"
+            end
+          end
+
+          describe "namespace" do
+            it "should restrict auto-generated routes" do
+              content =<<-EOF
+              class Admin::CommentsController < ApplicationController
+                def show; end
+                def new; end
+                def create; end
+                def edit; end
+                def update; end
+                def destroy; end
+              end
+              EOF
+              runner.prepare('app/controllers/admin/comments_controller.rb', content)
+
+              content =<<-EOF
+              RailsBestPracticesCom::Application.routes.draw do
+                namespace :admin do
+                  resources :comments
+                end
+              end
+              EOF
+              runner.review('config/routes.rb', content)
+              runner.should have(1).errors
+              runner.errors[0].to_s.should == "config/routes.rb:3 - restrict auto-generated routes (:only => [:show, :new, :create, :edit, :update, :destroy])"
+            end
+          end
+
+          describe "nested routes" do
+            before :each do
+              content =<<-EOF
+              class CommentsController < ApplicationController
+                def index; end
+                def show; end
+                def new; end
+                def create; end
+                def edit; end
+                def update; end
+                def destroy; end
+              end
+              EOF
+              runner.prepare('app/controllers/comments_controller.rb', content)
+            end
+
+            it "should restrict auto-generated routes" do
+              content =<<-EOF
+              RailsBestPracticesCom::Application.routes.draw do
+                resources :posts do
+                  resources :comments
+                end
+              end
+              EOF
+              runner.review('config/routes.rb', content)
+              runner.should have(1).errors
+              runner.errors[0].to_s.should == "config/routes.rb:2 - restrict auto-generated routes (:only => [:show, :new, :create, :edit, :update, :destroy])"
+            end
+
+            it "should not restrict auto-generated routes with only" do
+              content =<<-EOF
+              RailsBestPracticesCom::Application.routes.draw do
+                resources :posts, :only => [:show, :new, :create, :edit, :update, :destroy] do
+                  resources :comments
+                end
+              end
+              EOF
+              runner.review('config/routes.rb', content)
+              runner.should have(0).errors
+            end
+
+            it "should not restrict auto-generated routes with except" do
+              content =<<-EOF
+              RailsBestPracticesCom::Application.routes.draw do
+                resources :posts, :except => :index do
+                  resources :comments
+                end
+              end
+              EOF
+              runner.review('config/routes.rb', content)
+              runner.should have(0).errors
             end
           end
-          EOF
-          runner.review('config/routes.rb', content)
-          runner.should have(1).errors
-          runner.errors[0].to_s.should == "config/routes.rb:3 - restrict auto-generated routes (:only => [:show, :new, :create, :edit, :update, :destroy])"
         end
       end
 
-      describe "nested routes" do
+      describe "resource" do
         before :each do
           content =<<-EOF
-          class CommentsController < ApplicationController
-            def index; end
+          class AccountsController < ApplicationController
             def show; end
             def new; end
             def create; end
             def edit; end
             def update; end
-            def destroy; end
           end
           EOF
-          runner.prepare('app/controllers/comments_controller.rb', content)
+          runner.prepare('app/controllers/accounts_controller.rb', content)
         end
 
-        it "should restrict auto-generated routes" do
-          content =<<-EOF
-          RailsBestPracticesCom::Application.routes.draw do
-            resources :posts do
-              resources :comments
+        describe "rails2" do
+          it "should restrict auto-generated routes" do
+            content =<<-EOF
+            ActionController::Routing::Routes.draw do |map|
+              map.resource :account
             end
+            EOF
+            runner.review('config/routes.rb', content)
+            runner.should have(1).errors
+            runner.errors[0].to_s.should == "config/routes.rb:2 - restrict auto-generated routes (:only => [:show, :new, :create, :edit, :update])"
           end
-          EOF
-          runner.review('config/routes.rb', content)
-          runner.should have(1).errors
-          runner.errors[0].to_s.should == "config/routes.rb:2 - restrict auto-generated routes (:only => [:show, :new, :create, :edit, :update, :destroy])"
-        end
 
-        it "should not restrict auto-generated routes with only" do
-          content =<<-EOF
-          RailsBestPracticesCom::Application.routes.draw do
-            resources :posts, :only => [:show, :new, :create, :edit, :update, :destroy] do
-              resources :comments
+          it "should not restrict auto-generated routes with only" do
+            content =<<-EOF
+            ActionController::Routing::Routes.draw do |map|
+              map.resource :account, :only => [:show, :new, :create, :edit, :update]
             end
+            EOF
+            runner.review('config/routes.rb', content)
+            runner.should have(0).errors
           end
-          EOF
-          runner.review('config/routes.rb', content)
-          runner.should have(0).errors
-        end
 
-        it "should not restrict auto-generated routes with except" do
-          content =<<-EOF
-          RailsBestPracticesCom::Application.routes.draw do
-            resources :posts, :except => :index do
-              resources :comments
+          it "should not restrict auto-generated routes with except" do
+            content =<<-EOF
+            ActionController::Routing::Routes.draw do |map|
+              map.resource :account, :except => :destroy
             end
+            EOF
+            runner.review('config/routes.rb', content)
+            runner.should have(0).errors
           end
-          EOF
-          runner.review('config/routes.rb', content)
-          runner.should have(0).errors
-        end
-      end
-    end
-  end
-
-  describe "resource" do
-    before :each do
-      content =<<-EOF
-      class AccountsController < ApplicationController
-        def show; end
-        def new; end
-        def create; end
-        def edit; end
-        def update; end
-      end
-      EOF
-      runner.prepare('app/controllers/accounts_controller.rb', content)
-    end
-
-    describe "rails2" do
-      it "should restrict auto-generated routes" do
-        content =<<-EOF
-        ActionController::Routing::Routes.draw do |map|
-          map.resource :account
-        end
-        EOF
-        runner.review('config/routes.rb', content)
-        runner.should have(1).errors
-        runner.errors[0].to_s.should == "config/routes.rb:2 - restrict auto-generated routes (:only => [:show, :new, :create, :edit, :update])"
-      end
-
-      it "should not restrict auto-generated routes with only" do
-        content =<<-EOF
-        ActionController::Routing::Routes.draw do |map|
-          map.resource :account, :only => [:show, :new, :create, :edit, :update]
         end
-        EOF
-        runner.review('config/routes.rb', content)
-        runner.should have(0).errors
-      end
-
-      it "should not restrict auto-generated routes with except" do
-        content =<<-EOF
-        ActionController::Routing::Routes.draw do |map|
-          map.resource :account, :except => :destroy
-        end
-        EOF
-        runner.review('config/routes.rb', content)
-        runner.should have(0).errors
-      end
-    end
 
-    describe "rails3" do
-      it "should restrict auto-generated routes" do
-        content =<<-EOF
-        ActionController::Routing::Routes.draw do |map|
-          map.resource :account
-        end
-        EOF
-        runner.review('config/routes.rb', content)
-        runner.should have(1).errors
-        runner.errors[0].to_s.should == "config/routes.rb:2 - restrict auto-generated routes (:only => [:show, :new, :create, :edit, :update])"
-      end
+        describe "rails3" do
+          it "should restrict auto-generated routes" do
+            content =<<-EOF
+            ActionController::Routing::Routes.draw do |map|
+              map.resource :account
+            end
+            EOF
+            runner.review('config/routes.rb', content)
+            runner.should have(1).errors
+            runner.errors[0].to_s.should == "config/routes.rb:2 - restrict auto-generated routes (:only => [:show, :new, :create, :edit, :update])"
+          end
 
-      it "should not restrict auto-generated routes with only" do
-        content =<<-EOF
-        ActionController::Routing::Routes.draw do |map|
-          map.resource :account, :only => [:show, :new, :create, :edit, :update]
-        end
-        EOF
-        runner.review('config/routes.rb', content)
-        runner.should have(0).errors
-      end
+          it "should not restrict auto-generated routes with only" do
+            content =<<-EOF
+            ActionController::Routing::Routes.draw do |map|
+              map.resource :account, :only => [:show, :new, :create, :edit, :update]
+            end
+            EOF
+            runner.review('config/routes.rb', content)
+            runner.should have(0).errors
+          end
 
-      it "should not restrict auto-generated routes with except" do
-        content =<<-EOF
-        ActionController::Routing::Routes.draw do |map|
-          map.resource :account, :except => :destroy
+          it "should not restrict auto-generated routes with except" do
+            content =<<-EOF
+            ActionController::Routing::Routes.draw do |map|
+              map.resource :account, :except => :destroy
+            end
+            EOF
+            runner.review('config/routes.rb', content)
+            runner.should have(0).errors
+          end
         end
-        EOF
-        runner.review('config/routes.rb', content)
-        runner.should have(0).errors
       end
     end
   end