代码拉取完成,页面将自动刷新
From e708599c85226e9ad107ebdad09a9e31f1b5388a Mon Sep 17 00:00:00 2001
From: Nicolas Iragorri Dominguez
<nicolasiragorridominguez@Nicolass-Mac-Studio.local>
Date: Tue, 27 Dec 2022 01:24:19 +0100
Subject: [PATCH] [issue-46741] remove `require pathname` from `drop` method
---
.../test/cases/tasks/sqlite_rake_test.rb | 42 +++++++------------
diff --git a/activerecord/test/cases/tasks/sqlite_rake_test.rb b/activerecord/test/cases/tasks/sqlite_rake_test.rb
index 98257867aa773..9b534b88220bd 100644
--- a/activerecord/test/cases/tasks/sqlite_rake_test.rb
+++ b/activerecord/test/cases/tasks/sqlite_rake_test.rb
@@ -72,15 +72,17 @@ def test_db_create_with_error_prints_message
class SqliteDBDropTest < ActiveRecord::TestCase
def setup
+ @root = "/rails/root"
@database = "db_create.sqlite3"
+ @database_root = File.join(@root, @database)
@configuration = {
"adapter" => "sqlite3",
"database" => @database
}
- @path = Class.new do
- def to_s; "/absolute/path" end
- def absolute?; true end
- end.new
+ @configuration_root = {
+ "adapter" => "sqlite3",
+ "database" => @database_root
+ }
$stdout, @original_stdout = StringIO.new, $stdout
$stderr, @original_stderr = StringIO.new, $stderr
@@ -90,45 +92,33 @@ def teardown
$stdout, $stderr = @original_stdout, @original_stderr
end
- def test_creates_path_from_database
- assert_called_with(Pathname, :new, [@database], returns: @path) do
- ActiveRecord::Tasks::DatabaseTasks.drop @configuration, "/rails/root"
+ def test_checks_db_dir_is_absolute
+ assert_called_with(File, :absolute_path?, [@database], returns: false) do
+ ActiveRecord::Tasks::DatabaseTasks.drop @configuration, @root
end
end
def test_removes_file_with_absolute_path
- Pathname.stub(:new, @path) do
- assert_called_with(FileUtils, :rm, ["/absolute/path"]) do
- ActiveRecord::Tasks::DatabaseTasks.drop @configuration, "/rails/root"
- end
+ assert_called_with(FileUtils, :rm, [@database_root]) do
+ ActiveRecord::Tasks::DatabaseTasks.drop @configuration_root, @root
end
end
def test_generates_absolute_path_with_given_root
- Pathname.stub(:new, @path) do
- @path.stub(:absolute?, false) do
- assert_called_with(File, :join, ["/rails/root", @path],
- returns: "/former/relative/path"
- ) do
- ActiveRecord::Tasks::DatabaseTasks.drop @configuration, "/rails/root"
- end
- end
+ assert_called_with(File, :join, [@root, @database], returns: "#{@root}/#{@database}") do
+ ActiveRecord::Tasks::DatabaseTasks.drop @configuration, @root
end
end
def test_removes_file_with_relative_path
- File.stub(:join, "/former/relative/path") do
- @path.stub(:absolute?, false) do
- assert_called_with(FileUtils, :rm, ["/former/relative/path"]) do
- ActiveRecord::Tasks::DatabaseTasks.drop @configuration, "/rails/root"
- end
- end
+ assert_called_with(FileUtils, :rm, [@database_root]) do
+ ActiveRecord::Tasks::DatabaseTasks.drop @configuration, @root
end
end
def test_when_db_dropped_successfully_outputs_info_to_stdout
FileUtils.stub(:rm, nil) do
- ActiveRecord::Tasks::DatabaseTasks.drop @configuration, "/rails/root"
+ ActiveRecord::Tasks::DatabaseTasks.drop @configuration, @root
assert_equal "Dropped database '#{@database}'\n", $stdout.string
end
此处可能存在不合适展示的内容,页面不予展示。您可通过相关编辑功能自查并修改。
如您确认内容无涉及 不当用语 / 纯广告导流 / 暴力 / 低俗色情 / 侵权 / 盗版 / 虚假 / 无价值内容或违法国家有关法律法规的内容,可点击提交进行申诉,我们将尽快为您处理。