sass 3.3.0.alpha.93 → 3.3.0.alpha.101

data/vendor/listen/spec/listen/directory_record_spec.rb

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 require 'spec_helper'
 
 describe Listen::DirectoryRecord do
@@ -41,12 +42,19 @@ describe Listen::DirectoryRecord do
   end
 
   describe '#ignore' do
-    it 'adds the passed paths to the list of ignoted paths in the record' do
+    it 'adds the passed paths to the list of ignored paths in the record' do
       subject.ignore(%r{^\.old/}, %r{\.pid$})
       subject.ignoring_patterns.should include(%r{^\.old/}, %r{\.pid$})
     end
   end
 
+  describe '#ignore!' do
+    it 'replace the ignored paths in the record' do
+      subject.ignore!(%r{^\.old/}, %r{\.pid$})
+      subject.ignoring_patterns.should =~ [%r{^\.old/}, %r{\.pid$}]
+    end
+  end
+
   describe '#filter' do
     it 'adds the passed regexps to the list of filters that determine the stored paths' do
       subject.filter(%r{\.(?:jpe?g|gif|png)}, %r{\.(?:mp3|ogg|a3c)})
@@ -54,6 +62,13 @@ describe Listen::DirectoryRecord do
     end
   end
 
+  describe '#filter!' do
+    it 'replaces the passed regexps in the list of filters that determine the stored paths' do
+      subject.filter!(%r{\.(?:jpe?g|gif|png)}, %r{\.(?:mp3|ogg|a3c)})
+      subject.filtering_patterns.should =~ [%r{\.(?:mp3|ogg|a3c)}, %r{\.(?:jpe?g|gif|png)}]
+    end
+  end
+
   describe '#ignored?' do
     before { subject.stub(:relative_to_base) { |path| path } }
 
@@ -193,7 +208,12 @@ describe Listen::DirectoryRecord do
     it 'returns nil when the passed path is not inside the base-directory' do
       subject.relative_to_base('/tmp/some_random_path').should be_nil
     end
-    
+
+    it 'works with non UTF-8 paths' do
+      path = "tmp/\xE4\xE4"
+      subject.relative_to_base(File.join(base_directory, path))
+    end
+
     context 'when containing regexp characters in the base directory' do
       before do
         fixtures do |path|
@@ -442,6 +462,11 @@ describe Listen::DirectoryRecord do
           it 'detects the modified file the second time if the content have changed' do
             fixtures do |path|
               touch 'existing_file.txt'
+              # Set sha1 path checksum
+              changes(path) do
+                touch 'existing_file.txt'
+              end
+              small_time_difference
 
               changes(path) do
                 touch 'existing_file.txt'
@@ -456,6 +481,58 @@ describe Listen::DirectoryRecord do
               removed.should be_empty
             end
           end
+
+          it "doesn't detects the modified file the second time if just touched - #62" do
+            fixtures do |path|
+              touch 'existing_file.txt'
+              # Set sha1 path checksum
+              changes(path) do
+                touch 'existing_file.txt'
+              end
+              small_time_difference
+
+              changes(path, :use_last_record => true) do
+                open('existing_file.txt', 'w') { |f| f.write('foo') }
+              end
+
+              modified, added, removed = changes(path, :use_last_record => true) do
+                touch 'existing_file.txt'
+              end
+
+              added.should be_empty
+              modified.should be_empty
+              removed.should be_empty
+            end
+          end
+
+          it "adds the path in the paths checksums if just touched - #62" do
+            fixtures do |path|
+              touch 'existing_file.txt'
+              small_time_difference
+
+              changes(path) do
+                touch 'existing_file.txt'
+              end
+
+              @record.sha1_checksums["#{path}/existing_file.txt"].should_not be_nil
+            end
+          end
+
+        it "deletes the path from the paths checksums" do
+          fixtures do |path|
+            touch 'unnecessary.txt'
+
+            changes(path) do
+              @record.sha1_checksums["#{path}/unnecessary.txt"] = 'foo'
+
+              rm 'unnecessary.txt'
+            end
+
+            @record.sha1_checksums["#{path}/unnecessary.txt"].should be_nil
+          end
+        end
+
+
         end
 
         context 'given a hidden file' do
@@ -1092,7 +1169,7 @@ describe Listen::DirectoryRecord do
 
         # simulate a race condition where the file is removed after the
         # change event is tracked, but before the hash is calculated
