From 93ef783e3ff4af1dbcd55003de11625da87ad53a Mon Sep 17 00:00:00 2001
From: George Claghorn <george@basecamp.com>
Date: Thu, 7 Jun 2018 16:05:41 -0400
Subject: Revert "Merge pull request #33085 from
 bogdanvlviv/refactor-attached_test.rb"

This reverts commit 07c035e72dd2267c2a45a7ddd2450687d6329b5b, reversing
changes made to 7b33903d7f30027fe99e4632c5517f0c469b3424.
---
 activestorage/test/models/attached_test.rb | 40 ++++++++++++++----------------
 1 file changed, 19 insertions(+), 21 deletions(-)

(limited to 'activestorage')

diff --git a/activestorage/test/models/attached_test.rb b/activestorage/test/models/attached_test.rb
index 74bb3e6eaa..14395e12df 100644
--- a/activestorage/test/models/attached_test.rb
+++ b/activestorage/test/models/attached_test.rb
@@ -4,6 +4,8 @@ require "test_helper"
 require "database/setup"
 
 class ActiveStorage::AttachmentsTest < ActiveSupport::TestCase
+  include ActiveJob::TestHelper
+
   setup do
     @user = User.create!(name: "Josh")
   end
@@ -17,18 +19,16 @@ class ActiveStorage::AttachmentsTest < ActiveSupport::TestCase
     # inherited only
     assert_equal "funky.jpg", @user.avatar.filename.to_s
 
-    begin
-      User.class_eval do
-        def avatar
-          super.filename.to_s.reverse
-        end
+    User.class_eval do
+      def avatar
+        super.filename.to_s.reverse
       end
-
-      # override with super
-      assert_equal "funky.jpg".reverse, @user.avatar
-    ensure
-      User.remove_method :avatar
     end
+
+    # override with super
+    assert_equal "funky.jpg".reverse, @user.avatar
+
+    User.send(:remove_method, :avatar)
   end
 
   test "overriding has_many_attached methods works" do
@@ -39,18 +39,16 @@ class ActiveStorage::AttachmentsTest < ActiveSupport::TestCase
     assert_equal "funky.jpg", @user.highlights.first.filename.to_s
     assert_equal "wonky.jpg", @user.highlights.second.filename.to_s
 
-    begin
-      User.class_eval do
-        def highlights
-          super.reverse
-        end
+    User.class_eval do
+      def highlights
+        super.reverse
       end
-
-      # override with super
-      assert_equal "wonky.jpg", @user.highlights.first.filename.to_s
-      assert_equal "funky.jpg", @user.highlights.second.filename.to_s
-    ensure
-      User.remove_method :highlights
     end
+
+    # override with super
+    assert_equal "wonky.jpg", @user.highlights.first.filename.to_s
+    assert_equal "funky.jpg", @user.highlights.second.filename.to_s
+
+    User.send(:remove_method, :highlights)
   end
 end
-- 
cgit v1.2.3