diff options
| author | bogdanvlviv <bogdanvlviv@gmail.com> | 2018-06-07 20:42:23 +0300 |
|---|---|---|
| committer | bogdanvlviv <bogdanvlviv@gmail.com> | 2018-06-07 20:55:07 +0300 |
| commit | 9e2b9c83851532f42d4dede4118abeaef18be234 (patch) | |
| tree | cb99521a2167958f6313e05ba37009fc4acb90be /activestorage | |
| parent | 35730055174c3b4b4dd2b08fc743e425310d5131 (diff) | |
| download | rails-9e2b9c83851532f42d4dede4118abeaef18be234.tar.gz rails-9e2b9c83851532f42d4dede4118abeaef18be234.tar.bz2 rails-9e2b9c83851532f42d4dede4118abeaef18be234.zip | |
Refactor activestorage/test/models/attached_test.rb
Don't include `ActiveJob::TestHelper` since there is no test that uses it.
Ensure removing of overridden User's methods.
Don't use `send` to execute `remove_method` since it is public.
Related to fd0bd1bf682622f064ac437ceee4e1b2a6b6d3b9
Diffstat (limited to 'activestorage')
| -rw-r--r-- | activestorage/test/models/attached_test.rb | 40 |
1 files changed, 21 insertions, 19 deletions
diff --git a/activestorage/test/models/attached_test.rb b/activestorage/test/models/attached_test.rb index 14395e12df..74bb3e6eaa 100644 --- a/activestorage/test/models/attached_test.rb +++ b/activestorage/test/models/attached_test.rb @@ -4,8 +4,6 @@ require "test_helper" require "database/setup" class ActiveStorage::AttachmentsTest < ActiveSupport::TestCase - include ActiveJob::TestHelper - setup do @user = User.create!(name: "Josh") end @@ -19,16 +17,18 @@ class ActiveStorage::AttachmentsTest < ActiveSupport::TestCase # inherited only assert_equal "funky.jpg", @user.avatar.filename.to_s - User.class_eval do - def avatar - super.filename.to_s.reverse + begin + User.class_eval do + def avatar + super.filename.to_s.reverse + end end - end - # override with super - assert_equal "funky.jpg".reverse, @user.avatar - - User.send(:remove_method, :avatar) + # override with super + assert_equal "funky.jpg".reverse, @user.avatar + ensure + User.remove_method :avatar + end end test "overriding has_many_attached methods works" do @@ -39,16 +39,18 @@ 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 - User.class_eval do - def highlights - super.reverse + begin + User.class_eval do + def highlights + super.reverse + end end - 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) + # 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 end end |