-        Digest::SHA1.should_receive(:file).and_raise(Errno::ENOENT)
+        Digest::SHA1.should_receive(:file).twice.and_raise(Errno::ENOENT)
 
         lambda {
           fixtures do |path|
@@ -1104,7 +1181,17 @@ describe Listen::DirectoryRecord do
       end
     end
 
-    context 'with symlinks' do
+    context 'within a directory containing a unix domain socket file' do
+      it 'does not raise an exception when hashing a unix domain socket file' do
+        fixtures do |path|
+          require 'socket'
+          UNIXServer.new('unix_domain_socket.sock')
+          lambda { changes(path){} }.should_not raise_error(Errno::ENXIO)
+        end
+      end
+    end
+
+    context 'with symlinks', :unless => windows? do
       it 'looks at symlinks not their targets' do
         fixtures do |path|
           touch 'target'

data/vendor/listen/spec/listen/listener_spec.rb

@@ -84,6 +84,13 @@ describe Listen::Listener do
     end
   end
 
+  describe '#ignore!'do
+    it 'delegates the work to the directory record' do
+      subject.directory_record.should_receive(:ignore!).with 'some_directory'
+      subject.ignore! 'some_directory'
+    end
+  end
+
   describe '#filter' do
     it 'delegates the work to the directory record' do
       subject.directory_record.should_receive(:filter).with /\.txt$/
@@ -91,6 +98,13 @@ describe Listen::Listener do
     end
   end
 
+  describe '#filter!' do
+    it 'delegates the work to the directory record' do
+      subject.directory_record.should_receive(:filter!).with /\.txt$/
+      subject.filter! /\.txt$/
+    end
+  end
+
 
   describe '#on_change' do
     let(:directories) { %w{dir1 dir2 dir3} }

data/vendor/listen/spec/listen/multi_listener_spec.rb

@@ -80,7 +80,7 @@ describe Listen::MultiListener do
     end
   end
 
-  describe '#ignore'do
+  describe '#ignore' do
     it 'delegates the work to each directory record' do
       subject.directories_records.each do |r|
         r.should_receive(:ignore).with 'some_directory'
@@ -89,6 +89,15 @@ describe Listen::MultiListener do
     end
   end
 
+  describe '#ignore!' do
+    it 'delegates the work to each directory record' do
+      subject.directories_records.each do |r|
+        r.should_receive(:ignore!).with 'some_directory'
+      end
+      subject.ignore! 'some_directory'
+    end
+  end
+
   describe '#filter' do
     it 'delegates the work to each directory record' do
       subject.directories_records.each do |r|
@@ -98,6 +107,15 @@ describe Listen::MultiListener do
     end
   end
 
+  describe '#filter!' do
+    it 'delegates the work to each directory record' do
+      subject.directories_records.each do |r|
+        r.should_receive(:filter!).with /\.txt$/
+      end
+      subject.filter! /\.txt$/
+    end
+  end
+
   describe '#on_change' do
     let(:directories) { %w{dir1 dir2 dir3} }
     let(:changes)     { {:modified => [], :added => [], :removed => []} }

data/vendor/listen/spec/spec_helper.rb

@@ -1,7 +1,5 @@
 require 'listen'
 
-ENV["TEST_LATENCY"] ||= "0.25"
-
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }
 
 # See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
@@ -11,8 +9,13 @@ RSpec.configure do |config|
   config.filter_run :focus => true
   config.treat_symbols_as_metadata_keys_with_true_values = true
   config.run_all_when_everything_filtered = true
+  config.filter_run_excluding :broken => true
+  config.fail_fast = true
 end
 
 def test_latency
-  ENV["TEST_LATENCY"].to_f
+  0.1
 end
+
+# Crash loud in tests!
+Thread.abort_on_exception = true

data/vendor/listen/spec/support/adapter_helper.rb

@@ -3,18 +3,29 @@
 # @param [Listen::Listener] listener the adapter listener
 # @param [String] path the path to watch
 #
-def watch(listener, *paths)
-  callback = lambda { |changed_dirs, options| @called = true; listener.on_change(changed_dirs, options) }
-  @adapter = Listen::Adapter.select_and_initialize(paths, { :latency => test_latency }, &callback)
+def watch(listener, expected_changes, *paths)
+  callback = lambda { |changed_dirs, options| @called = true; listener.on_change(changed_dirs) }
+  @adapter = Listen::Adapter.select_and_initialize(paths, { :report_changes => false, :latency => test_latency }, &callback)
+
+  forced_stop = false
+  prevent_deadlock = Proc.new { sleep(10); puts "Forcing stop"; @adapter.stop; forced_stop = true }
+
   @adapter.start(false)
 
   yield
 
