From 330d9b4364d18b14a98e3f6a67325b581714f1f9 Mon Sep 17 00:00:00 2001 From: Olle Jonsson Date: Fri, 13 Mar 2020 22:20:04 +0100 Subject: [PATCH] Ruby 2: use __dir__ instead of File.dirname(__FILE__) (#1341) --- README.de.md | 2 +- README.es.md | 2 +- README.fr.md | 2 +- README.hu.md | 6 +++--- README.ja.md | 2 +- README.ko.md | 2 +- README.md | 2 +- README.pt-br.md | 2 +- README.pt-pt.md | 6 +++--- README.ru.md | 2 +- README.zh.md | 2 +- lib/sinatra/base.rb | 2 +- test/asciidoctor_test.rb | 2 +- test/builder_test.rb | 2 +- test/coffee_test.rb | 2 +- test/creole_test.rb | 2 +- test/encoding_test.rb | 2 +- test/erb_test.rb | 2 +- test/filter_test.rb | 4 ++-- test/haml_test.rb | 2 +- test/helper.rb | 4 ++-- test/helpers_test.rb | 4 ++-- test/less_test.rb | 2 +- test/liquid_test.rb | 2 +- test/markaby_test.rb | 2 +- test/markdown_test.rb | 2 +- test/mediawiki_test.rb | 2 +- test/nokogiri_test.rb | 2 +- test/rabl_test.rb | 2 +- test/radius_test.rb | 2 +- test/rdoc_test.rb | 2 +- test/sass_test.rb | 2 +- test/scss_test.rb | 2 +- test/settings_test.rb | 36 ++++++++++++++++++------------------ test/slim_test.rb | 2 +- test/static_test.rb | 16 ++++++++-------- test/stylus_test.rb | 2 +- test/templates_test.rb | 10 +++++----- test/textile_test.rb | 2 +- test/wlang_test.rb | 2 +- test/yajl_test.rb | 2 +- 41 files changed, 76 insertions(+), 76 deletions(-) diff --git a/README.de.md b/README.de.md index d7c1fb77eb..6a9dfd05e9 100644 --- a/README.de.md +++ b/README.de.md @@ -434,7 +434,7 @@ Statische Dateien werden im `./public`-Ordner erwartet. Es ist möglich, einen anderen Ort zu definieren, indem man die `:public_folder`-Option setzt: ```ruby -set :public_folder, File.dirname(__FILE__) + '/static' +set :public_folder, __dir__ + '/static' ``` Zu beachten ist, dass der Ordnername `public` nicht Teil der URL ist. diff --git a/README.es.md b/README.es.md index de07c3b9eb..6b103c4d0b 100644 --- a/README.es.md +++ b/README.es.md @@ -430,7 +430,7 @@ Los archivos estáticos son servidos desde el directorio público opción `:public_folder`: ```ruby -set :public_folder, File.dirname(__FILE__) + '/static' +set :public_folder, __dir__ + '/static' ``` Note que el nombre del directorio público no está incluido en la URL. Por diff --git a/README.fr.md b/README.fr.md index 89f1e41834..80049cba7a 100644 --- a/README.fr.md +++ b/README.fr.md @@ -400,7 +400,7 @@ end Les fichiers du dossier `./public` sont servis de façon statique. Vous pouvez spécifier un autre dossier avec le paramètre `:public_folder` : ```ruby -set :public_folder, File.dirname(__FILE__) + '/statique' +set :public_folder, __dir__ + '/statique' ``` Notez que le nom du dossier public n'apparait pas dans l'URL. Le fichier diff --git a/README.hu.md b/README.hu.md index 567761cc9c..f6c8239d2b 100644 --- a/README.hu.md +++ b/README.hu.md @@ -120,7 +120,7 @@ A statikus fájlok kiszolgálása a `./public` könyvtárból történik, de természetesen más könyvtárat is megadhatsz erre a célra, mégpedig a :public_folder kapcsoló beállításával: - set :public_folder, File.dirname(__FILE__) + '/static' + set :public_folder, __dir__ + '/static' Fontos megjegyezni, hogy a nyilvános könyvtár neve nem szerepel az URL-ben. A ./public/css/style.css fájl az @@ -131,7 +131,7 @@ A ./public/css/style.css fájl az A sablonfájlokat rendszerint a `./views` könyvtárba helyezzük, de itt is lehetőség nyílik egyéb könyvtár használatára: - set :views, File.dirname(__FILE__) + '/templates' + set :views, __dir__ + '/templates' Nagyon fontos észben tartani, hogy a sablononkra mindig szimbólumokkal hivatkozunk, még akkor is, ha egyéb (ebben az esetben a @@ -700,7 +700,7 @@ De hozzá is adhatod a sinatra/lib könyvtárat a LOAD_PATH-ho az alkalmazásodban: ```ruby - $LOAD_PATH.unshift File.dirname(__FILE__) + '/sinatra/lib' + $LOAD_PATH.unshift __dir__ + '/sinatra/lib' require 'rubygems' require 'sinatra' diff --git a/README.ja.md b/README.ja.md index 60c85aca42..99aff979d9 100644 --- a/README.ja.md +++ b/README.ja.md @@ -386,7 +386,7 @@ end `:public_folder`オプションを指定することで別の場所を指定することができます。 ```ruby -set :public_folder, File.dirname(__FILE__) + '/static' +set :public_folder, __dir__ + '/static' ``` ノート: この静的ファイル用のディレクトリ名はURL中に含まれません。 diff --git a/README.ko.md b/README.ko.md index af124a3413..4ed635368b 100644 --- a/README.ko.md +++ b/README.ko.md @@ -385,7 +385,7 @@ end 변경하려면 `:public_folder` 옵션을 지정하면 됩니다. ```ruby -set :public_folder, File.dirname(__FILE__) + '/static' +set :public_folder, __dir__ + '/static' ``` public 디렉터리명은 URL에 포함되지 않는다는 점에 주의하세요. diff --git a/README.md b/README.md index 1dcd67ccd0..1555fe4c66 100644 --- a/README.md +++ b/README.md @@ -427,7 +427,7 @@ Static files are served from the `./public` directory. You can specify a different location by setting the `:public_folder` option: ```ruby -set :public_folder, File.dirname(__FILE__) + '/static' +set :public_folder, __dir__ + '/static' ``` Note that the public directory name is not included in the URL. A file diff --git a/README.pt-br.md b/README.pt-br.md index 952b377f9e..52928b9d5c 100644 --- a/README.pt-br.md +++ b/README.pt-br.md @@ -444,7 +444,7 @@ Arquivos estáticos são disponibilizados a partir do diretório `:public_folder` ```ruby -set :public_folder, File.dirname(__FILE__) + '/estatico' +set :public_folder, __dir__ + '/estatico' ``` Note que o nome do diretório público não é incluido na URL. Um arquivo diff --git a/README.pt-pt.md b/README.pt-pt.md index 14003ccbbe..27a0789adf 100644 --- a/README.pt-pt.md +++ b/README.pt-pt.md @@ -121,7 +121,7 @@ Arquivos estáticos são disponibilizados a partir do directório `:public_folder` ```ruby -set :public_folder, File.dirname(__FILE__) + '/estatico' +set :public_folder, __dir__ + '/estatico' ``` Note que o nome do directório público não é incluido no URL. Um arquivo @@ -134,7 +134,7 @@ Templates presumem-se estar localizados sob o directório `./views`. Para utilizar um directório de views diferente: ```ruby -set :views, File.dirname(__FILE__) + '/modelo' +set :views, __dir__ + '/modelo' ``` Uma coisa importante a ser lembrada é que você sempre tem as referências @@ -757,7 +757,7 @@ Alternativamente, pode adicionar o directório do `sinatra/lib` no `LOAD_PATH` do seu aplicativo: ```ruby -$LOAD_PATH.unshift File.dirname(__FILE__) + '/sinatra/lib' +$LOAD_PATH.unshift __dir__ + '/sinatra/lib' require 'rubygems' require 'sinatra' diff --git a/README.ru.md b/README.ru.md index 827509cbf3..2aa8aa4f03 100644 --- a/README.ru.md +++ b/README.ru.md @@ -431,7 +431,7 @@ end месторасположение при помощи опции `:public_folder`: ```ruby -set :public_folder, File.dirname(__FILE__) + '/static' +set :public_folder, __dir__ + '/static' ``` Учтите, что имя директории со статическими файлами не включено в URL. diff --git a/README.zh.md b/README.zh.md index c19e3c81f4..483ab25690 100644 --- a/README.zh.md +++ b/README.zh.md @@ -393,7 +393,7 @@ end 静态文件从 `./public` 目录提供服务。可以通过设置`:public_folder` 选项设定一个不同的位置： ```ruby -set :public_folder, File.dirname(__FILE__) + '/static' +set :public_folder, __dir__ + '/static' ``` 请注意 public 目录名并没有包含在 URL 中。文件 `./public/css/style.css` 可以通过 diff --git a/lib/sinatra/base.rb b/lib/sinatra/base.rb index 3b67cc9c43..5a71c293d2 100644 --- a/lib/sinatra/base.rb +++ b/lib/sinatra/base.rb @@ -1864,7 +1864,7 @@ class << self configure :development do get '/__sinatra__/:image.png' do - filename = File.dirname(__FILE__) + "/images/#{params[:image].to_i}.png" + filename = __dir__ + "/images/#{params[:image].to_i}.png" content_type :png send_file filename end diff --git a/test/asciidoctor_test.rb b/test/asciidoctor_test.rb index 556d53fc2d..666c217dd8 100644 --- a/test/asciidoctor_test.rb +++ b/test/asciidoctor_test.rb @@ -6,7 +6,7 @@ class AsciidoctorTest < Minitest::Test def asciidoc_app(&block) mock_app do - set :views, File.dirname(__FILE__) + '/views' + set :views, __dir__ + '/views' get('/', &block) end get '/' diff --git a/test/builder_test.rb b/test/builder_test.rb index 5282bf8178..bf376caf8c 100644 --- a/test/builder_test.rb +++ b/test/builder_test.rb @@ -6,7 +6,7 @@ class BuilderTest < Minitest::Test def builder_app(options = {}, &block) mock_app do - set :views, File.dirname(__FILE__) + '/views' + set :views, __dir__ + '/views' set options get('/', &block) end diff --git a/test/coffee_test.rb b/test/coffee_test.rb index 1739fd0590..25f0367c7c 100644 --- a/test/coffee_test.rb +++ b/test/coffee_test.rb @@ -13,7 +13,7 @@ class CoffeeTest < Minitest::Test def coffee_app(options = {}, &block) mock_app do - set :views, File.dirname(__FILE__) + '/views' + set :views, __dir__ + '/views' set(options) get('/', &block) end diff --git a/test/creole_test.rb b/test/creole_test.rb index d99d295cf2..ad54ba511d 100644 --- a/test/creole_test.rb +++ b/test/creole_test.rb @@ -6,7 +6,7 @@ class CreoleTest < Minitest::Test def creole_app(&block) mock_app do - set :views, File.dirname(__FILE__) + '/views' + set :views, __dir__ + '/views' get('/', &block) end get '/' diff --git a/test/encoding_test.rb b/test/encoding_test.rb index 61a9f9338e..d6415d1124 100644 --- a/test/encoding_test.rb +++ b/test/encoding_test.rb @@ -5,7 +5,7 @@ class BaseTest < Minitest::Test setup do @base = Sinatra.new(Sinatra::Base) - @base.set :views, File.dirname(__FILE__) + "/views" + @base.set :views, __dir__ + "/views" end it 'allows unicode strings in ascii templates per default (1.9)' do diff --git a/test/erb_test.rb b/test/erb_test.rb index 90c616f8a7..86d722d241 100644 --- a/test/erb_test.rb +++ b/test/erb_test.rb @@ -12,7 +12,7 @@ def setup def erb_app(&block) mock_app do - set :views, File.dirname(__FILE__) + '/views' + set :views, __dir__ + '/views' get('/', &block) end get '/' diff --git a/test/filter_test.rb b/test/filter_test.rb index 10ad31ed39..c2a382a4ae 100644 --- a/test/filter_test.rb +++ b/test/filter_test.rb @@ -123,7 +123,7 @@ class BeforeFilterTest < Minitest::Test mock_app do before { ran_filter = true } set :static, true - set :public_folder, File.dirname(__FILE__) + set :public_folder, __dir__ end get "/#{File.basename(__FILE__)}" assert ok? @@ -267,7 +267,7 @@ class AfterFilterTest < Minitest::Test mock_app do after { ran_filter = true } set :static, true - set :public_folder, File.dirname(__FILE__) + set :public_folder, __dir__ end get "/#{File.basename(__FILE__)}" assert ok? diff --git a/test/haml_test.rb b/test/haml_test.rb index f2e713dadf..4e678e1dcf 100644 --- a/test/haml_test.rb +++ b/test/haml_test.rb @@ -6,7 +6,7 @@ class HAMLTest < Minitest::Test def haml_app(&block) mock_app do - set :views, File.dirname(__FILE__) + '/views' + set :views, __dir__ + '/views' get('/', &block) end get '/' diff --git a/test/helper.rb b/test/helper.rb index afbc50a215..1b1315eb4b 100644 --- a/test/helper.rb +++ b/test/helper.rb @@ -14,10 +14,10 @@ require 'rack' -testdir = File.dirname(__FILE__) +testdir = __dir__ $LOAD_PATH.unshift testdir unless $LOAD_PATH.include?(testdir) -libdir = File.dirname(File.dirname(__FILE__)) + '/lib' +libdir = File.dirname(__dir__) + '/lib' $LOAD_PATH.unshift libdir unless $LOAD_PATH.include?(libdir) require 'minitest' diff --git a/test/helpers_test.rb b/test/helpers_test.rb index 463a21d009..60489624a6 100644 --- a/test/helpers_test.rb +++ b/test/helpers_test.rb @@ -785,7 +785,7 @@ def attachment_app(filename=nil) describe 'send_file' do setup do - @file = File.dirname(__FILE__) + '/file.txt' + @file = __dir__ + '/file.txt' File.open(@file, 'wb') { |io| io.write('Hello World') } end @@ -898,7 +898,7 @@ def send_file_app(opts={}) end it "is able to send files with unknown mime type" do - @file = File.dirname(__FILE__) + '/file.foobar' + @file = __dir__ + '/file.foobar' File.open(@file, 'wb') { |io| io.write('Hello World') } send_file_app get '/file.txt' diff --git a/test/less_test.rb b/test/less_test.rb index 87d263f212..3b2a783a5e 100644 --- a/test/less_test.rb +++ b/test/less_test.rb @@ -6,7 +6,7 @@ class LessTest < Minitest::Test def less_app(options = {}, &block) mock_app do - set :views, File.dirname(__FILE__) + '/views' + set :views, __dir__ + '/views' set options get('/', &block) end diff --git a/test/liquid_test.rb b/test/liquid_test.rb index 83649c0721..af32a707f6 100644 --- a/test/liquid_test.rb +++ b/test/liquid_test.rb @@ -6,7 +6,7 @@ class LiquidTest < Minitest::Test def liquid_app(&block) mock_app do - set :views, File.dirname(__FILE__) + '/views' + set :views, __dir__ + '/views' get('/', &block) end get '/' diff --git a/test/markaby_test.rb b/test/markaby_test.rb index 3227d1c9a5..b1aecf9b21 100644 --- a/test/markaby_test.rb +++ b/test/markaby_test.rb @@ -6,7 +6,7 @@ class MarkabyTest < Minitest::Test def markaby_app(&block) mock_app do - set :views, File.dirname(__FILE__) + '/views' + set :views, __dir__ + '/views' get('/', &block) end get '/' diff --git a/test/markdown_test.rb b/test/markdown_test.rb index b363d40616..9112b97611 100644 --- a/test/markdown_test.rb +++ b/test/markdown_test.rb @@ -3,7 +3,7 @@ MarkdownTest = proc do def markdown_app(&block) mock_app do - set :views, File.dirname(__FILE__) + '/views' + set :views, __dir__ + '/views' get('/', &block) end get '/' diff --git a/test/mediawiki_test.rb b/test/mediawiki_test.rb index 3bb2ece390..4bd53832f6 100644 --- a/test/mediawiki_test.rb +++ b/test/mediawiki_test.rb @@ -6,7 +6,7 @@ class MediaWikiTest < Minitest::Test def mediawiki_app(&block) mock_app do - set :views, File.dirname(__FILE__) + '/views' + set :views, __dir__ + '/views' get('/', &block) end get '/' diff --git a/test/nokogiri_test.rb b/test/nokogiri_test.rb index 43a3d16e06..6b6e175b47 100644 --- a/test/nokogiri_test.rb +++ b/test/nokogiri_test.rb @@ -6,7 +6,7 @@ class NokogiriTest < Minitest::Test def nokogiri_app(&block) mock_app do - set :views, File.dirname(__FILE__) + '/views' + set :views, __dir__ + '/views' get('/', &block) end get '/' diff --git a/test/rabl_test.rb b/test/rabl_test.rb index f2ebdc9623..997726b461 100644 --- a/test/rabl_test.rb +++ b/test/rabl_test.rb @@ -9,7 +9,7 @@ class RablTest < Minitest::Test def rabl_app(&block) mock_app { - set :views, File.dirname(__FILE__) + '/views' + set :views, __dir__ + '/views' get '/', &block } get '/' diff --git a/test/radius_test.rb b/test/radius_test.rb index cc3f40a3e7..3618745049 100644 --- a/test/radius_test.rb +++ b/test/radius_test.rb @@ -6,7 +6,7 @@ class RadiusTest < Minitest::Test def radius_app(&block) mock_app do - set :views, File.dirname(__FILE__) + '/views' + set :views, __dir__ + '/views' get('/', &block) end get '/' diff --git a/test/rdoc_test.rb b/test/rdoc_test.rb index 62ddbe8497..dd730bb906 100644 --- a/test/rdoc_test.rb +++ b/test/rdoc_test.rb @@ -7,7 +7,7 @@ class RdocTest < Minitest::Test def rdoc_app(&block) mock_app do - set :views, File.dirname(__FILE__) + '/views' + set :views, __dir__ + '/views' get('/', &block) end get '/' diff --git a/test/sass_test.rb b/test/sass_test.rb index 94c0462baa..08e5d631a1 100644 --- a/test/sass_test.rb +++ b/test/sass_test.rb @@ -6,7 +6,7 @@ class SassTest < Minitest::Test def sass_app(options = {}, &block) mock_app do - set :views, File.dirname(__FILE__) + '/views' + set :views, __dir__ + '/views' set options get('/', &block) end diff --git a/test/scss_test.rb b/test/scss_test.rb index ee5d34d8cc..41fe5b99d7 100644 --- a/test/scss_test.rb +++ b/test/scss_test.rb @@ -6,7 +6,7 @@ class ScssTest < Minitest::Test def scss_app(options = {}, &block) mock_app do - set :views, File.dirname(__FILE__) + '/views' + set :views, __dir__ + '/views' set options get('/', &block) end diff --git a/test/settings_test.rb b/test/settings_test.rb index 8b9c137911..dcf7b2aa0b 100644 --- a/test/settings_test.rb +++ b/test/settings_test.rb @@ -383,13 +383,13 @@ def foo=(value) it 'is enabled on Base when public_folder is set and exists' do @base.set :environment, :development - @base.set :public_folder, File.dirname(__FILE__) + @base.set :public_folder, __dir__ assert @base.static? end it 'is enabled on Base when root is set and root/public_folder exists' do @base.set :environment, :development - @base.set :root, File.dirname(__FILE__) + @base.set :root, __dir__ assert @base.static? end @@ -399,13 +399,13 @@ def foo=(value) it 'is enabled on Application when public_folder is set and exists' do @application.set :environment, :development - @application.set :public_folder, File.dirname(__FILE__) + @application.set :public_folder, __dir__ assert @application.static? end it 'is enabled on Application when root is set and root/public_folder exists' do @application.set :environment, :development - @application.set :root, File.dirname(__FILE__) + @application.set :root, __dir__ assert @application.static? end @@ -480,10 +480,10 @@ def pub; end it 'is equal to the expanded basename of app_file' do @base.app_file = __FILE__ - assert_equal File.expand_path(File.dirname(__FILE__)), @base.root + assert_equal File.expand_path(__dir__), @base.root @application.app_file = __FILE__ - assert_equal File.expand_path(File.dirname(__FILE__)), @application.root + assert_equal File.expand_path(__dir__), @application.root end end @@ -494,11 +494,11 @@ def pub; end end it 'is set to root joined with views/' do - @base.root = File.dirname(__FILE__) - assert_equal File.dirname(__FILE__) + "/views", @base.views + @base.root = __dir__ + assert_equal __dir__ + "/views", @base.views - @application.root = File.dirname(__FILE__) - assert_equal File.dirname(__FILE__) + "/views", @application.views + @application.root = __dir__ + assert_equal __dir__ + "/views", @application.views end end @@ -509,22 +509,22 @@ def pub; end end it 'is set to root joined with public/' do - @base.root = File.dirname(__FILE__) - assert_equal File.dirname(__FILE__) + "/public", @base.public_folder + @base.root = __dir__ + assert_equal __dir__ + "/public", @base.public_folder - @application.root = File.dirname(__FILE__) - assert_equal File.dirname(__FILE__) + "/public", @application.public_folder + @application.root = __dir__ + assert_equal __dir__ + "/public", @application.public_folder end end describe 'public_dir' do it 'is an alias for public_folder' do - @base.public_dir = File.dirname(__FILE__) - assert_equal File.dirname(__FILE__), @base.public_dir + @base.public_dir = __dir__ + assert_equal __dir__, @base.public_dir assert_equal @base.public_folder, @base.public_dir - @application.public_dir = File.dirname(__FILE__) - assert_equal File.dirname(__FILE__), @application.public_dir + @application.public_dir = __dir__ + assert_equal __dir__, @application.public_dir assert_equal @application.public_folder, @application.public_dir end end diff --git a/test/slim_test.rb b/test/slim_test.rb index 989ba6fa9d..cd3726ccc8 100644 --- a/test/slim_test.rb +++ b/test/slim_test.rb @@ -6,7 +6,7 @@ class SlimTest < Minitest::Test def slim_app(&block) mock_app do - set :views, File.dirname(__FILE__) + '/views' + set :views, __dir__ + '/views' get('/', &block) end get '/' diff --git a/test/static_test.rb b/test/static_test.rb index 5c166af623..b5adbf312c 100644 --- a/test/static_test.rb +++ b/test/static_test.rb @@ -4,7 +4,7 @@ class StaticTest < Minitest::Test setup do mock_app do set :static, true - set :public_folder, File.dirname(__FILE__) + set :public_folder, __dir__ end end @@ -90,7 +90,7 @@ class StaticTest < Minitest::Test it '404s when .. path traverses outside of public directory' do mock_app do set :static, true - set :public_folder, File.dirname(__FILE__) + '/data' + set :public_folder, __dir__ + '/data' end get "/../#{File.basename(__FILE__)}" assert not_found? @@ -131,7 +131,7 @@ def assert_valid_range(http_range, range, path, file) it 'handles valid byte ranges correctly' do # Use the biggest file in this dir so we can test ranges > 8k bytes. (StaticFile sends in 8k chunks.) - path = File.dirname(__FILE__) + '/helpers_test.rb' # currently 16k bytes + path = __dir__ + '/helpers_test.rb' # currently 16k bytes file = File.read(path) length = file.length assert length > 9000, "The test file #{path} is too short (#{length} bytes) to run these tests" @@ -222,7 +222,7 @@ def assert_valid_range(http_range, range, path, file) it 'renders static assets with custom status via options' do mock_app do set :static, true - set :public_folder, File.dirname(__FILE__) + set :public_folder, __dir__ post '/*' do static!(:status => params[:status]) @@ -239,12 +239,12 @@ def assert_valid_range(http_range, range, path, file) it 'serves files with a + sign in the path' do mock_app do set :static, true - set :public_folder, File.join(File.dirname(__FILE__), 'public') + set :public_folder, File.join(__dir__, 'public') end get "/hello+world.txt" - real_path = File.join(File.dirname(__FILE__), 'public', 'hello+world.txt') + real_path = File.join(__dir__, 'public', 'hello+world.txt') assert ok? assert_equal File.read(real_path), body assert_equal File.size(real_path).to_s, response['Content-Length'] @@ -254,12 +254,12 @@ def assert_valid_range(http_range, range, path, file) it 'serves files with a URL encoded + sign (%2B) in the path' do mock_app do set :static, true - set :public_folder, File.join(File.dirname(__FILE__), 'public') + set :public_folder, File.join(__dir__, 'public') end get "/hello%2bworld.txt" - real_path = File.join(File.dirname(__FILE__), 'public', 'hello+world.txt') + real_path = File.join(__dir__, 'public', 'hello+world.txt') assert ok? assert_equal File.read(real_path), body assert_equal File.size(real_path).to_s, response['Content-Length'] diff --git a/test/stylus_test.rb b/test/stylus_test.rb index 2e6ae8be3c..bd3f49debd 100644 --- a/test/stylus_test.rb +++ b/test/stylus_test.rb @@ -13,7 +13,7 @@ class StylusTest < Minitest::Test def stylus_app(options = {}, &block) mock_app do - set :views, File.dirname(__FILE__) + '/views' + set :views, __dir__ + '/views' set(options) get('/', &block) end diff --git a/test/templates_test.rb b/test/templates_test.rb index 63adc1eb7c..08a99ca8b2 100644 --- a/test/templates_test.rb +++ b/test/templates_test.rb @@ -1,6 +1,6 @@ # encoding: UTF-8 require File.expand_path('../helper', __FILE__) -File.delete(File.dirname(__FILE__) + '/views/layout.test') rescue nil +File.delete(__dir__ + '/views/layout.test') rescue nil class TestTemplate < Tilt::Template def prepare @@ -18,7 +18,7 @@ class TemplatesTest < Minitest::Test def render_app(base=Sinatra::Base, options = {}, &block) base, options = Sinatra::Base, base if base.is_a? Hash mock_app(base) do - set :views, File.dirname(__FILE__) + '/views' + set :views, __dir__ + '/views' set options get('/', &block) template(:layout3) { "Layout 3!\n" } @@ -27,7 +27,7 @@ def render_app(base=Sinatra::Base, options = {}, &block) end def with_default_layout - layout = File.dirname(__FILE__) + '/views/layout.test' + layout = __dir__ + '/views/layout.test' File.open(layout, 'wb') { |io| io.write "Layout!\n" } yield ensure @@ -314,7 +314,7 @@ def with_default_layout assert_equal 'template in superclass', base.templates[:foo].first.call mock_app(base) do - set :views, File.dirname(__FILE__) + '/views' + set :views, __dir__ + '/views' template(:foo) { 'template in subclass' } get('/') { render :test, :foo } end @@ -373,7 +373,7 @@ def some_scope.foo() 'World!' end it "is possible to use custom logic for finding template files" do mock_app do - set :views, ["a", "b"].map { |d| File.dirname(__FILE__) + '/views/' + d } + set :views, ["a", "b"].map { |d| __dir__ + '/views/' + d } def find_template(views, name, engine, &block) Array(views).each { |v| super(v, name, engine, &block) } end diff --git a/test/textile_test.rb b/test/textile_test.rb index 9af686a2f9..03243bbd20 100644 --- a/test/textile_test.rb +++ b/test/textile_test.rb @@ -6,7 +6,7 @@ class TextileTest < Minitest::Test def textile_app(&block) mock_app do - set :views, File.dirname(__FILE__) + '/views' + set :views, __dir__ + '/views' get('/', &block) end get '/' diff --git a/test/wlang_test.rb b/test/wlang_test.rb index e64c6b71c6..ef8a713827 100644 --- a/test/wlang_test.rb +++ b/test/wlang_test.rb @@ -10,7 +10,7 @@ def engine def wlang_app(&block) mock_app { - set :views, File.dirname(__FILE__) + '/views' + set :views, __dir__ + '/views' get '/', &block } get '/' diff --git a/test/yajl_test.rb b/test/yajl_test.rb index 7c4acef014..1f090da9b0 100644 --- a/test/yajl_test.rb +++ b/test/yajl_test.rb @@ -6,7 +6,7 @@ class YajlTest < Minitest::Test def yajl_app(&block) mock_app do - set :views, File.dirname(__FILE__) + '/views' + set :views, __dir__ + '/views' get('/', &block) end get '/'