sass 3.3.0 → 3.4.25

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

@@ -4,13 +4,24 @@
 # @param [String] path the path to watch
 #
 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)
+  sleep 0.05 # allow file/creation to be done (!)
+
+  callback = lambda do |changed_directories, options|
+    @called = true
+    listener.on_change(changed_directories)
+  end
+  @adapter = Listen::Adapter.select_and_initialize(paths, { :latency => test_latency }, &callback)
+  @adapter.stub(:start_poller) { nil }
 
   forced_stop = false
-  prevent_deadlock = Proc.new { sleep(10); puts "Forcing stop"; @adapter.stop; forced_stop = true }
+  prevent_deadlock = lambda do
+    sleep(10)
+    puts 'Forcing stop'
+    @adapter.stop
+    forced_stop = true
+  end
 
-  @adapter.start(false)
+  @adapter.start
 
   yield
 
@@ -32,25 +43,51 @@ shared_examples_for 'a filesystem adapter' do
   subject { described_class.new(File.dirname(__FILE__), &Proc.new {}) }
 
   describe '#start' do
+    before { Kernel.stub(:warn) }
     after { subject.stop }
 
-    context 'with the blocking param set to true' do
-      it 'blocks the current thread after starting the workers' do
+    it 'do not block the current thread after starting the workers' do
+      @called = false
+      t = Thread.new { subject.start; @called = true }
+      sleep(test_latency * 3)
+      Thread.kill(t) if t
+      @called.should be_true
+    end
+
+    context 'with the blocking hash option set to false' do
+      subject { described_class.new(File.dirname(__FILE__), { :blocking => false }, &Proc.new {}) }
+
+      it 'does not block the current thread after starting the workers' do
         @called = false
-        t = Thread.new { subject.start(true); @called = true }
+        t = Thread.new { subject.start; @called = true }
         sleep(test_latency * 3)
         Thread.kill(t) if t
-        @called.should be_false
+        @called.should be_true
       end
     end
+  end
 
-    context 'with the blocking param set to false' do
-      it 'does not block the current thread after starting the workers' do
+  describe '#start!' do
+    before { Kernel.stub(:warn) }
+    after { subject.stop }
+
+    it 'blocks the current thread after starting the workers' do
+      @called = false
+      t = Thread.new { subject.start!; @called = true }
+      sleep(test_latency * 3)
+      Thread.kill(t) if t
+      @called.should be_false
+    end
+
+    context 'with the blocking hash option set to false' do
+      subject { described_class.new(File.dirname(__FILE__), { :blocking => true }, &Proc.new {}) }
+
+      it 'blocks the current thread after starting the workers' do
         @called = false
-        t = Thread.new { subject.start(false); @called = true }
+        t = Thread.new { subject.start!; @called = true }
         sleep(test_latency * 3)
         Thread.kill(t) if t
-        @called.should be_true
+        @called.should be_false
       end
     end
   end
@@ -63,7 +100,7 @@ shared_examples_for 'a filesystem adapter' do
     end
 
     context 'with a stopped adapter' do
-      before { subject.start(false); subject.stop }
+      before { subject.start; subject.stop }
 
       it 'returns false' do
         subject.should_not be_started
@@ -71,7 +108,7 @@ shared_examples_for 'a filesystem adapter' do
     end
 
     context 'with a started adapter' do
-      before { subject.start(false) }
+      before { subject.start }
       after  { subject.stop }
 
       it 'returns true' do
@@ -83,7 +120,7 @@ end
 
 shared_examples_for 'an adapter that call properly listener#on_change' do |*args|
   options = (args.first && args.first.is_a?(Hash)) ? args.first : {}
-  let(:listener) { mock(Listen::Listener) }
+  let(:listener) { double(Listen::Listener) }
   before { described_class.stub(:works?) { true } }
 
   context 'single file operations' do

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

