From 9c3c07b325fbc28a2b1ffcc4a0fc764c35d4bb20 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafael=20Mendon=C3=A7a=20Fran=C3=A7a?=
 <rafaelmfranca@gmail.com>
Date: Fri, 27 Mar 2015 16:29:15 -0300
Subject: [PATCH] Define a setup method instead of using setup as block

setup as block run before setup actlually runs so it will fail for our
case
---
 actionpack/test/dispatch/request_test.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/actionpack/test/dispatch/request_test.rb b/actionpack/test/dispatch/request_test.rb
index ab492665c9..f208cfda89 100644
--- a/actionpack/test/dispatch/request_test.rb
+++ b/actionpack/test/dispatch/request_test.rb
@@ -1128,7 +1128,8 @@ class RequestEtag < BaseRequestTest
 end
 
 class RequestVariant < BaseRequestTest
-  setup do
+  def setup
+    super
     @request = stub_request
   end