normalizes indentation and whitespace across the project

5 files changed, 68 insertions, 68 deletions

diff --git a/railties/test/application/assets_test.rb b/railties/test/application/assets_test.rb
index 9396e2cff7..e84e01a41b 100644
--- a/railties/test/application/assets_test.rb
+++ b/railties/test/application/assets_test.rb
@@ -507,16 +507,16 @@ module ApplicationTests
 
     private
 
-    def app_with_assets_in_view
-      app_file "app/assets/javascripts/application.js", "//= require_tree ."
-      app_file "app/assets/javascripts/xmlhr.js", "function f1() { alert(); }"
-      app_file "app/views/posts/index.html.erb", "<%= javascript_include_tag 'application' %>"
+      def app_with_assets_in_view
+        app_file "app/assets/javascripts/application.js", "//= require_tree ."
+        app_file "app/assets/javascripts/xmlhr.js", "function f1() { alert(); }"
+        app_file "app/views/posts/index.html.erb", "<%= javascript_include_tag 'application' %>"
 
-      app_file "config/routes.rb", <<-RUBY
+        app_file "config/routes.rb", <<-RUBY
         Rails.application.routes.draw do
           get '/posts', :to => "posts#index"
         end
       RUBY
-    end
+      end
   end
 end
diff --git a/railties/test/application/loading_test.rb b/railties/test/application/loading_test.rb
index 18f8c89790..d57384d256 100644
--- a/railties/test/application/loading_test.rb
+++ b/railties/test/application/loading_test.rb
@@ -359,13 +359,13 @@ class LoadingTest < ActiveSupport::TestCase
 
   protected
 
-  def setup_ar!
-    ActiveRecord::Base.establish_connection(adapter: "sqlite3", database: ":memory:")
-    ActiveRecord::Migration.verbose = false
-    ActiveRecord::Schema.define(version: 1) do
-      create_table :posts do |t|
-        t.string :title
+    def setup_ar!
+      ActiveRecord::Base.establish_connection(adapter: "sqlite3", database: ":memory:")
+      ActiveRecord::Migration.verbose = false
+      ActiveRecord::Schema.define(version: 1) do
+        create_table :posts do |t|
+          t.string :title
+        end
       end
     end
-  end
 end
diff --git a/railties/test/application/middleware/static_test.rb b/railties/test/application/middleware/static_test.rb
index 8a06e91297..5cd3e4325e 100644
--- a/railties/test/application/middleware/static_test.rb
+++ b/railties/test/application/middleware/static_test.rb
@@ -46,11 +46,11 @@ module ApplicationTests
 
     test "public_file_server.index_name defaults to 'index'" do
       app_file "public/index.html", "/index.html"
-      
+
       require "#{app_path}/config/environment"
 
       get "/"
-      
+
       assert_equal "/index.html\n", last_response.body
     end
 
diff --git a/railties/test/application/rake/migrations_test.rb b/railties/test/application/rake/migrations_test.rb
index b3e95769fa..d608fa1976 100644
--- a/railties/test/application/rake/migrations_test.rb
+++ b/railties/test/application/rake/migrations_test.rb
@@ -42,17 +42,17 @@ module ApplicationTests
           `bin/rails generate model user username:string password:string;
            bin/rails generate migration add_email_to_users email:string`
 
-           output = `bin/rails db:migrate`
-           assert_match(/create_table\(:users\)/, output)
-           assert_match(/CreateUsers: migrated/, output)
-           assert_match(/add_column\(:users, :email, :string\)/, output)
-           assert_match(/AddEmailToUsers: migrated/, output)
-
-           output = `bin/rails db:rollback STEP=2`
-           assert_match(/drop_table\(:users\)/, output)
-           assert_match(/CreateUsers: reverted/, output)
-           assert_match(/remove_column\(:users, :email, :string\)/, output)
-           assert_match(/AddEmailToUsers: reverted/, output)
+          output = `bin/rails db:migrate`
+          assert_match(/create_table\(:users\)/, output)
+          assert_match(/CreateUsers: migrated/, output)
+          assert_match(/add_column\(:users, :email, :string\)/, output)
+          assert_match(/AddEmailToUsers: migrated/, output)
+
+          output = `bin/rails db:rollback STEP=2`
+          assert_match(/drop_table\(:users\)/, output)
+          assert_match(/CreateUsers: reverted/, output)
+          assert_match(/remove_column\(:users, :email, :string\)/, output)
+          assert_match(/AddEmailToUsers: reverted/, output)
         end
       end
 
