Skip to content

Commit

Permalink
Rename 'db' to 'test/db' in Active Record's tests
Browse files Browse the repository at this point in the history
  • Loading branch information
@bogdanvlviv
bogdanvlviv committed Mar 3, 2020
1 parent 22877a9 commit 82a1362
Show file tree
Hide file tree
Showing 7 changed files with 75 additions and 84 deletions.
2 changes: 1 addition & 1 deletion activerecord/.gitignore
View file
@@ -1,4 +1,4 @@
/db/
/sqlnet.log
/test/config.yml
/test/db/
/test/fixtures/*.sqlite*
2 changes: 1 addition & 1 deletion activerecord/test/cases/adapters/sqlite3/transaction_test.rb
View file
Expand Up @@ -108,7 +108,7 @@ def shared_cache_flags
def with_connection(options = {})
db_config = ActiveRecord::Base.configurations.configs_for(env_name: "arunit", name: "primary")
conn_options = options.reverse_merge(
database: in_memory_db? ? "db/file::memory:" : db_config.database
database: in_memory_db? ? "test/db/file::memory:" : db_config.database
)
conn = ActiveRecord::Base.sqlite3_connection(conn_options)

Expand Down
52 changes: 25 additions & 27 deletions activerecord/test/cases/connection_adapters/connection_handler_test.rb
View file
Expand Up @@ -47,14 +47,14 @@ def test_establish_connection_using_3_levels_config

config = {
"default_env" => {
"readonly" => { "adapter" => "sqlite3", "database" => "db/readonly.sqlite3" },
"primary" => { "adapter" => "sqlite3", "database" => "db/primary.sqlite3" }
"readonly" => { "adapter" => "sqlite3", "database" => "test/db/readonly.sqlite3" },
"primary" => { "adapter" => "sqlite3", "database" => "test/db/primary.sqlite3" }
},
"another_env" => {
"readonly" => { "adapter" => "sqlite3", "database" => "db/bad-readonly.sqlite3" },
"primary" => { "adapter" => "sqlite3", "database" => "db/bad-primary.sqlite3" }
"readonly" => { "adapter" => "sqlite3", "database" => "test/db/bad-readonly.sqlite3" },
"primary" => { "adapter" => "sqlite3", "database" => "test/db/bad-primary.sqlite3" }
},
"common" => { "adapter" => "sqlite3", "database" => "db/common.sqlite3" }
"common" => { "adapter" => "sqlite3", "database" => "test/db/common.sqlite3" }
}
@prev_configs, ActiveRecord::Base.configurations = ActiveRecord::Base.configurations, config

Expand All @@ -63,13 +63,13 @@ def test_establish_connection_using_3_levels_config
@handler.establish_connection(:readonly)

assert_not_nil pool = @handler.retrieve_connection_pool("readonly")
assert_equal "db/readonly.sqlite3", pool.db_config.database
assert_equal "test/db/readonly.sqlite3", pool.db_config.database

assert_not_nil pool = @handler.retrieve_connection_pool("primary")
assert_equal "db/primary.sqlite3", pool.db_config.database
assert_equal "test/db/primary.sqlite3", pool.db_config.database

assert_not_nil pool = @handler.retrieve_connection_pool("common")
assert_equal "db/common.sqlite3", pool.db_config.database
assert_equal "test/db/common.sqlite3", pool.db_config.database
ensure
ActiveRecord::Base.configurations = @prev_configs
ENV["RAILS_ENV"] = previous_env
Expand All @@ -78,7 +78,7 @@ def test_establish_connection_using_3_levels_config
unless in_memory_db?
def test_establish_connection_with_primary_works_without_deprecation
old_config = ActiveRecord::Base.configurations
config = { "primary" => { "adapter" => "sqlite3", "database" => "db/primary.sqlite3" } }
config = { "primary" => { "adapter" => "sqlite3", "database" => "test/db/primary.sqlite3" } }
ActiveRecord::Base.configurations = config

@handler.establish_connection(:primary)
Expand All @@ -93,7 +93,7 @@ def test_establish_connection_with_primary_works_without_deprecation

def test_retrieve_connection_shows_primary_deprecation_warning_when_established_on_active_record_base
old_config = ActiveRecord::Base.configurations
config = { "primary" => { "adapter" => "sqlite3", "database" => "db/primary.sqlite3" } }
config = { "primary" => { "adapter" => "sqlite3", "database" => "test/db/primary.sqlite3" } }
ActiveRecord::Base.configurations = config

ActiveRecord::Base.establish_connection(:primary)
Expand All @@ -110,47 +110,45 @@ def test_establish_connection_using_3_level_config_defaults_to_default_env_prima

config = {
"default_env" => {
"primary" => { "adapter" => "sqlite3", "database" => "db/primary.sqlite3" },
"readonly" => { "adapter" => "sqlite3", "database" => "db/readonly.sqlite3" }
"primary" => { "adapter" => "sqlite3", "database" => "test/db/primary.sqlite3" },
"readonly" => { "adapter" => "sqlite3", "database" => "test/db/readonly.sqlite3" }
},
"another_env" => {
"primary" => { "adapter" => "sqlite3", "database" => "db/another-primary.sqlite3" },
"readonly" => { "adapter" => "sqlite3", "database" => "db/another-readonly.sqlite3" }
"primary" => { "adapter" => "sqlite3", "database" => "test/db/another-primary.sqlite3" },
"readonly" => { "adapter" => "sqlite3", "database" => "test/db/another-readonly.sqlite3" }
}
}
@prev_configs, ActiveRecord::Base.configurations = ActiveRecord::Base.configurations, config

ActiveRecord::Base.establish_connection

assert_match "db/primary.sqlite3", ActiveRecord::Base.connection.pool.db_config.database
assert_match "test/db/primary.sqlite3", ActiveRecord::Base.connection.pool.db_config.database
ensure
ActiveRecord::Base.configurations = @prev_configs
ENV["RAILS_ENV"] = previous_env
ActiveRecord::Base.establish_connection(:arunit)
FileUtils.rm_rf "db"
end

def test_establish_connection_using_2_level_config_defaults_to_default_env_primary_db
previous_env, ENV["RAILS_ENV"] = ENV["RAILS_ENV"], "default_env"

config = {
"default_env" => {
"adapter" => "sqlite3", "database" => "db/primary.sqlite3"
"adapter" => "sqlite3", "database" => "test/db/primary.sqlite3"
},
"another_env" => {
"adapter" => "sqlite3", "database" => "db/bad-primary.sqlite3"
"adapter" => "sqlite3", "database" => "test/db/bad-primary.sqlite3"
}
}
@prev_configs, ActiveRecord::Base.configurations = ActiveRecord::Base.configurations, config

ActiveRecord::Base.establish_connection

assert_match "db/primary.sqlite3", ActiveRecord::Base.connection.pool.db_config.database
assert_match "test/db/primary.sqlite3", ActiveRecord::Base.connection.pool.db_config.database
ensure
ActiveRecord::Base.configurations = @prev_configs
ENV["RAILS_ENV"] = previous_env
ActiveRecord::Base.establish_connection(:arunit)
FileUtils.rm_rf "db"
end

def test_remove_connection_is_deprecated
Expand All @@ -167,28 +165,28 @@ def test_remove_connection_is_deprecated
end

def test_establish_connection_using_two_level_configurations
config = { "development" => { "adapter" => "sqlite3", "database" => "db/primary.sqlite3" } }
config = { "development" => { "adapter" => "sqlite3", "database" => "test/db/primary.sqlite3" } }
@prev_configs, ActiveRecord::Base.configurations = ActiveRecord::Base.configurations, config

@handler.establish_connection(:development)

assert_not_nil pool = @handler.retrieve_connection_pool("development")
assert_equal "db/primary.sqlite3", pool.db_config.database
assert_equal "test/db/primary.sqlite3", pool.db_config.database
ensure
ActiveRecord::Base.configurations = @prev_configs
end

def test_establish_connection_using_top_level_key_in_two_level_config
config = {
"development" => { "adapter" => "sqlite3", "database" => "db/primary.sqlite3" },
"development_readonly" => { "adapter" => "sqlite3", "database" => "db/readonly.sqlite3" }
"development" => { "adapter" => "sqlite3", "database" => "test/db/primary.sqlite3" },
"development_readonly" => { "adapter" => "sqlite3", "database" => "test/db/readonly.sqlite3" }
}
@prev_configs, ActiveRecord::Base.configurations = ActiveRecord::Base.configurations, config

@handler.establish_connection(:development_readonly)

assert_not_nil pool = @handler.retrieve_connection_pool("development_readonly")
assert_equal "db/readonly.sqlite3", pool.db_config.database
assert_equal "test/db/readonly.sqlite3", pool.db_config.database
ensure
ActiveRecord::Base.configurations = @prev_configs
end
Expand All @@ -199,13 +197,13 @@ def test_symbolized_configurations_assignment
development: {
primary: {
adapter: "sqlite3",
database: "db/development.sqlite3",
database: "test/db/development.sqlite3",
},
},
test: {
primary: {
adapter: "sqlite3",
database: "db/test.sqlite3",
database: "test/db/test.sqlite3",
},
},
}
Expand Down
43 changes: 21 additions & 22 deletions activerecord/test/cases/connection_adapters/connection_handlers_multi_db_test.rb
View file
Expand Up @@ -90,20 +90,20 @@ def test_establish_connection_using_3_levels_config

config = {
"default_env" => {
"readonly" => { "adapter" => "sqlite3", "database" => "db/readonly.sqlite3", "replica" => true },
"default" => { "adapter" => "sqlite3", "database" => "db/primary.sqlite3" }
"readonly" => { "adapter" => "sqlite3", "database" => "test/db/readonly.sqlite3", "replica" => true },
"default" => { "adapter" => "sqlite3", "database" => "test/db/primary.sqlite3" }
}
}
@prev_configs, ActiveRecord::Base.configurations = ActiveRecord::Base.configurations, config

ActiveRecord::Base.connects_to(database: { writing: :default, reading: :readonly })

assert_not_nil pool = ActiveRecord::Base.connection_handlers[:writing].retrieve_connection_pool("ActiveRecord::Base")
assert_equal "db/primary.sqlite3", pool.db_config.database
assert_equal "test/db/primary.sqlite3", pool.db_config.database
assert_equal "default", pool.db_config.name

assert_not_nil pool = ActiveRecord::Base.connection_handlers[:reading].retrieve_connection_pool("ActiveRecord::Base")
assert_equal "db/readonly.sqlite3", pool.db_config.database
assert_equal "test/db/readonly.sqlite3", pool.db_config.database
assert_equal "readonly", pool.db_config.name
ensure
ActiveRecord::Base.configurations = @prev_configs
Expand All @@ -116,8 +116,8 @@ def test_switching_connections_via_handler

config = {
"default_env" => {
"readonly" => { "adapter" => "sqlite3", "database" => "db/readonly.sqlite3" },
"primary" => { "adapter" => "sqlite3", "database" => "db/primary.sqlite3" }
"readonly" => { "adapter" => "sqlite3", "database" => "test/db/readonly.sqlite3" },
"primary" => { "adapter" => "sqlite3", "database" => "test/db/primary.sqlite3" }
}
}
@prev_configs, ActiveRecord::Base.configurations = ActiveRecord::Base.configurations, config
Expand Down Expand Up @@ -145,27 +145,26 @@ def test_switching_connections_via_handler
ActiveRecord::Base.configurations = @prev_configs
ActiveRecord::Base.establish_connection(:arunit)
ENV["RAILS_ENV"] = previous_env
FileUtils.rm_rf("db")
end

def test_establish_connection_using_3_levels_config_with_non_default_handlers
previous_env, ENV["RAILS_ENV"] = ENV["RAILS_ENV"], "default_env"

config = {
"default_env" => {
"readonly" => { "adapter" => "sqlite3", "database" => "db/readonly.sqlite3" },
"primary" => { "adapter" => "sqlite3", "database" => "db/primary.sqlite3" }
"readonly" => { "adapter" => "sqlite3", "database" => "test/db/readonly.sqlite3" },
"primary" => { "adapter" => "sqlite3", "database" => "test/db/primary.sqlite3" }
}
}
@prev_configs, ActiveRecord::Base.configurations = ActiveRecord::Base.configurations, config

ActiveRecord::Base.connects_to(database: { default: :primary, readonly: :readonly })

assert_not_nil pool = ActiveRecord::Base.connection_handlers[:default].retrieve_connection_pool("ActiveRecord::Base")
assert_equal "db/primary.sqlite3", pool.db_config.database
assert_equal "test/db/primary.sqlite3", pool.db_config.database

assert_not_nil pool = ActiveRecord::Base.connection_handlers[:readonly].retrieve_connection_pool("ActiveRecord::Base")
assert_equal "db/readonly.sqlite3", pool.db_config.database
assert_equal "test/db/readonly.sqlite3", pool.db_config.database
ensure
ActiveRecord::Base.configurations = @prev_configs
ActiveRecord::Base.establish_connection(:arunit)
Expand Down Expand Up @@ -193,7 +192,7 @@ def test_switching_connections_with_database_url

def test_switching_connections_with_database_config_hash
previous_env, ENV["RAILS_ENV"] = ENV["RAILS_ENV"], "default_env"
config = { adapter: "sqlite3", database: "db/readonly.sqlite3" }
config = { adapter: "sqlite3", database: "test/db/readonly.sqlite3" }

ActiveRecord::Base.connects_to(database: { writing: config })
assert_equal :writing, ActiveRecord::Base.current_role
Expand Down Expand Up @@ -230,8 +229,8 @@ def test_switching_connections_with_database_symbol_uses_default_role

config = {
"default_env" => {
"animals" => { adapter: "sqlite3", database: "db/animals.sqlite3" },
"primary" => { adapter: "sqlite3", database: "db/primary.sqlite3" }
"animals" => { adapter: "sqlite3", database: "test/db/animals.sqlite3" },
"primary" => { adapter: "sqlite3", database: "test/db/primary.sqlite3" }
}
}
@prev_configs, ActiveRecord::Base.configurations = ActiveRecord::Base.configurations, config
Expand All @@ -256,8 +255,8 @@ def test_switching_connections_with_database_hash_uses_passed_role_and_database

config = {
"default_env" => {
"animals" => { adapter: "sqlite3", database: "db/animals.sqlite3" },
"primary" => { adapter: "sqlite3", database: "db/primary.sqlite3" }
"animals" => { adapter: "sqlite3", database: "test/db/animals.sqlite3" },
"primary" => { adapter: "sqlite3", database: "test/db/primary.sqlite3" }
}
}
@prev_configs, ActiveRecord::Base.configurations = ActiveRecord::Base.configurations, config
Expand All @@ -279,7 +278,7 @@ def test_switching_connections_with_database_hash_uses_passed_role_and_database

def test_connects_to_with_single_configuration
config = {
"development" => { "adapter" => "sqlite3", "database" => "db/primary.sqlite3" },
"development" => { "adapter" => "sqlite3", "database" => "test/db/primary.sqlite3" },
}
@prev_configs, ActiveRecord::Base.configurations = ActiveRecord::Base.configurations, config

Expand All @@ -296,24 +295,24 @@ def test_connects_to_with_single_configuration

def test_connects_to_using_top_level_key_in_two_level_config
config = {
"development" => { "adapter" => "sqlite3", "database" => "db/primary.sqlite3" },
"development_readonly" => { "adapter" => "sqlite3", "database" => "db/readonly.sqlite3" }
"development" => { "adapter" => "sqlite3", "database" => "test/db/primary.sqlite3" },
"development_readonly" => { "adapter" => "sqlite3", "database" => "test/db/readonly.sqlite3" }
}
@prev_configs, ActiveRecord::Base.configurations = ActiveRecord::Base.configurations, config

ActiveRecord::Base.connects_to database: { writing: :development, reading: :development_readonly }

assert_not_nil pool = ActiveRecord::Base.connection_handlers[:reading].retrieve_connection_pool("ActiveRecord::Base")
assert_equal "db/readonly.sqlite3", pool.db_config.database
assert_equal "test/db/readonly.sqlite3", pool.db_config.database
ensure
ActiveRecord::Base.configurations = @prev_configs
ActiveRecord::Base.establish_connection(:arunit)
end

def test_connects_to_returns_array_of_established_connections
config = {
"development" => { "adapter" => "sqlite3", "database" => "db/primary.sqlite3" },
"development_readonly" => { "adapter" => "sqlite3", "database" => "db/readonly.sqlite3" }
"development" => { "adapter" => "sqlite3", "database" => "test/db/primary.sqlite3" },
"development_readonly" => { "adapter" => "sqlite3", "database" => "test/db/readonly.sqlite3" }
}
@prev_configs, ActiveRecord::Base.configurations = ActiveRecord::Base.configurations, config

Expand Down
7 changes: 3 additions & 4 deletions activerecord/test/cases/connection_adapters/connection_handlers_multi_pool_config_test.rb
View file
Expand Up @@ -24,7 +24,7 @@ def test_establish_connection_with_pool_configs

config = {
"default_env" => {
"primary" => { "adapter" => "sqlite3", "database" => "db/primary.sqlite3" }
"primary" => { "adapter" => "sqlite3", "database" => "test/db/primary.sqlite3" }
}
}

Expand Down Expand Up @@ -52,7 +52,7 @@ def test_remove_connection

config = {
"default_env" => {
"primary" => { "adapter" => "sqlite3", "database" => "db/primary.sqlite3" }
"primary" => { "adapter" => "sqlite3", "database" => "test/db/primary.sqlite3" }
}
}

Expand All @@ -77,7 +77,7 @@ def test_connected?

config = {
"default_env" => {
"primary" => { "adapter" => "sqlite3", "database" => "db/primary.sqlite3" }
"primary" => { "adapter" => "sqlite3", "database" => "test/db/primary.sqlite3" }
}
}

Expand All @@ -96,7 +96,6 @@ def test_connected?
ActiveRecord::Base.configurations = @prev_configs
ActiveRecord::Base.establish_connection(:arunit)
ENV["RAILS_ENV"] = previous_env
FileUtils.rm_rf "db"
end
end
end
Expand Down

0 comments on commit 82a1362

Please sign in to comment.