-  t = Thread.new { sleep(test_latency * 5); @adapter.stop }
-  @adapter.wait_for_callback
+  t = Thread.new(&prevent_deadlock)
+  @adapter.wait_for_changes(expected_changes)
+
+  unless forced_stop
+    Thread.kill(t)
+    @adapter.report_changes
+  end
 ensure
-  Thread.kill(t) if t
-  @adapter.stop
+  unless forced_stop
+    Thread.kill(t) if t
+    @adapter.stop
+  end
 end
 
 shared_examples_for 'a filesystem adapter' do
@@ -61,7 +72,7 @@ shared_examples_for 'a filesystem adapter' do
 
     context 'with a started adapter' do
       before { subject.start(false) }
-      after { subject.start }
+      after  { subject.stop }
 
       it 'returns true' do
         subject.should be_started
@@ -79,30 +90,26 @@ shared_examples_for 'an adapter that call properly listener#on_change' do |*args
     context 'when a file is created' do
       it 'detects the added file' do
         fixtures do |path|
-          if options[:recursive]
-            listener.should_receive(:on_change).once.with([path], :recursive => true)
-          else
-            listener.should_receive(:on_change).once.with([path], {})
+          listener.should_receive(:on_change).once.with do |array|
+            array.should include(path)
           end
 
-          watch(listener, path) do
+          watch(listener, 1, path) do
             touch 'new_file.rb'
           end
         end
       end
 
-      context 'given a symlink' do
+      context 'given a symlink', :unless => windows? do
         it 'detects the added file' do
           fixtures do |path|
-            if options[:recursive]
-              listener.should_receive(:on_change).once.with([path], :recursive => true)
-            else
-              listener.should_receive(:on_change).once.with([path], {})
+            listener.should_receive(:on_change).once.with do |array|
+              array.should include(path)
             end
 
             touch 'new_file.rb'
 
-            watch(listener, path) do
+            watch(listener, 1, path) do
               ln_s 'new_file.rb', 'new_file_symlink.rb'
             end
           end
@@ -112,18 +119,14 @@ shared_examples_for 'an adapter that call properly listener#on_change' do |*args
       context 'given a new created directory' do
         it 'detects the added file' do
           fixtures do |path|
-            if options[:recursive]
-              listener.should_receive(:on_change).once.with([path], :recursive => true)
-            else
-              listener.should_receive(:on_change).once.with do |array, options|
-                array.should =~ [path, "#{path}/a_directory"]
-              end
+            listener.should_receive(:on_change).once.with do |array|
+              array.should include(path, "#{path}/a_directory")
             end
 
-            watch(listener, path) do
+            watch(listener, 2, path) do
               mkdir 'a_directory'
               # Needed for INotify, because of :recursive rb-inotify custom flag?
-              sleep 0.05 if @adapter.is_a?(Listen::Adapters::Linux)
+              sleep 0.05
               touch 'a_directory/new_file.rb'
             end
           end
@@ -133,15 +136,13 @@ shared_examples_for 'an adapter that call properly listener#on_change' do |*args
       context 'given an existing directory' do
         it 'detects the added file' do
           fixtures do |path|
-            if options[:recursive]
-              listener.should_receive(:on_change).once.with([path], :recursive => true)
-            else
-              listener.should_receive(:on_change).once.with(["#{path}/a_directory"], {})
+            listener.should_receive(:on_change).once.with do |array|
+              array.should include("#{path}/a_directory")
             end
 
             mkdir 'a_directory'
 
-            watch(listener, path) do
+            watch(listener, 1, path) do
               touch 'a_directory/new_file.rb'
             end
           end
@@ -151,15 +152,13 @@ shared_examples_for 'an adapter that call properly listener#on_change' do |*args
       context 'given a directory with subdirectories' do
         it 'detects the added file' do
           fixtures do |path|
