Merge remote branch 'mainstream/master'

Conflicts:
	railties/lib/rails/railtie.rb

3 files changed, 44 insertions, 0 deletions

diff --git a/railties/lib/rails/console/app.rb b/railties/lib/rails/console/app.rb
new file mode 100644
index 0000000000..7e8fd027e6
--- /dev/null
+++ b/railties/lib/rails/console/app.rb
@@ -0,0 +1,33 @@
+require 'active_support/all'
+require 'active_support/test_case'
+require 'action_controller'
+
+# work around the at_exit hook in test/unit, which kills IRB
+Test::Unit.run = true if Test::Unit.respond_to?(:run=)
+
+# reference the global "app" instance, created on demand. To recreate the
+# instance, pass a non-false value as the parameter.
+def app(create=false)
+  @app_integration_instance = nil if create
+  @app_integration_instance ||= new_session do |sess|
+    sess.host! "www.example.com"
+  end
+end
+
+# create a new session. If a block is given, the new session will be yielded
+# to the block before being returned.
+def new_session
+  app = ActionController::Dispatcher.new
+  session = ActionController::Integration::Session.new(app)
+  yield session if block_given?
+  session
+end
+
+# reloads the environment
+def reload!(print=true)
+  puts "Reloading..." if print
+  ActionDispatch::Callbacks.new(lambda {}, false)
+  true
+end
+
+reload!(false)
diff --git a/railties/lib/rails/console/helpers.rb b/railties/lib/rails/console/helpers.rb
new file mode 100644
index 0000000000..039db667c4
--- /dev/null
+++ b/railties/lib/rails/console/helpers.rb
@@ -0,0 +1,5 @@
+def helper
+  @helper ||= ApplicationController.helpers
+end
+
+@controller = ApplicationController.new
diff --git a/railties/lib/rails/console/sandbox.rb b/railties/lib/rails/console/sandbox.rb
new file mode 100644
index 0000000000..65a3d68619
--- /dev/null
+++ b/railties/lib/rails/console/sandbox.rb
@@ -0,0 +1,6 @@
+ActiveRecord::Base.connection.increment_open_transactions
+ActiveRecord::Base.connection.begin_db_transaction
+at_exit do
+  ActiveRecord::Base.connection.rollback_db_transaction
+  ActiveRecord::Base.connection.decrement_open_transactions
+end