Simplify getting absolute destination pathname

tkareine · Aug 27, 2023 · 13a100f · 13a100f
1 parent a298314
commit 13a100f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/Rakefile b/Rakefile
@@ -11,11 +11,11 @@ def run_jekyll_in_fixture_site(command)
   Dir.chdir('test/fixture/site')
   FileUtils.rm_rf('_site')
 
-  minifier_cmd = File.expand_path(File.join(File.dirname(__FILE__), 'test/fixture/site/_bin/remove_comments'))
+  minifier_cmd = File.expand_path('test/fixture/site/_bin/remove_comments', File.dirname(__FILE__))
   env = {
     'JEKYLL_MINIBUNDLE_CMD_JS'  => minifier_cmd,
     'JEKYLL_MINIBUNDLE_CMD_CSS' => minifier_cmd,
-    'RUBYLIB'                   => File.expand_path(File.join(File.dirname(__FILE__), 'lib'))
+    'RUBYLIB'                   => File.expand_path('lib', File.dirname(__FILE__))
   }
   jekyll_cmd = "jekyll #{command}"
 

diff --git a/test/support/test_case.rb b/test/support/test_case.rb
@@ -15,7 +15,7 @@ class TestCase < ::Minitest::Test
 
     FakeSite = Struct.new('FakeSite', :config, :source, :static_files)
 
-    FIXTURE_DIR = File.expand_path(File.join(File.dirname(__FILE__), '../fixture'))
+    FIXTURE_DIR = File.expand_path('../fixture', File.dirname(__FILE__))
 
     def site_fixture_path(*args)
       File.join(FIXTURE_DIR, 'site', *args)