aboutsummaryrefslogtreecommitdiffstats
path: root/railties
diff options
context:
space:
mode:
authoryuuji.yaginuma <yuuji.yaginuma@gmail.com>2017-11-08 12:32:12 +0900
committeryuuji.yaginuma <yuuji.yaginuma@gmail.com>2017-11-08 13:24:16 +0900
commit8e1dca10cd98bdc8bb00592f3d90926309b22a18 (patch)
tree9bbf0eb6c9d53ba5e2841d9a4656ff3a4d6df362 /railties
parent67db41aa7f17c2d34eb5a914ac7a6b2574930ff4 (diff)
downloadrails-8e1dca10cd98bdc8bb00592f3d90926309b22a18.tar.gz
rails-8e1dca10cd98bdc8bb00592f3d90926309b22a18.tar.bz2
rails-8e1dca10cd98bdc8bb00592f3d90926309b22a18.zip
Remove unnecessary migration deletion
Since isolation application is generated with the `--skip-gemfile` option, so `active_storage:install` is not executed.
Diffstat (limited to 'railties')
-rw-r--r--railties/test/application/bin_setup_test.rb4
-rw-r--r--railties/test/application/rackup_test.rb1
-rw-r--r--railties/test/application/rake/dbs_test.rb4
-rw-r--r--railties/test/application/test_runner_test.rb5
-rw-r--r--railties/test/application/test_test.rb5
5 files changed, 0 insertions, 19 deletions
diff --git a/railties/test/application/bin_setup_test.rb b/railties/test/application/bin_setup_test.rb
index 9fac0435e4..54934dbe24 100644
--- a/railties/test/application/bin_setup_test.rb
+++ b/railties/test/application/bin_setup_test.rb
@@ -16,8 +16,6 @@ module ApplicationTests
def test_bin_setup
Dir.chdir(app_path) do
- FileUtils.rm_rf("db/migrate")
-
app_file "db/schema.rb", <<-RUBY
ActiveRecord::Schema.define(version: 20140423102712) do
create_table(:articles) {}
@@ -39,8 +37,6 @@ module ApplicationTests
def test_bin_setup_output
Dir.chdir(app_path) do
- FileUtils.rm_rf("db/migrate")
-
app_file "db/schema.rb", ""
output = `bin/setup 2>&1`
diff --git a/railties/test/application/rackup_test.rb b/railties/test/application/rackup_test.rb
index 1dcc2826f0..383f18a7da 100644
--- a/railties/test/application/rackup_test.rb
+++ b/railties/test/application/rackup_test.rb
@@ -26,7 +26,6 @@ module ApplicationTests
test "config.ru can be racked up" do
Dir.chdir app_path do
- FileUtils.rm_rf("db/migrate")
@app = rackup
assert_welcome get("/")
end
diff --git a/railties/test/application/rake/dbs_test.rb b/railties/test/application/rake/dbs_test.rb
index 009f2887c9..fd22477539 100644
--- a/railties/test/application/rake/dbs_test.rb
+++ b/railties/test/application/rake/dbs_test.rb
@@ -287,8 +287,6 @@ module ApplicationTests
ENV.delete "RAILS_ENV"
ENV.delete "RACK_ENV"
- Dir.chdir(app_path) { FileUtils.rm_rf("db/migrate") }
-
app_file "db/schema.rb", <<-RUBY
ActiveRecord::Schema.define(version: "1") do
create_table :users do |t|
@@ -310,8 +308,6 @@ module ApplicationTests
end
test "db:setup sets ar_internal_metadata" do
- Dir.chdir(app_path) { FileUtils.rm_rf("db/migrate") }
-
app_file "db/schema.rb", ""
rails "db:setup"
diff --git a/railties/test/application/test_runner_test.rb b/railties/test/application/test_runner_test.rb
index 30bd283b48..e92a0466dd 100644
--- a/railties/test/application/test_runner_test.rb
+++ b/railties/test/application/test_runner_test.rb
@@ -11,7 +11,6 @@ module ApplicationTests
def setup
build_app
create_schema
- remove_migrations
end
def teardown
@@ -728,10 +727,6 @@ module ApplicationTests
app_file "db/schema.rb", ""
end
- def remove_migrations
- Dir.chdir(app_path) { FileUtils.rm_rf("db/migrate") }
- end
-
def create_test_file(path = :unit, name = "test", pass: true)
app_file "test/#{path}/#{name}_test.rb", <<-RUBY
require 'test_helper'
diff --git a/railties/test/application/test_test.rb b/railties/test/application/test_test.rb
index 50238ed682..0a51e98656 100644
--- a/railties/test/application/test_test.rb
+++ b/railties/test/application/test_test.rb
@@ -8,7 +8,6 @@ module ApplicationTests
def setup
build_app
- remove_migrations
end
def teardown
@@ -321,10 +320,6 @@ Expected: ["id", "name"]
end
private
- def remove_migrations
- Dir.chdir(app_path) { FileUtils.rm_rf("db/migrate") }
- end
-
def assert_unsuccessful_run(name, message)
result = run_test_file(name)
assert_not_equal 0, $?.to_i