1 files changed, 28 insertions, 21 deletions
diff --git a/activesupport/test/message_verifier_test.rb b/activesupport/test/message_verifier_test.rb
index a5748d28ba..668d78492e 100644
--- a/activesupport/test/message_verifier_test.rb
+++ b/activesupport/test/message_verifier_test.rb
@@ -1,12 +1,5 @@
 require 'abstract_unit'
-
-begin
-  require 'openssl'
-  OpenSSL::Digest::SHA1
-rescue LoadError, NameError
-  $stderr.puts "Skipping MessageVerifier test: broken OpenSSL install"
-else
-
+require 'openssl'
 require 'active_support/time'
 require 'active_support/json'
 
@@ -27,21 +20,30 @@ class MessageVerifierTest < ActiveSupport::TestCase
     @data = { :some => "data", :now => Time.local(2010) }
   end
 
+  def test_valid_message
+    data, hash = @verifier.generate(@data).split("--")
+    assert !@verifier.valid_message?(nil)
+    assert !@verifier.valid_message?("")
+    assert !@verifier.valid_message?("\xff") # invalid encoding
+    assert !@verifier.valid_message?("#{data.reverse}--#{hash}")
+    assert !@verifier.valid_message?("#{data}--#{hash.reverse}")
+    assert !@verifier.valid_message?("purejunk")
+  end
+
   def test_simple_round_tripping
     message = @verifier.generate(@data)
+    assert_equal @data, @verifier.verified(message)
     assert_equal @data, @verifier.verify(message)
   end
 
-  def test_missing_signature_raises
-    assert_not_verified(nil)
-    assert_not_verified("")
+  def test_verified_returns_false_on_invalid_message
+    assert !@verifier.verified("purejunk")
   end
 
-  def test_tampered_data_raises
-    data, hash = @verifier.generate(@data).split("--")
-    assert_not_verified("#{data.reverse}--#{hash}")
-    assert_not_verified("#{data}--#{hash.reverse}")
-    assert_not_verified("purejunk")
+  def test_verify_exception_on_invalid_message
+    assert_raise(ActiveSupport::MessageVerifier::InvalidSignature) do
+      @verifier.verify("purejunk")
+    end
   end
 
   def test_alternative_serialization_method
@@ -50,6 +52,7 @@ class MessageVerifierTest < ActiveSupport::TestCase
     verifier = ActiveSupport::MessageVerifier.new("Hey, I'm a secret!", :serializer => JSONSerializer.new)
     message = verifier.generate({ :foo => 123, 'bar' => Time.utc(2010) })
     exp = { "foo" => 123, "bar" => "2010-01-01T00:00:00.000Z" }
+    assert_equal exp, verifier.verified(message)
     assert_equal exp, verifier.verify(message)
   ensure
     ActiveSupport.use_standard_json_time_format = prev
@@ -63,17 +66,21 @@ class MessageVerifierTest < ActiveSupport::TestCase
     #
     valid_message = "BAh7BjoIZm9vbzonTWVzc2FnZVZlcmlmaWVyVGVzdDo6QXV0b2xvYWRDbGFzcwY6CUBmb29JIghmb28GOgZFVA==--f3ef39a5241c365083770566dc7a9eb5d6ace914"
     exception = assert_raise(ArgumentError, NameError) do
+      @verifier.verified(valid_message)
+    end
+    assert_includes ["uninitialized constant MessageVerifierTest::AutoloadClass",
+                    "undefined class/module MessageVerifierTest::AutoloadClass"], exception.message
+    exception = assert_raise(ArgumentError, NameError) do
       @verifier.verify(valid_message)
     end
     assert_includes ["uninitialized constant MessageVerifierTest::AutoloadClass",
                     "undefined class/module MessageVerifierTest::AutoloadClass"], exception.message
   end
 
-  def assert_not_verified(message)
-    assert_raise(ActiveSupport::MessageVerifier::InvalidSignature) do
-      @verifier.verify(message)
+  def test_raise_error_when_secret_is_nil
+    exception = assert_raise(ArgumentError) do
+      ActiveSupport::MessageVerifier.new(nil)
     end
+    assert_equal exception.message, 'Secret should not be nil.'
   end
 end
-
-end