diff options
| author | bogdanvlviv <bogdanvlviv@gmail.com> | 2017-10-13 20:47:56 +0300 |
|---|---|---|
| committer | bogdanvlviv <bogdanvlviv@gmail.com> | 2017-10-13 20:47:56 +0300 |
| commit | f1e47b0348bd6c18dd94659af549a25684ca78ff (patch) | |
| tree | 61a1775f824793b2a928f042a4e825b304819648 /activestorage/test | |
| parent | 9434a0047af7bb71fd3a9a25d09b79e29d1395b6 (diff) | |
| download | rails-f1e47b0348bd6c18dd94659af549a25684ca78ff.tar.gz rails-f1e47b0348bd6c18dd94659af549a25684ca78ff.tar.bz2 rails-f1e47b0348bd6c18dd94659af549a25684ca78ff.zip | |
Define path with __dir__ in activestorage/
Related to #29176
Diffstat (limited to 'activestorage/test')
| -rw-r--r-- | activestorage/test/database/setup.rb | 2 | ||||
| -rwxr-xr-x | activestorage/test/dummy/bin/bundle | 2 | ||||
| -rw-r--r-- | activestorage/test/test_helper.rb | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/activestorage/test/database/setup.rb b/activestorage/test/database/setup.rb index 87564499e6..705650a25d 100644 --- a/activestorage/test/database/setup.rb +++ b/activestorage/test/database/setup.rb @@ -3,5 +3,5 @@ require_relative "create_users_migration" ActiveRecord::Base.establish_connection(adapter: "sqlite3", database: ":memory:") -ActiveRecord::Migrator.migrate File.expand_path("../../../db/migrate", __FILE__) +ActiveRecord::Migrator.migrate File.expand_path("../../db/migrate", __dir__) ActiveStorageCreateUsers.migrate(:up) diff --git a/activestorage/test/dummy/bin/bundle b/activestorage/test/dummy/bin/bundle index 277e128251..5015ba6f8b 100755 --- a/activestorage/test/dummy/bin/bundle +++ b/activestorage/test/dummy/bin/bundle @@ -1,5 +1,5 @@ #!/usr/bin/env ruby # frozen_string_literal: true -ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile", __FILE__) +ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../Gemfile", __dir__) load Gem.bin_path("bundler", "bundle") diff --git a/activestorage/test/test_helper.rb b/activestorage/test/test_helper.rb index dd37239060..e206cf1b8b 100644 --- a/activestorage/test/test_helper.rb +++ b/activestorage/test/test_helper.rb @@ -23,7 +23,7 @@ Minitest.backtrace_filter = Minitest::BacktraceFilter.new require "yaml" SERVICE_CONFIGURATIONS = begin - erb = ERB.new(Pathname.new(File.expand_path("../service/configurations.yml", __FILE__)).read) + erb = ERB.new(Pathname.new(File.expand_path("service/configurations.yml", __dir__)).read) configuration = YAML.load(erb.result) || {} configuration.deep_symbolize_keys rescue Errno::ENOENT @@ -38,7 +38,7 @@ ActiveStorage::Service.logger = ActiveSupport::Logger.new(nil) ActiveStorage.verifier = ActiveSupport::MessageVerifier.new("Testing") class ActiveSupport::TestCase - self.file_fixture_path = File.expand_path("../fixtures/files", __FILE__) + self.file_fixture_path = File.expand_path("fixtures/files", __dir__) private def create_blob(data: "Hello world!", filename: "hello.txt", content_type: "text/plain") |