-            if options[:recursive]
-              listener.should_receive(:on_change).once.with([path], :recursive => true)
-            else
-              listener.should_receive(:on_change).once.with(["#{path}/a_directory/subdirectory"], {})
+            listener.should_receive(:on_change).once.with do |array|
+              array.should include("#{path}/a_directory/subdirectory")
             end
 
             mkdir_p 'a_directory/subdirectory'
 
-            watch(listener, path) do
+            watch(listener, 1, path) do
               touch 'a_directory/subdirectory/new_file.rb'
             end
           end
@@ -170,33 +169,29 @@ shared_examples_for 'an adapter that call properly listener#on_change' do |*args
     context 'when a file is modified' do
       it 'detects the modified file' do
         fixtures do |path|
-          if options[:recursive]
-            listener.should_receive(:on_change).once.with([path], :recursive => true)
-          else
-            listener.should_receive(:on_change).once.with([path], {})
+          listener.should_receive(:on_change).once.with do |array|
+            array.should include(path)
           end
 
           touch 'existing_file.txt'
 
-          watch(listener, path) do
+          watch(listener, 1, path) do
             touch 'existing_file.txt'
           end
         end
       end
 
-      context 'given a symlink' do
+      context 'given a symlink', :unless => windows? do
         it 'detects the modified file' do
           fixtures do |path|
-            if options[:recursive]
-              listener.should_receive(:on_change).once.with([path], :recursive => true)
-            else
-              listener.should_receive(:on_change).once.with([path], {})
+            listener.should_receive(:on_change).once.with do |array|
+              array.should include(path)
             end
 
             touch 'existing_file.rb'
             ln_s  'existing_file.rb', 'existing_file_symlink.rb'
 
-            watch(listener, path) do
+            watch(listener, 1, path) do
               touch 'existing_file.rb'
             end
           end
@@ -206,36 +201,30 @@ shared_examples_for 'an adapter that call properly listener#on_change' do |*args
       context 'given a hidden file' do
         it 'detects the modified file' do
           fixtures do |path|
-            if options[:recursive]
-              listener.should_receive(:on_change).once.with([path], :recursive => true)
-            else
-              listener.should_receive(:on_change).once.with([path], {})
+            listener.should_receive(:on_change).once.with do |array|
+              array.should include(path)
             end
 
             touch '.hidden'
 
-            watch(listener, path) do
+            watch(listener, 1, path) do
               touch '.hidden'
             end
           end
         end
       end
 
-      unless options[:adapter] == :windows
-        context 'given a file mode change' do
-          it 'does not detect the mode change' do
-            fixtures do |path|
-              if options[:recursive]
-                listener.should_receive(:on_change).once.with([path], :recursive => true)
-              else
-                listener.should_receive(:on_change).once.with([path], {})
-              end
+      context 'given a file mode change', :unless => windows? do
+        it 'does not detect the mode change' do
+          fixtures do |path|
+            listener.should_receive(:on_change).once.with do |array|
+              array.should include(path)
+            end
 
-              touch 'run.rb'
+            touch 'run.rb'
 
-              watch(listener, path) do
-                chmod 0777, 'run.rb'
-              end
+            watch(listener, 1, path) do
+              chmod 0777, 'run.rb'
             end
           end
         end
@@ -244,16 +233,14 @@ shared_examples_for 'an adapter that call properly listener#on_change' do |*args
       context 'given an existing directory' do
         it 'detects the modified file' do
           fixtures do |path|
-            if options[:recursive]
-              listener.should_receive(:on_change).once.with([path], :recursive => true)
-            else
-              listener.should_receive(:on_change).once.with(["#{path}/a_directory"], {})
+            listener.should_receive(:on_change).once.with do |array|
+              array.should include("#{path}/a_directory")
             end
 
             mkdir 'a_directory'
             touch 'a_directory/existing_file.txt'
 
-            watch(listener, path) do
+            watch(listener, 1, path) do
               touch 'a_directory/existing_file.txt'
             end
           end
@@ -263,16 +250,14 @@ shared_examples_for 'an adapter that call properly listener#on_change' do |*args
       context 'given a directory with subdirectories' do
         it 'detects the modified file' do
           fixtures do |path|
-            if options[:recursive]
-              listener.should_receive(:on_change).once.with([path], :recursive => true)
-            else
-              listener.should_receive(:on_change).once.with(["#{path}/a_directory/subdirectory"], {})
+            listener.should_receive(:on_change).once.with do |array|
+              array.should include("#{path}/a_directory/subdirectory")
             end
 
             mkdir_p 'a_directory/subdirectory'
             touch   'a_directory/subdirectory/existing_file.txt'
 
