diff options
author | Steve Klabnik <steve@steveklabnik.com> | 2013-03-31 09:18:24 -0700 |
---|---|---|
committer | Steve Klabnik <steve@steveklabnik.com> | 2013-03-31 09:18:24 -0700 |
commit | d535249b48ff830ffc5c282cc55474c95a20e603 (patch) | |
tree | adb0b22d2a74ea75faa81b112532e28a6cc17399 /railties/test | |
parent | 2f53c27b81ffaf3607279e4aca36eef38e2e6a5b (diff) | |
parent | c0be6c9811512e242c38d2576270531e95152f16 (diff) | |
download | rails-d535249b48ff830ffc5c282cc55474c95a20e603.tar.gz rails-d535249b48ff830ffc5c282cc55474c95a20e603.tar.bz2 rails-d535249b48ff830ffc5c282cc55474c95a20e603.zip |
Merge pull request #10017 from vipulnsward/railties_cleanups
cleanup railties test; fix typos
Diffstat (limited to 'railties/test')
-rw-r--r-- | railties/test/application/console_test.rb | 7 | ||||
-rw-r--r-- | railties/test/generators_test.rb | 2 | ||||
-rw-r--r-- | railties/test/railties/engine_test.rb | 2 |
3 files changed, 5 insertions, 6 deletions
diff --git a/railties/test/application/console_test.rb b/railties/test/application/console_test.rb index 80700a1d64..31bc003dcb 100644 --- a/railties/test/application/console_test.rb +++ b/railties/test/application/console_test.rb @@ -127,24 +127,23 @@ class FullStackConsoleTest < ActiveSupport::TestCase end def spawn_console - pid = Process.spawn( + Process.spawn( "#{app_path}/bin/rails console --sandbox", in: @slave, out: @slave, err: @slave ) assert_output "> ", 30 - pid end def test_sandbox - pid = spawn_console + spawn_console write_prompt "Post.count", "=> 0" write_prompt "Post.create" write_prompt "Post.count", "=> 1" @master.puts "quit" - pid = spawn_console + spawn_console write_prompt "Post.count", "=> 0" write_prompt "Post.transaction { Post.create; raise }" diff --git a/railties/test/generators_test.rb b/railties/test/generators_test.rb index 9953aa929b..361784f509 100644 --- a/railties/test/generators_test.rb +++ b/railties/test/generators_test.rb @@ -164,7 +164,7 @@ class GeneratorsTest < Rails::Generators::TestCase Rails::Generators.invoke "super_shoulda:model", ["Account"] end - def test_developer_options_are_overwriten_by_user_options + def test_developer_options_are_overwritten_by_user_options Rails::Generators.options[:with_options] = { generate: false } self.class.class_eval(<<-end_eval, __FILE__, __LINE__ + 1) diff --git a/railties/test/railties/engine_test.rb b/railties/test/railties/engine_test.rb index 26b388b6f9..01fa2c6864 100644 --- a/railties/test/railties/engine_test.rb +++ b/railties/test/railties/engine_test.rb @@ -187,7 +187,7 @@ module RailtiesTest assert_equal "Hello bukkits\n", response[2].body end - test "adds its views to view paths with lower proriority than app ones" do + test "adds its views to view paths with lower priority than app ones" do @plugin.write "app/controllers/bukkit_controller.rb", <<-RUBY class BukkitController < ActionController::Base def index |