test/test_image_finder.rb in review-3.0.0.preview4 vs test/test_image_finder.rb in review-3.0.0.rc1

@@ -10,11 +10,11 @@
   end
 
   def test_find_path_pattern1
     dir = Dir.mktmpdir
     begin
-      path = dir + '/builder/ch01/foo.jpg'
+      path = File.join(dir, 'builder/ch01/foo.jpg')
       FileUtils.mkdir_p(File.dirname(path))
       FileUtils.touch(path)
 
       finder = ReVIEW::Book::ImageFinder.new(dir, 'ch01', 'builder', ['.jpg'])
       assert_equal(path, finder.find_path('foo'))
@@ -24,11 +24,11 @@
   end
 
   def test_find_path_pattern2
     dir = Dir.mktmpdir
     begin
-      path = dir + '/builder/ch01-foo.jpg'
+      path = File.join(dir, 'builder/ch01-foo.jpg')
       FileUtils.mkdir_p(File.dirname(path))
       FileUtils.touch(path)
 
       finder = ReVIEW::Book::ImageFinder.new(dir, 'ch01', 'builder', ['.jpg'])
       assert_equal(path, finder.find_path('foo'))
@@ -38,11 +38,11 @@
   end
 
   def test_find_path_pattern3
     dir = Dir.mktmpdir
     begin
-      path = dir + '/builder/foo.jpg'
+      path = File.join(dir, 'builder/foo.jpg')
       FileUtils.mkdir_p(File.dirname(path))
       FileUtils.touch(path)
 
       finder = ReVIEW::Book::ImageFinder.new(dir, 'ch01', 'builder', ['.jpg'])
       assert_equal(path, finder.find_path('foo'))
@@ -52,11 +52,11 @@
   end
 
   def test_find_path_pattern4
     dir = Dir.mktmpdir
     begin
-      path = dir + '/ch01/foo.jpg'
+      path = File.join(dir, 'ch01/foo.jpg')
       FileUtils.mkdir_p(File.dirname(path))
       FileUtils.touch(path)
 
       finder = ReVIEW::Book::ImageFinder.new(dir, 'ch01', 'builder', ['.jpg'])
       assert_equal(path, finder.find_path('foo'))
@@ -66,11 +66,11 @@
   end
 
   def test_find_path_pattern5
     dir = Dir.mktmpdir
     begin
-      path = dir + '/ch01-foo.jpg'
+      path = File.join(dir, 'ch01-foo.jpg')
       FileUtils.mkdir_p(File.dirname(path))
       FileUtils.touch(path)
 
       finder = ReVIEW::Book::ImageFinder.new(dir, 'ch01', 'builder', ['.jpg'])
       assert_equal(path, finder.find_path('foo'))
@@ -80,15 +80,15 @@
   end
 
   def test_find_path_dir_symlink
     dir = Dir.mktmpdir
     begin
-      path_src = dir + '/src'
-      path_dst = dir + '/ch01'
+      path_src = File.join(dir, 'src')
+      path_dst = File.join(dir, 'ch01')
       FileUtils.mkdir_p(path_src)
       FileUtils.symlink(path_src, path_dst)
-      path_srcimg = path_src + '/foo.jpg'
-      path_dstimg = path_dst + '/foo.jpg'
+      path_srcimg = File.join(path_src, 'foo.jpg')
+      path_dstimg = File.join(path_dst, 'foo.jpg')
       FileUtils.touch(path_srcimg)
 
       finder = ReVIEW::Book::ImageFinder.new(dir, 'ch01', 'builder', ['.jpg'])
       assert_equal(path_dstimg, finder.find_path('foo'))
     ensure