-            watch(listener, path) do
+            watch(listener, 1, path) do
               touch 'a_directory/subdirectory/new_file.rb'
             end
           end
@@ -283,33 +268,29 @@ shared_examples_for 'an adapter that call properly listener#on_change' do |*args
     context 'when a file is moved' do
       it 'detects the file move' do
         fixtures do |path|
-          if options[:recursive]
-            listener.should_receive(:on_change).once.with([path], :recursive => true)
-          else
-            listener.should_receive(:on_change).once.with([path], {})
+          listener.should_receive(:on_change).once.with do |array|
+            array.should include(path)
           end
 
           touch 'move_me.txt'
 
-          watch(listener, path) do
+          watch(listener, 1, path) do
             mv 'move_me.txt', 'new_name.txt'
           end
         end
       end
 
-      context 'given a symlink' do
+      context 'given a symlink', :unless => windows? do
         it 'detects the file move' do
           fixtures do |path|
-            if options[:recursive]
-              listener.should_receive(:on_change).once.with([path], :recursive => true)
-            else
-              listener.should_receive(:on_change).once.with([path], {})
+            listener.should_receive(:on_change).once.with do |array|
+              array.should include(path)
             end
 
             touch 'move_me.rb'
             ln_s  'move_me.rb', 'move_me_symlink.rb'
 
-            watch(listener, path) do
+            watch(listener, 1, path) do
               mv 'move_me_symlink.rb', 'new_symlink.rb'
             end
           end
@@ -319,18 +300,14 @@ shared_examples_for 'an adapter that call properly listener#on_change' do |*args
       context 'given an existing directory' do
         it 'detects the file move into the directory' do
           fixtures do |path|
-            if options[:recursive]
-              listener.should_receive(:on_change).once.with([path], :recursive => true)
-            else
-              listener.should_receive(:on_change).once.with do |array, options|
-                array.should =~ [path, "#{path}/a_directory"]
-              end
+            listener.should_receive(:on_change).once.with do |array|
+              array.should include(path, "#{path}/a_directory")
             end
 
             mkdir 'a_directory'
             touch 'move_me.txt'
 
-            watch(listener, path) do
+            watch(listener, 2, path) do
               mv 'move_me.txt', 'a_directory/move_me.txt'
             end
           end
@@ -338,18 +315,14 @@ shared_examples_for 'an adapter that call properly listener#on_change' do |*args
 
         it 'detects a file move out of the directory' do
           fixtures do |path|
-            if options[:recursive]
-              listener.should_receive(:on_change).once.with([path], :recursive => true)
-            else
-              listener.should_receive(:on_change).once.with do |array, options|
-                array.should =~ [path, "#{path}/a_directory"]
-              end
+            listener.should_receive(:on_change).once.with do |array|
+              array.should include(path, "#{path}/a_directory")
             end
 
             mkdir 'a_directory'
             touch 'a_directory/move_me.txt'
 
-            watch(listener, path) do
+            watch(listener, 2, path) do
               mv 'a_directory/move_me.txt', 'i_am_here.txt'
             end
           end
@@ -357,19 +330,15 @@ shared_examples_for 'an adapter that call properly listener#on_change' do |*args
 
         it 'detects a file move between two directories' do
           fixtures do |path|
-            if options[:recursive]
-              listener.should_receive(:on_change).once.with([path], :recursive => true)
-            else
-              listener.should_receive(:on_change).once.with do |array, options|
-                array.should =~ ["#{path}/from_directory", "#{path}/to_directory"]
-              end
+            listener.should_receive(:on_change).once.with do |array|
+              array.should include("#{path}/from_directory", "#{path}/to_directory")
             end
 
             mkdir 'from_directory'
             touch 'from_directory/move_me.txt'
             mkdir 'to_directory'
 
-            watch(listener, path) do
+            watch(listener, 2, path) do
               mv 'from_directory/move_me.txt', 'to_directory/move_me.txt'
             end
           end
@@ -379,19 +348,15 @@ shared_examples_for 'an adapter that call properly listener#on_change' do |*args
       context 'given a directory with subdirectories' do
         it 'detects files movements between subdirectories' do
           fixtures do |path|
