summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--test/app_test.rb3
-rw-r--r--test/test_helper.rb10
2 files changed, 11 insertions, 2 deletions
diff --git a/test/app_test.rb b/test/app_test.rb
index c9496c0..d8f2324 100644
--- a/test/app_test.rb
+++ b/test/app_test.rb
@@ -42,6 +42,7 @@ class AppTest < HCl::TestCase
app.expects(:show).raises(SocketError)
app.expects(:exit).with(1)
app.process_args('show').run
+ assert_match /connection failed/i, error
end
def test_configure_on_auth_failure
@@ -52,6 +53,7 @@ class AppTest < HCl::TestCase
app.expects(:write_config).then(configured.is(true))
app.expects(:show).when(configured.is(true))
app.process_args('show').run
+ assert_match /unable to authenticate/i, error
end
def test_api_failure
@@ -59,6 +61,7 @@ class AppTest < HCl::TestCase
app.expects(:show).raises(HCl::TimesheetResource::Failure)
app.expects(:exit).with(1)
app.process_args('show').run
+ assert_match /API failure/i, error
end
end
diff --git a/test/test_helper.rb b/test/test_helper.rb
index 2fe445e..8e1910a 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -28,7 +28,7 @@ require 'mocha/setup'
require 'fileutils'
require 'fakeweb'
-module IgnoreStderr
+module CaptureOutput
def before_setup
super
$stderr = @stderr = StringIO.new
@@ -39,9 +39,15 @@ module IgnoreStderr
$stderr = STDERR
$stdout = STDOUT
end
+ def error
+ @stderr.string
+ end
+ def output
+ @stdout.string
+ end
end
class HCl::TestCase < MiniTest::Unit::TestCase
- include IgnoreStderr
+ include CaptureOutput
end