Merge pull request #21 from p0deje/spec_fix

Fix specs

.travis.yml

@@ -1,12 +1,12 @@
---- 
-rvm: 
+---
+rvm:
 - 1.8.7
 - 1.9.2
 - 1.9.3
-- rbx
-- rbx-2.0
+- rbx-18mode
+- rbx-19mode
 - jruby
 - ruby-head
-notifications: 
-  recipients: 
+notifications:
+  recipients:
   - k.haase@finn.de

spec/http_origin_spec.rb

@@ -3,6 +3,13 @@
 describe Rack::Protection::HttpOrigin do
   it_behaves_like "any rack application"
 
+  before(:each) do
+    mock_app do
+      use Rack::Protection::HttpOrigin
+      run DummyApp
+    end
+  end
+
   %w(GET HEAD POST PUT DELETE).each do |method|
     it "accepts #{method} requests with no Origin" do
       send(method.downcase, '/').should be_ok
@@ -11,20 +18,12 @@
 
   %w(GET HEAD).each do |method|
     it "accepts #{method} requests with non-whitelisted Origin" do
-      mock_app do
-        use Rack::Protection::HttpOrigin
-        run DummyApp
-      end
       send(method.downcase, '/', {}, 'HTTP_ORIGIN' => 'http://malicious.com').should be_ok
     end
   end
 
   %w(POST PUT DELETE).each do |method|
     it "denies #{method} requests with non-whitelisted Origin" do
-      mock_app do
-        use Rack::Protection::HttpOrigin
-        run DummyApp
-      end
       send(method.downcase, '/', {}, 'HTTP_ORIGIN' => 'http://malicious.com').should_not be_ok
     end
 

spec/spec_helper.rb

@@ -24,7 +24,8 @@ def prepare_session(env)
 module DummyApp
   def self.call(env)
     Thread.current[:last_env] = env
-    [200, {'Content-Type' => 'text/plain'}, ['ok']]
+    body = (env['REQUEST_METHOD'] == 'HEAD' ? '' : 'ok')
+    [200, {'Content-Type' => 'text/plain'}, [body]]
   end
 end