-            if options[:recursive]
-              listener.should_receive(:on_change).once.with([path], :recursive => true)
-            else
-              listener.should_receive(:on_change).once.with do |array, options|
-                array.should =~ ["#{path}/a_directory/subdirectory", "#{path}/b_directory/subdirectory"]
-              end
+            listener.should_receive(:on_change).once.with do |array|
+              array.should include("#{path}/a_directory/subdirectory", "#{path}/b_directory/subdirectory")
             end
 
             mkdir_p 'a_directory/subdirectory'
             mkdir_p 'b_directory/subdirectory'
             touch   'a_directory/subdirectory/move_me.txt'
 
-            watch(listener, path) do
+            watch(listener, 2, path) do
               mv 'a_directory/subdirectory/move_me.txt', 'b_directory/subdirectory'
             end
           end
@@ -402,33 +367,29 @@ shared_examples_for 'an adapter that call properly listener#on_change' do |*args
     context 'when a file is deleted' do
       it 'detects the file removal' do
         fixtures do |path|
-          if options[:recursive]
-            listener.should_receive(:on_change).once.with([path], :recursive => true)
-          else
-            listener.should_receive(:on_change).once.with([path], {})
+          listener.should_receive(:on_change).once.with do |array|
+            array.should include(path)
           end
 
           touch 'unnecessary.txt'
 
-          watch(listener, path) do
+          watch(listener, 1, path) do
             rm 'unnecessary.txt'
           end
         end
       end
 
-      context 'given a symlink' do
+      context 'given a symlink', :unless => windows? do
         it 'detects the file removal' do
           fixtures do |path|
-            if options[:recursive]
-              listener.should_receive(:on_change).once.with([path], :recursive => true)
-            else
-              listener.should_receive(:on_change).once.with([path], {})
+            listener.should_receive(:on_change).once.with do |array|
+              array.should include(path)
             end
 
             touch 'unnecessary.rb'
             ln_s  'unnecessary.rb', 'unnecessary_symlink.rb'
 
-            watch(listener, path) do
+            watch(listener, 1, path) do
               rm 'unnecessary_symlink.rb'
             end
           end
@@ -438,16 +399,14 @@ shared_examples_for 'an adapter that call properly listener#on_change' do |*args
       context 'given an existing directory' do
         it 'detects the file removal' do
           fixtures do |path|
-            if options[:recursive]
-              listener.should_receive(:on_change).once.with([path], :recursive => true)
-            else
-              listener.should_receive(:on_change).once.with(["#{path}/a_directory"], {})
+            listener.should_receive(:on_change).once.with do |array|
+              array.should include("#{path}/a_directory")
             end
 
             mkdir 'a_directory'
             touch 'a_directory/do_not_use.rb'
 
-            watch(listener, path) do
+            watch(listener, 1, path) do
               rm 'a_directory/do_not_use.rb'
             end
           end
@@ -457,16 +416,14 @@ shared_examples_for 'an adapter that call properly listener#on_change' do |*args
       context 'given a directory with subdirectories' do
         it 'detects the file removal' do
           fixtures do |path|
-            if options[:recursive]
-              listener.should_receive(:on_change).once.with([path], :recursive => true)
-            else
-              listener.should_receive(:on_change).once.with(["#{path}/a_directory/subdirectory"], {})
+            listener.should_receive(:on_change).once.with do |array|
+              array.should include("#{path}/a_directory/subdirectory")
             end
 
             mkdir_p 'a_directory/subdirectory'
             touch   'a_directory/subdirectory/do_not_use.rb'
 
-            watch(listener, path) do
+            watch(listener, 1, path) do
               rm 'a_directory/subdirectory/do_not_use.rb'
             end
           end
@@ -478,15 +435,11 @@ shared_examples_for 'an adapter that call properly listener#on_change' do |*args
   context 'multiple file operations' do
     it 'detects the added files' do
       fixtures do |path|
-        if options[:recursive]
-          listener.should_receive(:on_change).at_least(:once).with([path], :recursive => true)
-        else
-          listener.should_receive(:on_change).once.with do |array, options|
-            array.should =~ [path, "#{path}/a_directory"]
-          end
+        listener.should_receive(:on_change).once.with do |array|
+          array.should include(path, "#{path}/a_directory")
         end
 
-        watch(listener, path) do
+        watch(listener, 2, path) do
           touch 'a_file.rb'
           touch 'b_file.rb'
           mkdir 'a_directory'
