test/URLcrypt_test.rb in urlcrypt-0.1.1 vs test/URLcrypt_test.rb in urlcrypt-0.1.2

@@ -1,65 +1,37 @@
 # encoding: utf-8
-require 'bundler'
-Bundler.require(:default, :test)
+require 'test_helper'
 
-require 'coveralls'
-Coveralls.wear!
-
-require 'test/unit'
-
-class TestURLcrypt < Test::Unit::TestCase
-  
-  require 'URLcrypt'
-  
-  def assert_bytes_equal(string1, string2)
-    bytes1 = string1.bytes.to_a.join(':')
-    bytes2 = string2.bytes.to_a.join(':')
-    assert_equal(bytes1, bytes2)
-  end
-  
-  def assert_decoding(encoded, plain)
-    decoded = URLcrypt.decode(encoded)
-    assert_bytes_equal(plain, decoded)
-  end
-
-  def assert_encoding(encoded, plain)
-    actual = URLcrypt.encode(plain)
-    assert_bytes_equal(encoded, actual)
-  end
-
-  def assert_encode_and_decode(encoded, plain)
-    assert_encoding(encoded, plain)
-    assert_decoding(encoded, plain)
-  end
-
+class TestURLcrypt < TestClass
   def test_empty_string
     assert_encode_and_decode('', '')
   end
 
   def test_encode
     assert_encode_and_decode(
       '111gc86f4nxw5zj1b3qmhpb14n5h25l4m7111',
       "\0\0awesome \n ü string\0\0")
   end
-  
+
   def test_invalid_encoding
     assert_decoding('ZZZZZ', '')
   end
-  
+
   def test_arbitrary_byte_strings
     0.step(1500,17) do |n|
       original = (0..n).map{rand(256).chr}.join
       encoded = URLcrypt::encode(original)
       assert_decoding(encoded, original)
     end
   end
   
   def test_encryption
-    # this key was generated via rake secret in a rails app, the pack() converts it into a byte array
-    URLcrypt::key =
-['d25883a27b9a639da85ea7e159b661218799c9efa63069fac13a6778c954fb6d721968887a19bdb01af8f59eb5a90d256bd9903355c20b0b4b39bf4048b9b17b'].pack('H*')
-    
+    # pack() converts this secret into a byte array
+    secret = ['d25883a27b9a639da85ea7e159b661218799c9efa63069fac13a6778c954fb6d'].pack('H*')
+    URLcrypt::key = secret
+
+    assert_equal  OpenSSL::Cipher.new('aes-256-cbc').key_len, secret.bytesize
+
     original  = "hello world!"
     encrypted = URLcrypt::encrypt(original)
     assert_equal(URLcrypt::decrypt(encrypted), original)
   end