2 files changed, 50 insertions, 0 deletions
diff --git a/spec/ruby/library/timeout/error_spec.rb b/spec/ruby/library/timeout/error_spec.rb
new file mode 100644
index 0000000000..6c236e5128
--- /dev/null
+++ b/spec/ruby/library/timeout/error_spec.rb
@@ -0,0 +1,8 @@
+require_relative '../../spec_helper'
+require 'timeout'
+
+describe "Timeout::Error" do
+  it "is a subclass of RuntimeError" do
+    RuntimeError.should be_ancestor_of(Timeout::Error)
+  end
+end
diff --git a/spec/ruby/library/timeout/timeout_spec.rb b/spec/ruby/library/timeout/timeout_spec.rb
new file mode 100644
index 0000000000..584b38d8ec
--- /dev/null
+++ b/spec/ruby/library/timeout/timeout_spec.rb
@@ -0,0 +1,42 @@
+require_relative '../../spec_helper'
+require 'timeout'
+
+describe "Timeout.timeout" do
+  it "raises Timeout::Error when it times out with no specified error type" do
+    -> {
+      Timeout.timeout(1) do
+        sleep
+      end
+    }.should raise_error(Timeout::Error)
+  end
+
+  it "raises specified error type when it times out" do
+    -> do
+      Timeout.timeout(1, StandardError) do
+        sleep
+      end
+    end.should raise_error(StandardError)
+  end
+
+  it "raises specified error type with specified message when it times out" do
+    -> do
+      Timeout.timeout(1, StandardError, "foobar") do
+        sleep
+      end
+    end.should raise_error(StandardError, "foobar")
+  end
+
+  it "raises specified error type with a default message when it times out if message is nil" do
+    -> do
+      Timeout.timeout(1, StandardError, nil) do
+        sleep
+      end
+    end.should raise_error(StandardError, "execution expired")
+  end
+
+  it "returns back the last value in the block" do
+    Timeout.timeout(1) do
+      42
+    end.should == 42
+  end
+end