@@ -24,7 +24,7 @@ def changes(root_path, options = {})
   paths = options.delete(:paths) || [root_path]
   options[:recursive] = true if options[:recursive].nil?
 
-  changes = @record.fetch_changes(paths, {:relative_paths => true}.merge(options))
+  changes = @record.fetch_changes(paths, { :relative_paths => true }.merge(options))
 
   [changes[:modified], changes[:added], changes[:removed]]
 end
@@ -32,14 +32,15 @@ end
 # Generates a small time difference before performing a time sensitive
 # task (like comparing mtimes of files).
 #
-# @note Modification time for files only includes the milliseconds on Linux with MRI > 1.9.2,
+# @note Modification time for files only includes the milliseconds on Linux with MRI > 1.9.2
+#   and platform that support it (OS X 10.8 not included),
 #   that's why we generate a difference that's greater than 1 second.
 #
 def small_time_difference
   t = Time.now
   diff = t.to_f - t.to_i
 
-  sleep( 1.5 - (diff < 0.5 ? diff : 0.4) )
+  sleep(1.05 - diff)
 end
 
 # Ensures that the test runs at almost the same second at which
@@ -49,7 +50,8 @@ def ensure_same_second
   t = Time.now
   diff = t.to_f - t.to_i
 
-  if diff > 0.1 # We are not at the beginning of a second
-    sleep 1.1 - diff # 1.1 is used instead of 1 to account for the processing time (estimated at 0.1 sec)
+  # We are not at the end of a second
+  if diff >= (1 - Listen::Adapter::DEFAULT_LATENCY)
+    sleep(1.05 - diff)
   end
 end

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

@@ -9,14 +9,37 @@ shared_examples_for 'a listener to changes on a file-system' do
       subject.start
     end
 
-    context 'with the blocking param set to false' do
-      it 'passes the blocking param to the adapter' do
-        adapter.should_receive(:start).with(false)
+    context 'with the blocking deprecated param set to true' do
+      it 'displays a deprecation notice' do
+        Kernel.should_receive(:warn).with(/#{Listen::Listener::BLOCKING_PARAMETER_DEPRECATION_MESSAGE}/)
+        subject.start(true)
+      end
+    end
+
+    context 'with the blocking deprecated param set to false' do
+      it 'displays a deprecation notice' do
+        Kernel.should_receive(:warn).with(/#{Listen::Listener::BLOCKING_PARAMETER_DEPRECATION_MESSAGE}/)
         subject.start(false)
       end
     end
   end
 
+  describe '#start!' do
+    before do
+      subject.stub(:initialize_adapter) { adapter }
+    end
+
+    it 'starts the adapter' do
+      adapter.should_receive(:start!)
+      subject.start!
+    end
+
+    it 'passes the blocking param to the adapter' do
+      adapter.should_receive(:start!)
+      subject.start!
+    end
+  end
+
   context 'with a started listener' do
     before do
       subject.start
@@ -31,7 +54,7 @@ shared_examples_for 'a listener to changes on a file-system' do
 
     describe '#pause' do
       it 'sets adapter.paused to true' do
-        adapter.should_receive(:paused=).with(true)
+        adapter.should_receive(:pause)
         subject.pause
       end
 
@@ -42,7 +65,7 @@ shared_examples_for 'a listener to changes on a file-system' do
 
     describe '#unpause' do
       it 'sets adapter.paused to false' do
-        adapter.should_receive(:paused=).with(false)
+        adapter.should_receive(:unpause)
         subject.unpause
       end
 
@@ -58,12 +81,12 @@ shared_examples_for 'a listener to changes on a file-system' do
       end
 
       it 'returns true when adapter is paused' do
-        adapter.should_receive(:paused) { true }
+        adapter.should_receive(:paused?) { true }
         subject.should be_paused
       end
 
       it 'returns false when adapter is not paused' do
-        adapter.should_receive(:paused) { false }
+        adapter.should_receive(:paused?) { false }
         subject.should_not be_paused
       end
     end