Merge remote-tracking branch 'PierreRambaud/master'

* PierreRambaud/master:
  Add sticky? method for File::Stat

Conflicts:
	test/file/stat_test.rb
	test/kernel_test.rb

lib/fakefs/file.rb

@@ -307,7 +307,7 @@ def ftype
         'file'
       end
 
-      # assumes, like above, that all files are readable and writable
+      # assumes, like above, that all files are readable, writable and sticky
       def readable?
         true
       end
@@ -316,6 +316,10 @@ def writable?
         true
       end
 
+      def sticky?
+        true
+      end
+
       # World_writable and readable are platform dependent
       # usually comparing with S_IROTH defined on compilation (MRI)
       def world_writable?

test/file/stat_test.rb

@@ -122,6 +122,11 @@ def test_responds_to_world_writable
     assert File::Stat.new('/foo').world_writable? == 0777
   end
 
+  def test_responds_to_sticky
+    FileUtils.touch("/foo")
+    assert File::Stat.new("/foo").sticky? == true
+  end
+
   def test_responds_to_world_readable
     FileUtils.touch('/foo')
     assert File::Stat.new('/foo').world_readable? == 0777, "#{File::Stat.new('/foo').world_readable?}"