aboutsummaryrefslogtreecommitdiffstats
path: root/railties
diff options
context:
space:
mode:
authorKasper Timm Hansen <kaspth@gmail.com>2016-09-19 14:03:26 +0200
committerGitHub <noreply@github.com>2016-09-19 14:03:26 +0200
commit22896756580dfe6616c99880154bbe13119401a6 (patch)
tree5a2bbfcfcb25633f033d2a376bf38e1fa46844ee /railties
parent254db4987d03d3c9d3fca1e2961da8fd7dd0e06b (diff)
parent05fa6f3db6e2dfe213d05cc2e1fd82a429660fc6 (diff)
downloadrails-22896756580dfe6616c99880154bbe13119401a6.tar.gz
rails-22896756580dfe6616c99880154bbe13119401a6.tar.bz2
rails-22896756580dfe6616c99880154bbe13119401a6.zip
Merge pull request #26543 from y-yagi/use_rails_command_in_restart_test
use rails command in restart task test
Diffstat (limited to 'railties')
-rw-r--r--railties/test/application/rake/restart_test.rb14
1 files changed, 7 insertions, 7 deletions
diff --git a/railties/test/application/rake/restart_test.rb b/railties/test/application/rake/restart_test.rb
index 28da8164a7..6ebd2d5461 100644
--- a/railties/test/application/rake/restart_test.rb
+++ b/railties/test/application/rake/restart_test.rb
@@ -13,32 +13,32 @@ module ApplicationTests
teardown_app
end
- test "rake restart touches tmp/restart.txt" do
+ test "rails restart touches tmp/restart.txt" do
Dir.chdir(app_path) do
- `rake restart`
+ `bin/rails restart`
assert File.exist?("tmp/restart.txt")
prev_mtime = File.mtime("tmp/restart.txt")
sleep(1)
- `rake restart`
+ `bin/rails restart`
curr_mtime = File.mtime("tmp/restart.txt")
assert_not_equal prev_mtime, curr_mtime
end
end
- test "rake restart should work even if tmp folder does not exist" do
+ test "rails restart should work even if tmp folder does not exist" do
Dir.chdir(app_path) do
FileUtils.remove_dir("tmp")
- `rake restart`
+ `bin/rails restart`
assert File.exist?("tmp/restart.txt")
end
end
- test "rake restart removes server.pid also" do
+ test "rails restart removes server.pid also" do
Dir.chdir(app_path) do
FileUtils.mkdir_p("tmp/pids")
FileUtils.touch("tmp/pids/server.pid")
- `rake restart`
+ `bin/rails restart`
assert_not File.exist?("tmp/pids/server.pid")
end
end