@@ -501,12 +454,8 @@ shared_examples_for 'an adapter that call properly listener#on_change' do |*args
 
     it 'detects the modified files' do
       fixtures do |path|
-        if options[:recursive]
-          listener.should_receive(:on_change).once.with([path], :recursive => true)
-        else
-          listener.should_receive(:on_change).once.with do |array, options|
-            array.should =~ [path, "#{path}/a_directory"]
-          end
+        listener.should_receive(:on_change).once.with do |array|
+          array.should include(path, "#{path}/a_directory")
         end
 
         touch 'a_file.rb'
@@ -515,7 +464,7 @@ shared_examples_for 'an adapter that call properly listener#on_change' do |*args
         touch 'a_directory/a_file.rb'
         touch 'a_directory/b_file.rb'
 
-        watch(listener, path) do
+        watch(listener, 2, path) do
           touch 'b_file.rb'
           touch 'a_directory/a_file.rb'
         end
@@ -524,12 +473,8 @@ shared_examples_for 'an adapter that call properly listener#on_change' do |*args
 
     it 'detects the removed files' do
       fixtures do |path|
-        if options[:recursive]
-          listener.should_receive(:on_change).once.with([path], :recursive => true)
-        else
-          listener.should_receive(:on_change).once.with do |array, options|
-            array.should =~ [path, "#{path}/a_directory"]
-          end
+        listener.should_receive(:on_change).once.with do |array|
+          array.should include(path, "#{path}/a_directory")
         end
 
         touch 'a_file.rb'
@@ -538,7 +483,7 @@ shared_examples_for 'an adapter that call properly listener#on_change' do |*args
         touch 'a_directory/a_file.rb'
         touch 'a_directory/b_file.rb'
 
-        watch(listener, path) do
+        watch(listener, 2, path) do
           rm 'b_file.rb'
           rm 'a_directory/a_file.rb'
         end
@@ -549,17 +494,15 @@ shared_examples_for 'an adapter that call properly listener#on_change' do |*args
   context 'single directory operations' do
     it 'detects a moved directory' do
       fixtures do |path|
-        if options[:recursive]
-          listener.should_receive(:on_change).once.with([path], :recursive => true)
-        else
-          listener.should_receive(:on_change).once.with([path], {})
+        listener.should_receive(:on_change).once.with do |array|
+          array.should include(path)
         end
 
         mkdir 'a_directory'
         touch 'a_directory/a_file.rb'
         touch 'a_directory/b_file.rb'
 
-        watch(listener, path) do
+        watch(listener, 1, path) do
           mv 'a_directory', 'renamed'
         end
       end
@@ -567,19 +510,15 @@ shared_examples_for 'an adapter that call properly listener#on_change' do |*args
 
     it 'detects a removed directory' do
       fixtures do |path|
-        if options[:recursive]
-          listener.should_receive(:on_change).once.with([path], :recursive => true)
-        else
-          listener.should_receive(:on_change).once.with do |array, options|
-            array.should =~ [path, "#{path}/a_directory"]
-          end
+        listener.should_receive(:on_change).once.with do |array|
+          array.should include(path, "#{path}/a_directory")
         end
 
         mkdir 'a_directory'
         touch 'a_directory/a_file.rb'
         touch 'a_directory/b_file.rb'
 
-        watch(listener, path) do
+        watch(listener, 2, path) do
           rm_rf 'a_directory'
         end
       end
@@ -590,7 +529,7 @@ shared_examples_for 'an adapter that call properly listener#on_change' do |*args
     context 'when a file is created' do
       it "doesn't detects the added file" do
         fixtures do |path|
-          watch(listener, path) do
+          watch(listener, 1, path) do # The expected changes param is set to one!
             @adapter.paused = true
             touch 'new_file.rb'
           end
@@ -604,13 +543,11 @@ shared_examples_for 'an adapter that call properly listener#on_change' do |*args
     context 'when files are added to one of multiple directories' do
       it 'detects added files' do
         fixtures(2) do |path1, path2|
-          if options[:recursive]
-            listener.should_receive(:on_change).once.with([path2], :recursive => true)
-          else
-            listener.should_receive(:on_change).once.with([path2], {})
+          listener.should_receive(:on_change).once.with do |array|
+            array.should include(path2)
           end
 
-          watch(listener, path1, path2) do
+          watch(listener, 1, path1, path2) do
             touch "#{path2}/new_file.rb"
           end
         end
