all tests for valid? passing

jpmckinney · May 30, 2013 · 4be6960 · 4be6960
1 parent 4fff2d0
commit 4be6960
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/coverage/.resultset.json b/coverage/.resultset.json
@@ -592,7 +592,6 @@
         null,
         null,
         null,
-        null,
         1,
         2,
         null,
@@ -601,6 +600,6 @@
         null
       ]
     },
-    "timestamp": 1369861766
+    "timestamp": 1369923152
   }
 }
diff --git a/lib/multi_mail/mandrill/receiver.rb b/lib/multi_mail/mandrill/receiver.rb
@@ -108,7 +108,7 @@ def valid?(params)
           signed_data << (key.to_s + value.to_s)
         end
         key = Base64.encode64(Digest::HMAC.digest(signed_data,@mandrill_webhook_key,Digest::SHA1)).strip
-        key == params['env']['HTTP_X_MANDRILL_SIGNATURE']
+        key == params.fetch('env').fetch('HTTP_X_MANDRILL_SIGNATURE')
       end
 
       # Returns whether a message is spam.

diff --git a/spec/mandrill/receiver_spec.rb b/spec/mandrill/receiver_spec.rb
@@ -24,9 +24,9 @@ def params(fixture)
         service.valid?(params('invalid')).should == false
       end
 
-#      it 'should raise an error if parameters are missing' do
-#        expect{ service.valid?(params('missing')) }.to raise_error(IndexError)
-#      end
+      it 'should raise an error if parameters are missing' do
+        expect{ service.valid?(params('missing')) }.to raise_error(IndexError)
+      end
     end