fix tests

lib/minisign/cli.rb

@@ -122,8 +122,8 @@ def self.verify(options)
       signature = Minisign::Signature.new(File.read(options[:x]))
       begin
         verification = public_key.verify(signature, message)
-      rescue StandardError
-        puts 'Signature verification failed'
+      rescue Minisign::SignatureVerificationError => e
+        puts e.message
         exit 1
       end
       return if options[:q]

lib/minisign/public_key.rb

@@ -54,8 +54,8 @@ def verify_comment_signature(signature, comment)
 
     def verify_message_signature(signature, message)
       ed25519_verify_key.verify(signature, blake2b512(message))
-    rescue Ed25519::VerifyError => e
-      raise Minisign::SignatureVerificationError, e
+    rescue Ed25519::VerifyError
+      raise Minisign::SignatureVerificationError, 'Signature verification failed'
     end
 
     def untrusted_comment

spec/minisign/cli_spec.rb

@@ -24,7 +24,6 @@
     end
     it 'does not prompt for a password if -W' do
       keyname = SecureRandom.uuid
-      SecureRandom.uuid
       options = {
         p: "test/generated/cli/#{keyname}.pub",
         s: "test/generated/cli/#{keyname}.key",
@@ -33,6 +32,19 @@
       expect(Minisign::CLI).not_to receive(:prompt)
       Minisign::CLI.generate(options)
     end
+    it 'prints an error message if the passwords dont match' do
+      password = SecureRandom.uuid
+      password_confirmation = SecureRandom.uuid
+      keyname = SecureRandom.uuid
+      options = {
+        p: "test/generated/cli/#{keyname}.pub",
+        s: "test/generated/cli/#{keyname}.key"
+      }
+      allow(Minisign::CLI).to receive(:prompt).and_return(password, password_confirmation)
+      expect do
+        Minisign::CLI.generate(options)
+      end.to raise_error(SystemExit)
+    end
     it 'writes the key files' do
       keyname = SecureRandom.uuid
       password = SecureRandom.uuid
@@ -151,6 +163,16 @@
         Minisign::CLI.verify(options)
       end.not_to raise_error
     end
+    it 'prints an error message' do
+      options = {
+        p: 'test/minisign.pub',
+        m: 'test/example.txt',
+        x: 'test/example.txt.minisig.tampered'
+      }
+      expect do
+        Minisign::CLI.verify(options)
+      end.to raise_error(SystemExit)
+    end
     it 'outputs the message' do
       options = {
         p: 'test/minisign.pub',

spec/minisign/e2e_spec.rb

@@ -48,6 +48,6 @@
     command = 'minisign -Vm test/example.txt -x test/example.txt.minisig.unverifiable -p test/minisign.pub'
     expect(`#{command}`).to match(/Signature verification failed/)
     command = 'minisign -Vm test/example.txt -x test/example.txt.minisig.tampered -p test/minisign.pub'
-    expect(`#{command}`).to match(/Signature verification failed/)
+    expect(`#{command}`).to match(/Comment signature verification failed/)
   end
 end

spec/minisign/public_key_spec.rb

@@ -13,7 +13,7 @@
     @signature = Minisign::Signature.new(File.read('test/example.txt.minisig.unverifiable'))
     expect do
       @pk.verify(@signature, @message)
-    end.to raise_error(Minisign::SignatureVerificationError, 'signature verification failed!')
+    end.to raise_error(Minisign::SignatureVerificationError, 'Signature verification failed')
   end
   it 'verifies trusted comments' do
     @signature = Minisign::Signature.new(File.read('test/example.txt.minisig.tampered'))