@@ -107,22 +107,22 @@ module ApplicationTests
            bin/rails generate migration add_email_to_users email:string;
            bin/rails db:migrate`
 
-           output = `bin/rails db:migrate:status`
+          output = `bin/rails db:migrate:status`
 
-           assert_match(/up\s+\d{14}\s+Create users/, output)
-           assert_match(/up\s+\d{14}\s+Add email to users/, output)
+          assert_match(/up\s+\d{14}\s+Create users/, output)
+          assert_match(/up\s+\d{14}\s+Add email to users/, output)
 
-           `bin/rails db:rollback STEP=2`
-           output = `bin/rails db:migrate:status`
+          `bin/rails db:rollback STEP=2`
+          output = `bin/rails db:migrate:status`
 
-           assert_match(/down\s+\d{14}\s+Create users/, output)
-           assert_match(/down\s+\d{14}\s+Add email to users/, output)
+          assert_match(/down\s+\d{14}\s+Create users/, output)
+          assert_match(/down\s+\d{14}\s+Add email to users/, output)
 
-           `bin/rails db:migrate:redo`
-           output = `bin/rails db:migrate:status`
+          `bin/rails db:migrate:redo`
+          output = `bin/rails db:migrate:status`
 
-           assert_match(/up\s+\d{14}\s+Create users/, output)
-           assert_match(/up\s+\d{14}\s+Add email to users/, output)
+          assert_match(/up\s+\d{14}\s+Create users/, output)
+          assert_match(/up\s+\d{14}\s+Add email to users/, output)
         end
       end
 
@@ -134,22 +134,22 @@ module ApplicationTests
            bin/rails generate migration add_email_to_users email:string;
            bin/rails db:migrate`
 
-           output = `bin/rails db:migrate:status`
+          output = `bin/rails db:migrate:status`
 
-           assert_match(/up\s+\d{3,}\s+Create users/, output)
-           assert_match(/up\s+\d{3,}\s+Add email to users/, output)
+          assert_match(/up\s+\d{3,}\s+Create users/, output)
+          assert_match(/up\s+\d{3,}\s+Add email to users/, output)
 
-           `bin/rails db:rollback STEP=2`
-           output = `bin/rails db:migrate:status`
+          `bin/rails db:rollback STEP=2`
+          output = `bin/rails db:migrate:status`
 
-           assert_match(/down\s+\d{3,}\s+Create users/, output)
-           assert_match(/down\s+\d{3,}\s+Add email to users/, output)
+          assert_match(/down\s+\d{3,}\s+Create users/, output)
+          assert_match(/down\s+\d{3,}\s+Add email to users/, output)
 
-           `bin/rails db:migrate:redo`
-           output = `bin/rails db:migrate:status`
+          `bin/rails db:migrate:redo`
+          output = `bin/rails db:migrate:status`
 
-           assert_match(/up\s+\d{3,}\s+Create users/, output)
-           assert_match(/up\s+\d{3,}\s+Add email to users/, output)
+          assert_match(/up\s+\d{3,}\s+Create users/, output)
+          assert_match(/up\s+\d{3,}\s+Add email to users/, output)
         end
       end
 
@@ -168,10 +168,10 @@ module ApplicationTests
 
           `bin/rails db:migrate`
 
-           output = `bin/rails db:migrate:status`
+          output = `bin/rails db:migrate:status`
 
-           assert_match(/up\s+001\s+One migration/, output)
-           assert_match(/up\s+002\s+Two migration/, output)
+          assert_match(/up\s+001\s+One migration/, output)
+          assert_match(/up\s+002\s+Two migration/, output)
         end
       end
 
diff --git a/railties/test/application/rake/notes_test.rb b/railties/test/application/rake/notes_test.rb
index c0ff3af193..b3f379d707 100644
--- a/railties/test/application/rake/notes_test.rb
+++ b/railties/test/application/rake/notes_test.rb
@@ -140,29 +140,29 @@ module ApplicationTests
 
       private
 
-      def run_rake_notes(command = "bin/rails notes")
-        boot_rails
-        load_tasks
+        def run_rake_notes(command = "bin/rails notes")
+          boot_rails
+          load_tasks
 
-        Dir.chdir(app_path) do
-          output = `#{command}`
-          lines  = output.scan(/\[([0-9\s]+)\]\s/).flatten
+          Dir.chdir(app_path) do
+            output = `#{command}`
+            lines  = output.scan(/\[([0-9\s]+)\]\s/).flatten
 
-          yield output, lines
+            yield output, lines
+          end
         end
-      end
 
-      def load_tasks
-        require "rake"
-        require "rdoc/task"
-        require "rake/testtask"
+        def load_tasks
+          require "rake"
+          require "rdoc/task"
+          require "rake/testtask"
 
-        Rails.application.load_tasks
-      end
+          Rails.application.load_tasks
+        end
 
-      def boot_rails
-        require "#{app_path}/config/environment"
-      end
+        def boot_rails
+          require "#{app_path}/config/environment"
+        end
     end
   end
 end