@@ -620,17 +557,11 @@ shared_examples_for 'an adapter that call properly listener#on_change' do |*args
     context 'when files are added to multiple directories' do
       it 'detects added files' do
         fixtures(2) do |path1, path2|
-          if options[:recursive]
-            listener.should_receive(:on_change).once.with do |directories, options|
-              directories.should =~ [path1, path2] && options.should == {:recursive => true}
-            end
-          else
-            listener.should_receive(:on_change).once.with do |directories, options|
-              directories.should =~ [path1, path2] && options.should == {}
-            end
+          listener.should_receive(:on_change).once.with do |array|
+            array.should include(path1, path2)
           end
 
-          watch(listener, path1, path2) do
+          watch(listener, 2, path1, path2) do
             touch "#{path1}/new_file.rb"
             touch "#{path2}/new_file.rb"
           end
@@ -641,20 +572,15 @@ shared_examples_for 'an adapter that call properly listener#on_change' do |*args
     context 'given a new and an existing directory on multiple directories' do
       it 'detects the added file' do
         fixtures(2) do |path1, path2|
-          if options[:recursive]
-            listener.should_receive(:on_change).once.with do |directories, options|
-              directories.should =~ [path1, path2] && options.should == {:recursive => true}
-            end
-          else
-            listener.should_receive(:on_change).once.with do |directories, options|
-              directories.should =~ [path2, "#{path2}/b_directory", "#{path1}/a_directory"] && options.should == {}
-            end
+          listener.should_receive(:on_change).once.with do |array|
+            array.should include(path2, "#{path1}/a_directory", "#{path2}/b_directory")
           end
 
           mkdir "#{path1}/a_directory"
 
-          watch(listener, path1, path2) do
+          watch(listener, 3, path1, path2) do
             mkdir "#{path2}/b_directory"
+            # Needed for INotify
             sleep 0.05
             touch "#{path1}/a_directory/new_file.rb"
             touch "#{path2}/b_directory/new_file.rb"
@@ -666,21 +592,15 @@ shared_examples_for 'an adapter that call properly listener#on_change' do |*args
     context 'when a file is moved between the multiple watched directories' do
       it 'detects the movements of the file' do
         fixtures(3) do |path1, path2, path3|
-          if options[:recursive]
-            listener.should_receive(:on_change).once.with do |directories, options|
-              directories.should =~ [path1, path2, path3] && options.should == {:recursive => true}
-            end
-          else
-            listener.should_receive(:on_change).once.with do |directories, options|
-              directories.should =~ ["#{path1}/from_directory", path2, "#{path3}/to_directory"] && options.should == {}
-            end
+          listener.should_receive(:on_change).once.with do |array|
+            array.should include("#{path1}/from_directory", path2, "#{path3}/to_directory")
           end
 
           mkdir "#{path1}/from_directory"
           touch "#{path1}/from_directory/move_me.txt"
           mkdir "#{path3}/to_directory"
 
-          watch(listener, path1, path2, path3) do
+          watch(listener, 3, path1, path2, path3) do
             mv "#{path1}/from_directory/move_me.txt", "#{path2}/move_me.txt"
             mv "#{path2}/move_me.txt", "#{path3}/to_directory/move_me.txt"
           end
@@ -691,20 +611,14 @@ shared_examples_for 'an adapter that call properly listener#on_change' do |*args
     context 'when files are deleted from the multiple watched directories' do
       it 'detects the files removal' do
         fixtures(2) do |path1, path2|
-          if options[:recursive]
-            listener.should_receive(:on_change).once.with do |directories, options|
-              directories.should =~ [path1, path2] && options.should == {:recursive => true}
-            end
-          else
-            listener.should_receive(:on_change).once.with do |directories, options|
-              directories.should =~ [path1, path2] && options.should == {}
-            end
+          listener.should_receive(:on_change).once.with do |array|
+            array.should include(path1, path2)
           end
 
           touch "#{path1}/unnecessary.txt"
           touch "#{path2}/unnecessary.txt"
 
-          watch(listener, path1, path2) do
+          watch(listener, 2, path1, path2) do
             rm "#{path1}/unnecessary.txt"
             rm "#{path2}/unnecessary.txt"
           end
@@ -712,5 +626,4 @@ shared_examples_for 'an adapter that call properly listener#on_change' do |*args
       end
     end
   end
-
 end