Use raw Pathname to fix Linux specs.

guard · Dec 15, 2018 · 2908365 · 2908365
1 parent 4665942
commit 2908365
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 12 deletions.
diff --git a/lib/listen/adapter/linux.rb b/lib/listen/adapter/linux.rb
@@ -45,7 +45,7 @@ def _process_event(dir, event)
         # will need to have a custom recursion implemented
         # to properly match events to configured directories
         path = Pathname.new(event.watcher.path) + event.name
-        rel_path = path.relative_path_from(dir.to_s).to_s
+        rel_path = path.relative_path_from(dir).to_s
 
         _log(:debug) { "inotify: #{rel_path} (#{event.flags.inspect})" }
 

diff --git a/spec/lib/listen/adapter/linux_spec.rb b/spec/lib/listen/adapter/linux_spec.rb
@@ -10,17 +10,7 @@
   end
 
   if linux?
-    let(:dir1) do
-      instance_double(
-        Pathname,
-        'dir1',
-        to_s: '/foo/dir1',
-        cleanpath: real_dir1
-      )
-    end
-
-    # just so cleanpath works in above double
-    let(:real_dir1) { instance_double(Pathname, 'dir1', to_s: '/foo/dir1') }
+    let(:dir1) {Pathname.new("/foo/dir1")}
 
     let(:config) { instance_double(Listen::Adapter::Config) }
     let(:queue) { instance_double(Queue) }