paper_trail 4.2.0 → 5.0.0

data/test/unit/cleaner_test.rb

@@ -1,71 +1,71 @@
-require 'test_helper'
+require "test_helper"
 
 class PaperTrailCleanerTest < ActiveSupport::TestCase
-
   def populate_db!
     @animals = [@animal = Animal.new, @dog = Dog.new, @cat = Cat.new]
     @animals.each do |animal|
-      3.times { animal.update_attribute(:name, Faker::Name.name) }
+      3.times { animal.update_attribute(:name, FFaker::Name.name) }
     end
   end
 
-  context '`clean_versions!` method' do
-    setup { self.populate_db! }
+  context "`clean_versions!` method" do
+    setup { populate_db! }
 
-    should 'Baseline' do
+    should "Baseline" do
       assert_equal 9, PaperTrail::Version.count
       @animals.each { |animal| assert_equal 3, animal.versions.size }
     end
 
-    should 'be extended by `PaperTrail` module' do
+    should "be extended by `PaperTrail` module" do
       assert_respond_to PaperTrail, :clean_versions!
     end
 
-    context 'No options provided' do
-      should 'removes extra versions for each item' do
+    context "No options provided" do
+      should "removes extra versions for each item" do
         PaperTrail.clean_versions!
         assert_equal 3, PaperTrail::Version.count
         @animals.each { |animal| assert_equal 1, animal.versions.size }
       end
 
-      should 'removes the earliest version(s)' do
-        most_recent_version_names = @animals.map { |animal| animal.versions.last.reify.name }
+      should "removes the earliest version(s)" do
+        before = @animals.map { |animal| animal.versions.last.reify.name }
         PaperTrail.clean_versions!
-        assert_equal most_recent_version_names, @animals.map { |animal| animal.versions.last.reify.name }
+        after = @animals.map { |animal| animal.versions.last.reify.name }
+        assert_equal before, after
       end
     end
 
-    context '`:keeping` option' do
-      should 'modifies the number of versions ommitted from destruction' do
-        PaperTrail.clean_versions!(:keeping => 2)
+    context "`:keeping` option" do
+      should "modifies the number of versions ommitted from destruction" do
+        PaperTrail.clean_versions!(keeping: 2)
         assert_equal 6, PaperTrail::Version.all.count
         @animals.each { |animal| assert_equal 2, animal.versions.size }
       end
     end
 
-    context '`:date` option' do
+    context "`:date` option" do
       setup do
         @animal.versions.each { |ver| ver.update_attribute(:created_at, ver.created_at - 1.day) }
         @date = @animal.versions.first.created_at.to_date
-        @animal.update_attribute(:name, Faker::Name.name)
+        @animal.update_attribute(:name, FFaker::Name.name)
       end
 
-      should 'restrict the versions destroyed to those that were created on the date provided' do
+      should "restrict the versions destroyed to those that were created on the date provided" do
         assert_equal 10, PaperTrail::Version.count
         assert_equal 4, @animal.versions.size
         assert_equal 3, @animal.versions_between(@date, @date + 1.day).size
-        PaperTrail.clean_versions!(:date => @date)
+        PaperTrail.clean_versions!(date: @date)
         assert_equal 8, PaperTrail::Version.count
-        assert_equal 2, @animal.versions(true).size
+        assert_equal 2, @animal.versions.reload.size
         assert_equal @date, @animal.versions.first.created_at.to_date
         assert_not_same @date, @animal.versions.last.created_at.to_date
       end
     end
 
-    context '`:item_id` option' do
-      context 'single ID received' do
-        should 'restrict the versions destroyed to the versions for the Item with that ID' do
-          PaperTrail.clean_versions!(:item_id => @animal.id)
+    context "`:item_id` option" do
+      context "single ID received" do
+        should "restrict the versions destroyed to the versions for the Item with that ID" do
+          PaperTrail.clean_versions!(item_id: @animal.id)
           assert_equal 1, @animal.versions.size
           assert_equal 7, PaperTrail::Version.count
         end
@@ -73,7 +73,7 @@ class PaperTrailCleanerTest < ActiveSupport::TestCase
 
       context "collection of ID's received" do
         should "restrict the versions destroyed to the versions for the Item with those ID's" do
-          PaperTrail.clean_versions!(:item_id => [@animal.id, @dog.id])
+          PaperTrail.clean_versions!(item_id: [@animal.id, @dog.id])
           assert_equal 1, @animal.versions.size
           assert_equal 1, @dog.versions.size
           assert_equal 5, PaperTrail::Version.count
@@ -81,72 +81,78 @@ class PaperTrailCleanerTest < ActiveSupport::TestCase
       end
     end
 
-    context 'options combinations' do # additional tests to cover combinations of options
-      context '`:date`' do
+    context "options combinations" do # additional tests to cover combinations of options
+      context "`:date`" do
         setup do
           [@animal, @dog].each do |animal|
             animal.versions.each { |ver| ver.update_attribute(:created_at, ver.created_at - 1.day) }
-            animal.update_attribute(:name, Faker::Name.name)
+            animal.update_attribute(:name, FFaker::Name.name)
           end
           @date = @animal.versions.first.created_at.to_date
         end
 
-        should 'Baseline' do
+        should "Baseline" do
           assert_equal 11, PaperTrail::Version.count
           [@animal, @dog].each do |animal|
             assert_equal 4, animal.versions.size
-            assert_equal 3, animal.versions.between(@date, @date+1.day).size
+            assert_equal 3, animal.versions.between(@date, @date + 1.day).size
           end
         end
 
-        context 'and `:keeping`' do
-          should 'restrict cleaning properly' do
-            PaperTrail.clean_versions!(:date => @date, :keeping => 2)
+        context "and `:keeping`" do
+          should "restrict cleaning properly" do
+            PaperTrail.clean_versions!(date: @date, keeping: 2)
             [@animal, @dog].each do |animal|
-              animal.versions.reload # reload the association to pick up the destructions made by the `Cleaner`
+              # reload the association to pick up the destructions made by the `Cleaner`
+              animal.versions.reload
               assert_equal 3, animal.versions.size
-              assert_equal 2, animal.versions.between(@date, @date+1.day).size
+              assert_equal 2, animal.versions.between(@date, @date + 1.day).size
             end
-            assert_equal 9, PaperTrail::Version.count # ensure that the versions for the `@cat` instance wasn't touched
+            # ensure that the versions for the `@cat` instance wasn't touched
+            assert_equal 9, PaperTrail::Version.count
           end
         end
 
-        context 'and `:item_id`' do
-          should 'restrict cleaning properly' do
-            PaperTrail.clean_versions!(:date => @date, :item_id => @dog.id)
-            @dog.versions.reload # reload the association to pick up the destructions made by the `Cleaner`
+        context "and `:item_id`" do
+          should "restrict cleaning properly" do
+            PaperTrail.clean_versions!(date: @date, item_id: @dog.id)
+            # reload the association to pick up the destructions made by the `Cleaner`
+            @dog.versions.reload
             assert_equal 2, @dog.versions.size
-            assert_equal 1, @dog.versions.between(@date, @date+1.day).size
-            assert_equal 9, PaperTrail::Version.count # ensure the versions for other animals besides `@animal` weren't touched
+            assert_equal 1, @dog.versions.between(@date, @date + 1.day).size
+            # ensure the versions for other animals besides `@animal` weren't touched
+            assert_equal 9, PaperTrail::Version.count
           end
         end
 
-        context ', `:item_id`, and `:keeping`' do
-          should 'restrict cleaning properly' do
-            PaperTrail.clean_versions!(:date => @date, :item_id => @dog.id, :keeping => 2)
-            @dog.versions.reload # reload the association to pick up the destructions made by the `Cleaner`
+        context ", `:item_id`, and `:keeping`" do
+          should "restrict cleaning properly" do
+            PaperTrail.clean_versions!(date: @date, item_id: @dog.id, keeping: 2)
+            # reload the association to pick up the destructions made by the `Cleaner`
+            @dog.versions.reload
             assert_equal 3, @dog.versions.size
-            assert_equal 2, @dog.versions.between(@date, @date+1.day).size
-            assert_equal 10, PaperTrail::Version.count # ensure the versions for other animals besides `@animal` weren't touched
+            assert_equal 2, @dog.versions.between(@date, @date + 1.day).size
+            # ensure the versions for other animals besides `@animal` weren't touched
+            assert_equal 10, PaperTrail::Version.count
           end
         end
       end
 
-      context '`:keeping` and `:item_id`' do
-        should 'restrict cleaning properly' do
-          PaperTrail.clean_versions!(:keeping => 2, :item_id => @animal.id)
+      context "`:keeping` and `:item_id`" do
+        should "restrict cleaning properly" do
+          PaperTrail.clean_versions!(keeping: 2, item_id: @animal.id)
           assert_equal 2, @animal.versions.size
-          assert_equal 8, PaperTrail::Version.count # ensure the versions for other animals besides `@animal` weren't touched
+          # ensure the versions for other animals besides `@animal` weren't touched
+          assert_equal 8, PaperTrail::Version.count
         end
       end
     end
-
   end # clean_versions! method
 
   context "Custom timestamp field" do
     setup do
       change_schema
-      self.populate_db!
+      populate_db!
       # now mess with the timestamps
       @animals.each do |animal|
         animal.versions.reverse.each_with_index do |version, index|
@@ -154,7 +160,7 @@ class PaperTrailCleanerTest < ActiveSupport::TestCase
         end
       end
       PaperTrail.timestamp_field = :custom_created_at
-      @animals.map { |a| a.versions(true) } # reload the `versions` association for each animal
+      @animals.map { |a| a.versions.reload } # reload the `versions` association for each animal
     end
 
     teardown do
@@ -162,18 +168,18 @@ class PaperTrailCleanerTest < ActiveSupport::TestCase
       restore_schema
     end
 
-    should 'Baseline' do
+    should "Baseline" do
       assert_equal 9, PaperTrail::Version.count
       @animals.each do |animal|
         assert_equal 3, animal.versions.size
-        animal.versions.each_cons(2) do |a,b|
-          a.created_at.to_date == b.created_at.to_date
-          a.custom_created_at.to_date != b.custom_created_at.to_date
+        animal.versions.each_cons(2) do |a, b|
+          assert_equal a.created_at.to_date, b.created_at.to_date
+          assert_not_equal a.custom_created_at.to_date, b.custom_created_at.to_date
         end
       end
     end
 
-    should 'group by `PaperTrail.timestamp_field` when seperating the versions by date to clean' do
+    should "group by `PaperTrail.timestamp_field` when seperating the versions by date to clean" do
       assert_equal 9, PaperTrail::Version.count
       PaperTrail.clean_versions!
       assert_equal 9, PaperTrail::Version.count

data/test/unit/inheritance_column_test.rb

@@ -1,43 +1,43 @@
-require 'test_helper'
+require "test_helper"
 
 class InheritanceColumnTest < ActiveSupport::TestCase
-  context 'STI models' do
+  context "STI models" do
     setup do
-      @animal = Animal.create :name => 'Animal'
-      @animal.update_attributes :name => 'Animal from the Muppets'
-      @animal.update_attributes :name => 'Animal Muppet'
+      @animal = Animal.create name: "Animal"
+      @animal.update_attributes name: "Animal from the Muppets"
+      @animal.update_attributes name: "Animal Muppet"
       @animal.destroy
 
-      @dog = Dog.create :name => 'Snoopy'
-      @dog.update_attributes :name => 'Scooby'
-      @dog.update_attributes :name => 'Scooby Doo'
+      @dog = Dog.create name: "Snoopy"
+      @dog.update_attributes name: "Scooby"
+      @dog.update_attributes name: "Scooby Doo"
       @dog.destroy
 
-      @cat = Cat.create :name => 'Garfield'
-      @cat.update_attributes :name => 'Garfield (I hate Mondays)'
-      @cat.update_attributes :name => 'Garfield The Cat'
+      @cat = Cat.create name: "Garfield"
+      @cat.update_attributes name: "Garfield (I hate Mondays)"
+      @cat.update_attributes name: "Garfield The Cat"
       @cat.destroy
     end
 
-    should 'work with custom STI inheritance column' do
+    should "work with custom STI inheritance column" do
       assert_equal 12, PaperTrail::Version.count
       assert_equal 4, @animal.versions.count
       assert_nil @animal.versions.first.reify
-      @animal.versions[1..-1].each { |v| assert_equal 'Animal', v.reify.class.name }
+      @animal.versions[1..-1].each { |v| assert_equal "Animal", v.reify.class.name }
 
       # For some reason `@dog.versions` doesn't include the final `destroy` version.
       # Neither do `@dog.versions.scoped` nor `@dog.versions(true)` nor `@dog.versions.reload`.
-      dog_versions = PaperTrail::Version.where(:item_id => @dog.id).
+      dog_versions = PaperTrail::Version.where(item_id: @dog.id).
         order(PaperTrail.timestamp_field)
       assert_equal 4, dog_versions.count
       assert_nil dog_versions.first.reify
-      assert_equal %w[NilClass Dog Dog Dog], dog_versions.map { |v| v.reify.class.name }
+      assert_equal %w(NilClass Dog Dog Dog), dog_versions.map { |v| v.reify.class.name }
 
-      cat_versions = PaperTrail::Version.where(:item_id => @cat.id).
+      cat_versions = PaperTrail::Version.where(item_id: @cat.id).
         order(PaperTrail.timestamp_field)
       assert_equal 4, cat_versions.count
       assert_nil cat_versions.first.reify
-      assert_equal %w[NilClass Cat Cat Cat], cat_versions.map { |v| v.reify.class.name }
+      assert_equal %w(NilClass Cat Cat Cat), cat_versions.map { |v| v.reify.class.name }
     end
   end
 end

data/test/unit/model_test.rb

@@ -1,109 +1,152 @@
-require 'test_helper'
-require 'time_travel_helper'
+require "test_helper"
+require "time_travel_helper"
 
 class HasPaperTrailModelTest < ActiveSupport::TestCase
-
   context "A record with defined 'only' and 'ignore' attributes" do
     setup { @article = Article.create }
-    should 'creation should change the number of versions' do assert_equal(1, PaperTrail::Version.count) end
 
-    context 'which updates an ignored column' do
-      setup { @article.update_attributes :title => 'My first title' }
-      should 'not change the number of versions' do assert_equal(1, PaperTrail::Version.count) end
+    should "creation should change the number of versions" do
+      assert_equal(1, PaperTrail::Version.count)
     end
 
-    context 'which updates an ignored column with truly Proc' do
-      setup { @article.update_attributes :abstract => 'ignore abstract' }
-      should 'not change the number of versions' do assert_equal(1, PaperTrail::Version.count) end
+    context "which updates an ignored column" do
+      should "not change the number of versions" do
+        @article.update_attributes title: "My first title"
+        assert_equal(1, PaperTrail::Version.count)
+      end
     end
 
-    context 'which updates an ignored column with falsy Proc' do
-      setup { @article.update_attributes :abstract => 'do not ignore abstract!' }
-      should 'change the number of versions' do assert_equal(2, PaperTrail::Version.count) end
+    context "which updates an ignored column with truly Proc" do
+      should "not change the number of versions" do
+        @article.update_attributes abstract: "ignore abstract"
+        assert_equal(1, PaperTrail::Version.count)
+      end
     end
 
-    context 'which updates an ignored column, ignored with truly Proc and a selected column' do
-      setup { @article.update_attributes :title => 'My first title',
-                                         :content => 'Some text here.',
-                                         :abstract => 'ignore abstract'
-      }
-      should 'change the number of versions' do assert_equal(2, PaperTrail::Version.count) end
+    context "which updates an ignored column with falsy Proc" do
+      should "change the number of versions" do
+        @article.update_attributes abstract: "do not ignore abstract!"
+        assert_equal(2, PaperTrail::Version.count)
+      end
+    end
+
+    context "which updates an ignored column, ignored with truly Proc and a selected column" do
+      setup do
+        @article.update_attributes(
+          title: "My first title",
+          content: "Some text here.",
+          abstract: "ignore abstract"
+        )
+      end
+
+      should "change the number of versions" do
+        assert_equal(2, PaperTrail::Version.count)
+      end
 
       should "show the new version in the model's `versions` association" do
         assert_equal(2, @article.versions.size)
       end
 
-      should 'have stored only non-ignored attributes' do
-        assert_equal ({'content' => [nil, 'Some text here.']}), @article.versions.last.changeset
+      should "have stored only non-ignored attributes" do
+        expected = { "content" => [nil, "Some text here."] }
+        assert_equal expected, @article.versions.last.changeset
       end
     end
 
-    context 'which updates an ignored column, ignored with falsy Proc and a selected column' do
-      setup { @article.update_attributes :title => 'My first title',
-                                         :content => 'Some text here.',
-                                         :abstract => 'do not ignore abstract'
-      }
-      should 'change the number of versions' do assert_equal(2, PaperTrail::Version.count) end
+    context "which updates an ignored column, ignored with falsy Proc and a selected column" do
+      setup do
+        @article.update_attributes(
+          title: "My first title",
+          content: "Some text here.",
+          abstract: "do not ignore abstract"
+        )
+      end
+
+      should "change the number of versions" do
+        assert_equal(2, PaperTrail::Version.count)
+      end
 
       should "show the new version in the model's `versions` association" do
         assert_equal(2, @article.versions.size)
       end
 
-      should 'have stored only non-ignored attributes' do
-        assert_equal ({'content' => [nil, 'Some text here.'], 'abstract' => [nil, 'do not ignore abstract']}), @article.versions.last.changeset
+      should "have stored only non-ignored attributes" do
+        expected = {
+          "content" => [nil, "Some text here."],
+          "abstract" => [nil, "do not ignore abstract"]
+        }
+        assert_equal expected, @article.versions.last.changeset
       end
     end
 
-    context 'which updates a selected column' do
-      setup { @article.update_attributes :content => 'Some text here.' }
-      should 'change the number of versions' do assert_equal(2, PaperTrail::Version.count) end
+    context "which updates a selected column" do
+      setup { @article.update_attributes content: "Some text here." }
+      should "change the number of versions" do
+        assert_equal(2, PaperTrail::Version.count)
+      end
 
       should "show the new version in the model's `versions` association" do
         assert_equal(2, @article.versions.size)
       end
     end
 
-    context 'which updates a non-ignored and non-selected column' do
-      setup { @article.update_attributes :abstract => 'Other abstract'}
-      should 'not change the number of versions' do assert_equal(1, PaperTrail::Version.count) end
+    context "which updates a non-ignored and non-selected column" do
+      should "not change the number of versions" do
+        @article.update_attributes abstract: "Other abstract"
+        assert_equal(1, PaperTrail::Version.count)
+      end
     end
 
-    context 'which updates a skipped column' do
-      setup { @article.update_attributes :file_upload => 'Your data goes here' }
-      should 'not change the number of versions' do assert_equal(1, PaperTrail::Version.count) end
+    context "which updates a skipped column" do
+      should "not change the number of versions" do
+        @article.update_attributes file_upload: "Your data goes here"
+        assert_equal(1, PaperTrail::Version.count)
+      end
     end
 
-    context 'which updates a skipped column and a selected column' do
-      setup { @article.update_attributes :file_upload => 'Your data goes here', :content => 'Some text here.' }
-      should 'change the number of versions' do assert_equal(2, PaperTrail::Version.count) end
+    context "which updates a skipped column and a selected column" do
+      setup do
+        @article.update_attributes(
+          file_upload: "Your data goes here",
+          content: "Some text here."
+        )
+      end
+
+      should "change the number of versions" do
+        assert_equal(2, PaperTrail::Version.count)
+      end
 
       should "show the new version in the model's `versions` association" do
         assert_equal(2, @article.versions.size)
       end
 
-      should 'have stored only non-skipped attributes' do
-        assert_equal ({'content' => [nil, 'Some text here.']}), @article.versions.last.changeset
+      should "have stored only non-skipped attributes" do
+        assert_equal ({ "content" => [nil, "Some text here."] }),
+          @article.versions.last.changeset
       end
 
-      context 'and when updated again' do
+      context "and when updated again" do
         setup do
-          @article.update_attributes :file_upload => 'More data goes here', :content => 'More text here.'
+          @article.update_attributes(
+            file_upload: "More data goes here",
+            content: "More text here."
+          )
           @old_article = @article.versions.last
         end
 
-        should 'have removed the skipped attributes when saving the previous version' do
-          assert_equal nil, PaperTrail.serializer.load(@old_article.object)['file_upload']
+        should "have removed the skipped attributes when saving the previous version" do
+          assert_equal nil, PaperTrail.serializer.load(@old_article.object)["file_upload"]
         end
 
-        should 'have kept the non-skipped attributes in the previous version' do
-          assert_equal 'Some text here.', PaperTrail.serializer.load(@old_article.object)['content']
+        should "have kept the non-skipped attributes in the previous version" do
+          assert_equal "Some text here.", PaperTrail.serializer.load(@old_article.object)["content"]
         end
       end
     end
 
-    context 'which gets destroyed' do
+    context "which gets destroyed" do
       setup { @article.destroy }
-      should 'change the number of versions' do assert_equal(2, PaperTrail::Version.count) end
+      should "change the number of versions" do assert_equal(2, PaperTrail::Version.count) end
 
       should "show the new version in the model's `versions` association" do
         assert_equal(2, @article.versions.size)
@@ -114,64 +157,74 @@ class HasPaperTrailModelTest < ActiveSupport::TestCase
   context "A record with defined 'ignore' attribute" do
     setup { @legacy_widget = LegacyWidget.create }
 
-    context 'which updates an ignored column' do
-      setup { @legacy_widget.update_attributes :version => 1 }
-      should 'not change the number of versions' do assert_equal(1, PaperTrail::Version.count) end
+    context "which updates an ignored column" do
+      setup { @legacy_widget.update_attributes version: 1 }
+      should "not change the number of versions" do assert_equal(1, PaperTrail::Version.count) end
     end
   end
 
   context 'A record with defined "if" and "unless" attributes' do
-    setup { @translation = Translation.new :headline => 'Headline' }
+    setup { @translation = Translation.new headline: "Headline" }
 
-    context 'for non-US translations' do
+    context "for non-US translations" do
       setup { @translation.save }
-      should 'not change the number of versions' do assert_equal(0, PaperTrail::Version.count) end
+      should "not change the number of versions" do assert_equal(0, PaperTrail::Version.count) end
 
-      context 'after update' do
-        setup { @translation.update_attributes :content => 'Content' }
-        should 'not change the number of versions' do assert_equal(0, PaperTrail::Version.count) end
+      context "after update" do
+        setup { @translation.update_attributes content: "Content" }
+        should "not change the number of versions" do assert_equal(0, PaperTrail::Version.count) end
       end
 
-      context 'after destroy' do
+      context "after destroy" do
         setup { @translation.destroy }
-        should 'not change the number of versions' do assert_equal(0, PaperTrail::Version.count) end
+        should "not change the number of versions" do assert_equal(0, PaperTrail::Version.count) end
       end
     end
 
-    context 'for US translations' do
+    context "for US translations" do
       setup { @translation.language_code = "US" }
 
-      context 'that are drafts' do
+      context "that are drafts" do
         setup do
-          @translation.type = 'DRAFT'
+          @translation.type = "DRAFT"
           @translation.save
         end
 
-        should 'not change the number of versions' do assert_equal(0, PaperTrail::Version.count) end
+        should "not change the number of versions" do
+          assert_equal(0, PaperTrail::Version.count)
+        end
 
-        context 'after update' do
-          setup { @translation.update_attributes :content => 'Content' }
-          should 'not change the number of versions' do assert_equal(0, PaperTrail::Version.count) end
+        context "after update" do
+          setup { @translation.update_attributes content: "Content" }
+          should "not change the number of versions" do
+            assert_equal(0, PaperTrail::Version.count)
+          end
         end
       end
 
-      context 'that are not drafts' do
+      context "that are not drafts" do
         setup { @translation.save }
 
-        should 'change the number of versions' do assert_equal(1, PaperTrail::Version.count) end
+        should "change the number of versions" do
+          assert_equal(1, PaperTrail::Version.count)
+        end
 
-        context 'after update' do
-          setup { @translation.update_attributes :content => 'Content' }
-          should 'change the number of versions' do assert_equal(2, PaperTrail::Version.count) end
+        context "after update" do
+          setup { @translation.update_attributes content: "Content" }
+          should "change the number of versions" do
+            assert_equal(2, PaperTrail::Version.count)
+          end
 
           should "show the new version in the model's `versions` association" do
             assert_equal(2, @translation.versions.size)
           end
         end
 
-        context 'after destroy' do
+        context "after destroy" do
           setup { @translation.destroy }
-          should 'change the number of versions' do assert_equal(2, PaperTrail::Version.count) end
+          should "change the number of versions" do
+            assert_equal(2, PaperTrail::Version.count)
+          end
 
           should "show the new version in the model's `versions` association" do
             assert_equal(2, @translation.versions.size)
@@ -181,34 +234,34 @@ class HasPaperTrailModelTest < ActiveSupport::TestCase
     end
   end
 
-  context 'A new record' do
+  context "A new record" do
     setup { @widget = Widget.new }
 
-    should 'not have any previous versions' do
+    should "not have any previous versions" do
       assert_equal [], @widget.versions
     end
 
-    should 'be live' do
+    should "be live" do
       assert @widget.live?
     end
 
-    context 'which is then created' do
-      setup { @widget.update_attributes :name => 'Henry', :created_at => Time.now - 1.day }
+    context "which is then created" do
+      setup { @widget.update_attributes name: "Henry", created_at: Time.now - 1.day }
 
-      should 'have one previous version' do
+      should "have one previous version" do
         assert_equal 1, @widget.versions.length
       end
 
-      should 'be nil in its previous version' do
+      should "be nil in its previous version" do
         assert_nil @widget.versions.first.object
         assert_nil @widget.versions.first.reify
       end
 
-      should 'record the correct event' do
-        assert_match /create/i, @widget.versions.first.event
+      should "record the correct event" do
+        assert_match(/create/i, @widget.versions.first.event)
       end
 
-      should 'be live' do
+      should "be live" do
         assert @widget.live?
       end
 
@@ -216,114 +269,107 @@ class HasPaperTrailModelTest < ActiveSupport::TestCase
         assert_equal @widget.updated_at.to_i, @widget.versions.first.created_at.to_i
       end
 
-      should 'have changes' do
-
-        #TODO Postgres does not appear to pass back ActiveSupport::TimeWithZone,
-        # so chosing the lowest common denominator to test.
+      should "have changes" do
+        # TODO: Postgres does not appear to pass back
+        # ActiveSupport::TimeWithZone, so choosing the lowest common denominator
+        # to test.
 
         changes = {
-          'name'       => [nil, 'Henry'],
-          'created_at' => [nil, @widget.created_at.to_time.utc],
-          'updated_at' => [nil, @widget.updated_at.to_time.utc],
-          'id'         => [nil, @widget.id]
+          "name" => [nil, "Henry"],
+          "created_at" => [nil, @widget.created_at.to_time.utc],
+          "updated_at" => [nil, @widget.updated_at.to_time.utc],
+          "id" => [nil, @widget.id]
         }
 
-        assert_kind_of Time, @widget.versions.last.changeset['updated_at'][1]
+        assert_kind_of Time, @widget.versions.last.changeset["updated_at"][1]
         assert_changes_equal changes, @widget.versions.last.changeset
       end
 
-      context 'and then updated without any changes' do
+      context "and then updated without any changes" do
         setup { @widget.touch }
 
-        should 'not have a new version' do
+        should "not have a new version" do
           assert_equal 1, @widget.versions.length
         end
       end
 
+      context "and then updated with changes" do
+        setup { @widget.update_attributes name: "Harry" }
 
-      context 'and then updated with changes' do
-        setup { @widget.update_attributes :name => 'Harry' }
-
-        should 'have two previous versions' do
+        should "have two previous versions" do
           assert_equal 2, @widget.versions.length
         end
 
-        should 'be available in its previous version' do
-          assert_equal 'Harry', @widget.name
+        should "be available in its previous version" do
+          assert_equal "Harry", @widget.name
           assert_not_nil @widget.versions.last.object
           widget = @widget.versions.last.reify
-          assert_equal 'Henry', widget.name
-          assert_equal 'Harry', @widget.name
+          assert_equal "Henry", widget.name
+          assert_equal "Harry", @widget.name
         end
 
-        should 'have the same ID in its previous version' do
+        should "have the same ID in its previous version" do
           assert_equal @widget.id, @widget.versions.last.reify.id
         end
 
-        should 'record the correct event' do
-          assert_match /update/i, @widget.versions.last.event
+        should "record the correct event" do
+          assert_match(/update/i, @widget.versions.last.event)
         end
 
-        should 'have versions that are not live' do
+        should "have versions that are not live" do
           assert @widget.versions.map(&:reify).compact.all? { |w| !w.live? }
         end
 
-        should 'have stored changes' do
+        should "have stored changes" do
           # Behavior for ActiveRecord 4 is different than ActiveRecord 3;
-          # AR4 includes the `updated_at` column in changes for updates, which is why we reject it from the right side of this assertion.
-          assert_equal ({'name' => ['Henry', 'Harry']}), PaperTrail.serializer.load(@widget.versions.last.object_changes).reject { |k,v| k.to_sym == :updated_at }
-          assert_equal ({'name' => ['Henry', 'Harry']}), @widget.versions.last.changeset.reject { |k,v| k.to_sym == :updated_at }
+          # AR4 includes the `updated_at` column in changes for updates, which
+          # is why we reject it from the right side of this assertion.
+          last_obj_changes = @widget.versions.last.object_changes
+          actual = PaperTrail.serializer.load(last_obj_changes).reject { |k, _v|
+            k.to_sym == :updated_at
+          }
+          assert_equal ({ "name" => %w(Henry Harry) }), actual
+          actual = @widget.versions.last.changeset.reject { |k, _v|
+            k.to_sym == :updated_at
+          }
+          assert_equal ({ "name" => %w(Henry Harry) }), actual
         end
 
-        should 'return changes with indifferent access' do
-          assert_equal ['Henry', 'Harry'], @widget.versions.last.changeset[:name]
-          assert_equal ['Henry', 'Harry'], @widget.versions.last.changeset['name']
-        end
-
-        if defined?(ActiveRecord::IdentityMap) && ActiveRecord::IdentityMap.respond_to?(:without)
-          should 'not clobber the IdentityMap when reifying' do
-            module ActiveRecord::IdentityMap
-              class << self
-                alias :__without :without
-                def without(&block)
-                  @unclobbered = true
-                  __without(&block)
-                end
-              end
-            end
-
-            @widget.versions.last.reify
-            assert ActiveRecord::IdentityMap.instance_variable_get("@unclobbered")
-          end
+        should "return changes with indifferent access" do
+          assert_equal %w(Henry Harry), @widget.versions.last.changeset[:name]
+          assert_equal %w(Henry Harry), @widget.versions.last.changeset["name"]
         end
 
-        context 'and has one associated object' do
+        context "and has one associated object" do
           setup do
-            @wotsit = @widget.create_wotsit :name => 'John'
+            @wotsit = @widget.create_wotsit name: "John"
           end
 
-          should 'not copy the has_one association by default when reifying' do
+          should "not copy the has_one association by default when reifying" do
             reified_widget = @widget.versions.last.reify
-            assert_equal @wotsit, reified_widget.wotsit  # association hasn't been affected by reifying
-            assert_equal @wotsit, @widget.wotsit(true)  # confirm that the association is correct
+            # association hasn't been affected by reifying
+            assert_equal @wotsit, reified_widget.wotsit
+            # confirm that the association is correct
+            assert_equal @wotsit, @widget.reload.wotsit
           end
 
-          should 'copy the has_one association when reifying with :has_one => true' do
-            reified_widget = @widget.versions.last.reify(:has_one => true)
-            assert_nil reified_widget.wotsit  # wotsit wasn't there at the last version
-            assert_equal @wotsit, @widget.wotsit(true)  # wotsit should still exist on live object
+          should "copy the has_one association when reifying with :has_one => true" do
+            reified_widget = @widget.versions.last.reify(has_one: true)
+            # wotsit wasn't there at the last version
+            assert_nil reified_widget.wotsit
+            # wotsit should still exist on live object
+            assert_equal @wotsit, @widget.reload.wotsit
           end
         end
 
-
-        context 'and has many associated objects' do
+        context "and has many associated objects" do
           setup do
-            @f0 = @widget.fluxors.create :name => 'f-zero'
-            @f1 = @widget.fluxors.create :name => 'f-one'
+            @f0 = @widget.fluxors.create name: "f-zero"
+            @f1 = @widget.fluxors.create name: "f-one"
             @reified_widget = @widget.versions.last.reify
           end
 
-          should 'copy the has_many associations when reifying' do
+          should "copy the has_many associations when reifying" do
             assert_equal @widget.fluxors.length, @reified_widget.fluxors.length
             assert_same_elements @widget.fluxors, @reified_widget.fluxors
 
@@ -332,14 +378,14 @@ class HasPaperTrailModelTest < ActiveSupport::TestCase
           end
         end
 
-        context 'and has many associated polymorphic objects' do
+        context "and has many associated polymorphic objects" do
           setup do
-            @f0 = @widget.whatchamajiggers.create :name => 'f-zero'
-            @f1 = @widget.whatchamajiggers.create :name => 'f-zero'
+            @f0 = @widget.whatchamajiggers.create name: "f-zero"
+            @f1 = @widget.whatchamajiggers.create name: "f-zero"
             @reified_widget = @widget.versions.last.reify
           end
 
-          should 'copy the has_many associations when reifying' do
+          should "copy the has_many associations when reifying" do
             assert_equal @widget.whatchamajiggers.length, @reified_widget.whatchamajiggers.length
             assert_same_elements @widget.whatchamajiggers, @reified_widget.whatchamajiggers
 
@@ -348,54 +394,57 @@ class HasPaperTrailModelTest < ActiveSupport::TestCase
           end
         end
 
-        context 'polymorphic objects by themselves' do
+        context "polymorphic objects by themselves" do
           setup do
-            @widget = Whatchamajigger.new :name => 'f-zero'
+            @widget = Whatchamajigger.new name: "f-zero"
           end
 
-          should 'not fail with a nil pointer on the polymorphic association' do
+          should "not fail with a nil pointer on the polymorphic association" do
             @widget.save!
           end
         end
 
-        context 'and then destroyed' do
+        context "and then destroyed" do
           setup do
-            @fluxor = @widget.fluxors.create :name => 'flux'
+            @fluxor = @widget.fluxors.create name: "flux"
             @widget.destroy
             @reified_widget = PaperTrail::Version.last.reify
           end
 
-          should 'record the correct event' do
-            assert_match /destroy/i, PaperTrail::Version.last.event
+          should "record the correct event" do
+            assert_match(/destroy/i, PaperTrail::Version.last.event)
           end
 
-          should 'have three previous versions' do
-            assert_equal 3, PaperTrail::Version.with_item_keys('Widget', @widget.id).length
+          should "have three previous versions" do
+            assert_equal 3, PaperTrail::Version.with_item_keys("Widget", @widget.id).length
           end
 
-          should 'be available in its previous version' do
+          should "be available in its previous version" do
             assert_equal @widget.id, @reified_widget.id
             assert_attributes_equal @widget.attributes, @reified_widget.attributes
           end
 
-          should 'be re-creatable from its previous version' do
+          should "be re-creatable from its previous version" do
             assert @reified_widget.save
           end
 
-          should 'restore its associations on its previous version' do
+          should "restore its associations on its previous version" do
             @reified_widget.save
             assert_equal 1, @reified_widget.fluxors.length
           end
 
-          should 'not have changes' do
-            assert_equal Hash.new, @widget.versions.last.changeset
+          should "have nil item for last version" do
+            assert_nil(@widget.versions.last.item)
+          end
+
+          should "not have changes" do
+            assert_equal({}, @widget.versions.last.changeset)
           end
         end
       end
     end
   end
 
-
   # Test the serialisation and deserialisation.
   # TODO: binary
   context "A record's papertrail" do
@@ -403,65 +452,67 @@ class HasPaperTrailModelTest < ActiveSupport::TestCase
       @date_time = DateTime.now.utc
       @time = Time.now
       @date = Date.new 2009, 5, 29
-      @widget = Widget.create :name        => 'Warble',
-                              :a_text      => 'The quick brown fox',
-                              :an_integer  => 42,
-                              :a_float     => 153.01,
-                              :a_decimal   => 2.71828,
-                              :a_datetime  => @date_time,
-                              :a_time      => @time,
-                              :a_date      => @date,
-                              :a_boolean   => true
-
-      @widget.update_attributes :name      => nil,
-                              :a_text      => nil,
-                              :an_integer  => nil,
-                              :a_float     => nil,
-                              :a_decimal   => nil,
-                              :a_datetime  => nil,
-                              :a_time      => nil,
-                              :a_date      => nil,
-                              :a_boolean   => false
+      @widget = Widget.create(
+        name: "Warble",
+        a_text: "The quick brown fox",
+        an_integer: 42,
+        a_float: 153.01,
+        a_decimal: 2.71828,
+        a_datetime: @date_time,
+        a_time: @time,
+        a_date: @date,
+        a_boolean: true
+      )
+      @widget.update_attributes(
+        name: nil,
+        a_text: nil,
+        an_integer: nil,
+        a_float: nil,
+        a_decimal: nil,
+        a_datetime: nil,
+        a_time: nil,
+        a_date: nil,
+        a_boolean: false
+      )
       @previous = @widget.versions.last.reify
     end
 
-    should 'handle strings' do
-      assert_equal 'Warble', @previous.name
+    should "handle strings" do
+      assert_equal "Warble", @previous.name
     end
 
-    should 'handle text' do
-      assert_equal 'The quick brown fox', @previous.a_text
+    should "handle text" do
+      assert_equal "The quick brown fox", @previous.a_text
     end
 
-    should 'handle integers' do
+    should "handle integers" do
       assert_equal 42, @previous.an_integer
     end
 
-    should 'handle floats' do
+    should "handle floats" do
       assert_in_delta 153.01, @previous.a_float, 0.001
     end
 
-    should 'handle decimals' do
+    should "handle decimals" do
       assert_in_delta 2.7183, @previous.a_decimal, 0.0001
     end
 
-    should 'handle datetimes' do
+    should "handle datetimes" do
       assert_equal @date_time.to_time.utc.to_i, @previous.a_datetime.to_time.utc.to_i
     end
 
-    should 'handle times' do
+    should "handle times" do
       assert_equal @time.utc.to_i, @previous.a_time.utc.to_i
     end
 
-    should 'handle dates' do
+    should "handle dates" do
       assert_equal @date, @previous.a_date
     end
 
-    should 'handle booleans' do
+    should "handle booleans" do
       assert @previous.a_boolean
     end
 
-
     context "after a column is removed from the record's schema" do
       setup do
         change_schema
@@ -475,13 +526,13 @@ class HasPaperTrailModelTest < ActiveSupport::TestCase
         restore_schema
       end
 
-      should 'reify previous version' do
+      should "reify previous version" do
         assert_kind_of Widget, @last.reify
       end
 
-      should 'restore all forward-compatible attributes' do
-        assert_equal    'Warble',                    @last.reify.name
-        assert_equal    'The quick brown fox',       @last.reify.a_text
+      should "restore all forward-compatible attributes" do
+        assert_equal    "Warble",                    @last.reify.name
+        assert_equal    "The quick brown fox",       @last.reify.a_text
         assert_equal    42,                          @last.reify.an_integer
         assert_in_delta 153.01,                      @last.reify.a_float,   0.001
         assert_in_delta 2.7183,                      @last.reify.a_decimal, 0.0001
@@ -493,11 +544,10 @@ class HasPaperTrailModelTest < ActiveSupport::TestCase
     end
   end
 
+  context "A record" do
+    setup { @widget = Widget.create name: "Zaphod" }
 
-  context 'A record' do
-    setup { @widget = Widget.create :name => 'Zaphod' }
-
-    context 'with PaperTrail globally disabled' do
+    context "with PaperTrail globally disabled" do
       setup do
         PaperTrail.enabled = false
         @count = @widget.versions.length
@@ -505,16 +555,16 @@ class HasPaperTrailModelTest < ActiveSupport::TestCase
 
       teardown { PaperTrail.enabled = true }
 
-      context 'when updated' do
-        setup { @widget.update_attributes :name => 'Beeblebrox' }
+      context "when updated" do
+        setup { @widget.update_attributes name: "Beeblebrox" }
 
-        should 'not add to its trail' do
+        should "not add to its trail" do
           assert_equal @count, @widget.versions.length
         end
       end
     end
 
-    context 'with its paper trail turned off' do
+    context "with its paper trail turned off" do
       setup do
         Widget.paper_trail_off!
         @count = @widget.versions.length
@@ -522,28 +572,28 @@ class HasPaperTrailModelTest < ActiveSupport::TestCase
 
       teardown { Widget.paper_trail_on! }
 
-      context 'when updated' do
-        setup { @widget.update_attributes :name => 'Beeblebrox' }
+      context "when updated" do
+        setup { @widget.update_attributes name: "Beeblebrox" }
 
-        should 'not add to its trail' do
+        should "not add to its trail" do
           assert_equal @count, @widget.versions.length
         end
       end
 
       context 'when destroyed "without versioning"' do
-        should 'leave paper trail off after call' do
+        should "leave paper trail off after call" do
           @widget.without_versioning :destroy
           assert !Widget.paper_trail_enabled_for_model?
         end
       end
 
-      context 'and then its paper trail turned on' do
+      context "and then its paper trail turned on" do
         setup { Widget.paper_trail_on! }
 
-        context 'when updated' do
-          setup { @widget.update_attributes :name => 'Ford' }
+        context "when updated" do
+          setup { @widget.update_attributes name: "Ford" }
 
-          should 'add to its trail' do
+          should "add to its trail" do
             assert_equal @count + 1, @widget.versions.length
           end
         end
@@ -551,29 +601,29 @@ class HasPaperTrailModelTest < ActiveSupport::TestCase
         context 'when updated "without versioning"' do
           setup do
             @widget.without_versioning do
-              @widget.update_attributes :name => 'Ford'
+              @widget.update_attributes name: "Ford"
             end
             # The model instance should yield itself for convenience purposes
-            @widget.without_versioning { |w| w.update_attributes :name => 'Nixon' }
+            @widget.without_versioning { |w| w.update_attributes name: "Nixon" }
           end
 
-          should 'not create new version' do
+          should "not create new version" do
             assert_equal @count, @widget.versions.length
           end
 
-          should 'enable paper trail after call' do
+          should "enable paper trail after call" do
             assert Widget.paper_trail_enabled_for_model?
           end
         end
 
-        context 'when receiving a method name as an argument' do
+        context "when receiving a method name as an argument" do
           setup { @widget.without_versioning(:touch_with_version) }
 
-          should 'not create new version' do
+          should "not create new version" do
             assert_equal @count, @widget.versions.length
           end
 
-          should 'enable paper trail after call' do
+          should "enable paper trail after call" do
             assert Widget.paper_trail_enabled_for_model?
           end
         end
@@ -581,107 +631,117 @@ class HasPaperTrailModelTest < ActiveSupport::TestCase
     end
   end
 
-
-  context 'A papertrail with somebody making changes' do
+  context "A papertrail with somebody making changes" do
     setup do
-      @widget = Widget.new :name => 'Fidget'
+      @widget = Widget.new name: "Fidget"
     end
 
-    context 'when a record is created' do
+    context "when a record is created" do
       setup do
-        PaperTrail.whodunnit = 'Alice'
+        PaperTrail.whodunnit = "Alice"
         @widget.save
-        @version = @widget.versions.last  # only 1 version
+        @version = @widget.versions.last # only 1 version
       end
 
-      should 'track who made the change' do
-        assert_equal 'Alice', @version.whodunnit
+      should "track who made the change" do
+        assert_equal "Alice", @version.whodunnit
         assert_nil   @version.paper_trail_originator
-        assert_equal 'Alice', @version.terminator
-        assert_equal 'Alice', @widget.paper_trail_originator
+        assert_equal "Alice", @version.terminator
+        assert_equal "Alice", @widget.paper_trail_originator
       end
 
-      context 'when a record is updated' do
+      context "when a record is updated" do
         setup do
-          PaperTrail.whodunnit = 'Bob'
-          @widget.update_attributes :name => 'Rivet'
+          PaperTrail.whodunnit = "Bob"
+          @widget.update_attributes name: "Rivet"
           @version = @widget.versions.last
         end
 
-        should 'track who made the change' do
-          assert_equal 'Bob',   @version.whodunnit
-          assert_equal 'Alice', @version.paper_trail_originator
-          assert_equal 'Bob',   @version.terminator
-          assert_equal 'Bob',   @widget.paper_trail_originator
+        should "track who made the change" do
+          assert_equal "Bob",   @version.whodunnit
+          assert_equal "Alice", @version.paper_trail_originator
+          assert_equal "Bob",   @version.terminator
+          assert_equal "Bob",   @widget.paper_trail_originator
         end
 
-        context 'when a record is destroyed' do
+        context "when a record is destroyed" do
           setup do
-            PaperTrail.whodunnit = 'Charlie'
+            PaperTrail.whodunnit = "Charlie"
             @widget.destroy
             @version = PaperTrail::Version.last
           end
 
-          should 'track who made the change' do
-            assert_equal 'Charlie', @version.whodunnit
-            assert_equal 'Bob',     @version.paper_trail_originator
-            assert_equal 'Charlie', @version.terminator
-            assert_equal 'Charlie', @widget.paper_trail_originator
+          should "track who made the change" do
+            assert_equal "Charlie", @version.whodunnit
+            assert_equal "Bob",     @version.paper_trail_originator
+            assert_equal "Charlie", @version.terminator
+            assert_equal "Charlie", @widget.paper_trail_originator
           end
         end
       end
     end
   end
 
-
-  context 'Timestamps' do
+  context "Timestamps" do
     setup do
-      @wotsit = Wotsit.create! :name => 'wotsit'
+      @wotsit = Wotsit.create! name: "wotsit"
     end
 
-    should 'record timestamps' do
-      @wotsit.update_attributes! :name => 'changed'
+    should "record timestamps" do
+      @wotsit.update_attributes! name: "changed"
       assert_not_nil @wotsit.versions.last.reify.created_at
       assert_not_nil @wotsit.versions.last.reify.updated_at
     end
 
-    should 'not generate warning' do
-      # Tests that it doesn't try to write created_on as an attribute just because a created_on
-      # method exists.
-      warnings = capture(:stderr) {  # Deprecation warning in Rails 3.2
-        assert_nothing_raised {  # ActiveModel::MissingAttributeError in Rails 4
-          @wotsit.update_attributes! :name => 'changed'
+    # Tests that it doesn't try to write created_on as an attribute just because
+    # a created_on method exists.
+    #
+    # - Deprecation warning in Rails 3.2
+    # - ActiveModel::MissingAttributeError in Rails 4
+    #
+    # In rails 5, `capture` is deprecated in favor of `capture_io`.
+    #
+    should "not generate warning" do
+      assert_update_raises_nothing = lambda {
+        assert_nothing_raised {
+          @wotsit.update_attributes! name: "changed"
         }
       }
-      assert_equal '', warnings
+      warnings =
+        if respond_to?(:capture_io)
+          capture_io { assert_update_raises_nothing.call }.last
+        else
+          capture(:stderr) { assert_update_raises_nothing.call }
+        end
+      assert_equal "", warnings
     end
-
   end
 
-
-  context 'A subclass' do
+  context "A subclass" do
     setup do
       @foo = FooWidget.create
-      @foo.update_attributes! :name => 'Foo'
+      @foo.update_attributes! name: "Foo"
     end
 
-    should 'reify with the correct type' do
-      # For some reason this test appears to be broken on AR4 in the test env. Executing it manually in the Rails console seems to work.. not sure what the issues is here.
+    should "reify with the correct type" do
+      # For some reason this test appears to be broken on AR4 in the test env.
+      # Executing it manually in the Rails console seems to work.. not sure what
+      # the issues is here.
       assert_kind_of FooWidget, @foo.versions.last.reify if ActiveRecord::VERSION::MAJOR < 4
       assert_equal @foo.versions.first, PaperTrail::Version.last.previous
       assert_nil PaperTrail::Version.last.next
     end
 
-    should 'should return the correct originator' do
-      PaperTrail.whodunnit = 'Ben'
-      @foo.update_attribute(:name, 'Geoffrey')
+    should "should return the correct originator" do
+      PaperTrail.whodunnit = "Ben"
+      @foo.update_attribute(:name, "Geoffrey")
       assert_equal PaperTrail.whodunnit, @foo.paper_trail_originator
     end
 
-    context 'when destroyed' do
+    context "when destroyed" do
       setup { @foo.destroy }
 
-      should 'reify with the correct type' do
+      should "reify with the correct type" do
         assert_kind_of FooWidget, @foo.versions.last.reify
         assert_equal @foo.versions[1], PaperTrail::Version.last.previous
         assert_nil PaperTrail::Version.last.next
@@ -689,250 +749,250 @@ class HasPaperTrailModelTest < ActiveSupport::TestCase
     end
   end
 
-
-  context 'An item with versions' do
+  context "An item with versions" do
     setup do
-      @widget = Widget.create :name => 'Widget'
-      @widget.update_attributes :name => 'Fidget'
-      @widget.update_attributes :name => 'Digit'
+      @widget = Widget.create name: "Widget"
+      @widget.update_attributes name: "Fidget"
+      @widget.update_attributes name: "Digit"
     end
 
-    context 'which were created over time' do
+    context "which were created over time" do
       setup do
-        @created       = 2.days.ago
-        @first_update  = 1.day.ago
+        @created = 2.days.ago
+        @first_update = 1.day.ago
         @second_update = 1.hour.ago
-        @widget.versions[0].update_attributes :created_at => @created
-        @widget.versions[1].update_attributes :created_at => @first_update
-        @widget.versions[2].update_attributes :created_at => @second_update
+        @widget.versions[0].update_attributes created_at: @created
+        @widget.versions[1].update_attributes created_at: @first_update
+        @widget.versions[2].update_attributes created_at: @second_update
         @widget.update_attribute :updated_at, @second_update
       end
 
-      should 'return nil for version_at before it was created' do
+      should "return nil for version_at before it was created" do
         assert_nil @widget.version_at(@created - 1)
       end
 
-      should 'return how it looked when created for version_at its creation' do
-        assert_equal 'Widget', @widget.version_at(@created).name
+      should "return how it looked when created for version_at its creation" do
+        assert_equal "Widget", @widget.version_at(@created).name
       end
 
-      should "return how it looked when created for version_at just before its first update" do
-        assert_equal 'Widget', @widget.version_at(@first_update - 1).name
+      should "return how it looked before its first update" do
+        assert_equal "Widget", @widget.version_at(@first_update - 1).name
       end
 
-      should "return how it looked when first updated for version_at its first update" do
-        assert_equal 'Fidget', @widget.version_at(@first_update).name
+      should "return how it looked after its first update" do
+        assert_equal "Fidget", @widget.version_at(@first_update).name
       end
 
-      should 'return how it looked when first updated for version_at just before its second update' do
-        assert_equal 'Fidget', @widget.version_at(@second_update - 1).name
+      should "return how it looked before its second update" do
+        assert_equal "Fidget", @widget.version_at(@second_update - 1).name
       end
 
-      should 'return how it looked when subsequently updated for version_at its second update' do
-        assert_equal 'Digit', @widget.version_at(@second_update).name
+      should "return how it looked after its second update" do
+        assert_equal "Digit", @widget.version_at(@second_update).name
       end
 
-      should 'return the current object for version_at after latest update' do
-        assert_equal 'Digit', @widget.version_at(1.day.from_now).name
+      should "return the current object for version_at after latest update" do
+        assert_equal "Digit", @widget.version_at(1.day.from_now).name
       end
 
-      context 'passing in a string representation of a timestamp' do
-        should 'still return a widget when appropriate' do
-          # need to add 1 second onto the timestamps before casting to a string, since casting a Time to a string drops the microseconds
-          assert_equal 'Widget', @widget.version_at((@created + 1.second).to_s).name
-          assert_equal 'Fidget', @widget.version_at((@first_update + 1.second).to_s).name
-          assert_equal 'Digit', @widget.version_at((@second_update + 1.second).to_s).name
+      context "passing in a string representation of a timestamp" do
+        should "still return a widget when appropriate" do
+          # need to add 1 second onto the timestamps before casting to a string,
+          # since casting a Time to a string drops the microseconds
+          assert_equal "Widget", @widget.version_at((@created + 1.second).to_s).name
+          assert_equal "Fidget", @widget.version_at((@first_update + 1.second).to_s).name
+          assert_equal "Digit", @widget.version_at((@second_update + 1.second).to_s).name
         end
       end
     end
 
-    context '.versions_between' do
+    context ".versions_between" do
       setup do
-        @created       = 30.days.ago
-        @first_update  = 15.days.ago
+        @created = 30.days.ago
+        @first_update = 15.days.ago
         @second_update = 1.day.ago
-        @widget.versions[0].update_attributes :created_at => @created
-        @widget.versions[1].update_attributes :created_at => @first_update
-        @widget.versions[2].update_attributes :created_at => @second_update
+        @widget.versions[0].update_attributes created_at: @created
+        @widget.versions[1].update_attributes created_at: @first_update
+        @widget.versions[2].update_attributes created_at: @second_update
         @widget.update_attribute :updated_at, @second_update
       end
 
-      should 'return versions in the time period' do
-        assert_equal ['Fidget'], @widget.versions_between(20.days.ago, 10.days.ago).map(&:name)
-        assert_equal ['Widget', 'Fidget'], @widget.versions_between(45.days.ago, 10.days.ago).map(&:name)
-        assert_equal ['Fidget', 'Digit', 'Digit'], @widget.versions_between(16.days.ago, 1.minute.ago).map(&:name)
-        assert_equal [], @widget.versions_between(60.days.ago, 45.days.ago).map(&:name)
+      should "return versions in the time period" do
+        assert_equal ["Fidget"],
+          @widget.versions_between(20.days.ago, 10.days.ago).map(&:name)
+        assert_equal %w(Widget Fidget),
+          @widget.versions_between(45.days.ago, 10.days.ago).map(&:name)
+        assert_equal %w(Fidget Digit Digit),
+          @widget.versions_between(16.days.ago, 1.minute.ago).map(&:name)
+        assert_equal [],
+          @widget.versions_between(60.days.ago, 45.days.ago).map(&:name)
       end
     end
 
-    context 'on the first version' do
+    context "on the first version" do
       setup { @version = @widget.versions.first }
 
-      should 'have a nil previous version' do
+      should "have a nil previous version" do
         assert_nil @version.previous
       end
 
-      should 'return the next version' do
+      should "return the next version" do
         assert_equal @widget.versions[1], @version.next
       end
 
-      should 'return the correct index' do
+      should "return the correct index" do
         assert_equal 0, @version.index
       end
     end
 
-    context 'on the last version' do
+    context "on the last version" do
       setup { @version = @widget.versions.last }
 
-      should 'return the previous version' do
+      should "return the previous version" do
         assert_equal @widget.versions[@widget.versions.length - 2], @version.previous
       end
 
-      should 'have a nil next version' do
+      should "have a nil next version" do
         assert_nil @version.next
       end
 
-      should 'return the correct index' do
+      should "return the correct index" do
         assert_equal @widget.versions.length - 1, @version.index
       end
     end
   end
 
-
-  context 'An item' do
+  context "An item" do
     setup do
-      @initial_title = 'Foobar'
-      @article = Article.new :title => @initial_title
+      @initial_title = "Foobar"
+      @article = Article.new title: @initial_title
     end
 
-    context 'which is created' do
+    context "which is created" do
       setup { @article.save }
 
-      should 'store fixed meta data' do
+      should "store fixed meta data" do
         assert_equal 42, @article.versions.last.answer
       end
 
-      should 'store dynamic meta data which is independent of the item' do
-        assert_equal '31 + 11 = 42', @article.versions.last.question
+      should "store dynamic meta data which is independent of the item" do
+        assert_equal "31 + 11 = 42", @article.versions.last.question
       end
 
-      should 'store dynamic meta data which depends on the item' do
+      should "store dynamic meta data which depends on the item" do
         assert_equal @article.id, @article.versions.last.article_id
       end
 
-      should 'store dynamic meta data based on a method of the item' do
+      should "store dynamic meta data based on a method of the item" do
         assert_equal @article.action_data_provider_method, @article.versions.last.action
       end
 
-      should 'store dynamic meta data based on an attribute of the item at creation' do
+      should "store dynamic meta data based on an attribute of the item at creation" do
         assert_equal @initial_title, @article.versions.last.title
       end
 
-
-      context 'and updated' do
+      context "and updated" do
         setup do
-          @article.update_attributes! :content => 'Better text.', :title => 'Rhubarb'
+          @article.update_attributes! content: "Better text.", title: "Rhubarb"
         end
 
-        should 'store fixed meta data' do
+        should "store fixed meta data" do
           assert_equal 42, @article.versions.last.answer
         end
 
-        should 'store dynamic meta data which is independent of the item' do
-          assert_equal '31 + 11 = 42', @article.versions.last.question
+        should "store dynamic meta data which is independent of the item" do
+          assert_equal "31 + 11 = 42", @article.versions.last.question
         end
 
-        should 'store dynamic meta data which depends on the item' do
+        should "store dynamic meta data which depends on the item" do
           assert_equal @article.id, @article.versions.last.article_id
         end
 
-        should 'store dynamic meta data based on an attribute of the item prior to the update' do
+        should "store dynamic meta data based on an attribute of the item prior to the update" do
           assert_equal @initial_title, @article.versions.last.title
         end
       end
 
-
-      context 'and destroyed' do
+      context "and destroyed" do
         setup { @article.destroy }
 
-        should 'store fixed meta data' do
+        should "store fixed metadata" do
           assert_equal 42, @article.versions.last.answer
         end
 
-        should 'store dynamic meta data which is independent of the item' do
-          assert_equal '31 + 11 = 42', @article.versions.last.question
+        should "store dynamic metadata which is independent of the item" do
+          assert_equal "31 + 11 = 42", @article.versions.last.question
         end
 
-        should 'store dynamic meta data which depends on the item' do
+        should "store dynamic metadata which depends on the item" do
           assert_equal @article.id, @article.versions.last.article_id
         end
 
-        should 'store dynamic meta data based on an attribute of the item prior to the destruction' do
+        should "store dynamic metadata based on attribute of item prior to destruction" do
           assert_equal @initial_title, @article.versions.last.title
         end
       end
     end
   end
 
-  context 'A reified item' do
+  context "A reified item" do
     setup do
-      widget = Widget.create :name => 'Bob'
-      %w( Tom Dick Jane ).each { |name| widget.update_attributes :name => name }
+      widget = Widget.create name: "Bob"
+      %w( Tom Dick Jane ).each { |name| widget.update_attributes name: name }
       @version = widget.versions.last
       @widget = @version.reify
     end
 
-    should 'know which version it came from' do
+    should "know which version it came from" do
       assert_equal @version, @widget.version
     end
 
-    should 'return its previous self' do
+    should "return its previous self" do
       assert_equal @widget.versions[-2].reify, @widget.previous_version
     end
   end
 
-
-  context 'A non-reified item' do
+  context "A non-reified item" do
     setup { @widget = Widget.new }
 
-    should 'not have a previous version' do
+    should "not have a previous version" do
       assert_nil @widget.previous_version
     end
 
-    should 'not have a next version' do
+    should "not have a next version" do
       assert_nil @widget.next_version
     end
 
-    context 'with versions' do
+    context "with versions" do
       setup do
         @widget.save
-        %w( Tom Dick Jane ).each { |name| @widget.update_attributes :name => name }
+        %w( Tom Dick Jane ).each { |name| @widget.update_attributes name: name }
       end
 
-      should 'have a previous version' do
+      should "have a previous version" do
         assert_equal @widget.versions.last.reify.name, @widget.previous_version.name
       end
 
-      should 'not have a next version' do
+      should "not have a next version" do
         assert_nil @widget.next_version
       end
     end
   end
 
-  context 'A reified item' do
+  context "A reified item" do
     setup do
-      @widget = Widget.create :name => 'Bob'
-      %w(Tom Dick Jane).each { |name| @widget.update_attributes :name => name }
-      @second_widget = @widget.versions[1].reify  # first widget is `nil`
-      @last_widget   = @widget.versions.last.reify
+      @widget = Widget.create name: "Bob"
+      %w(Tom Dick Jane).each { |name| @widget.update_attributes name: name }
+      @second_widget = @widget.versions[1].reify # first widget is `nil`
+      @last_widget = @widget.versions.last.reify
     end
 
-    should 'have a previous version' do
+    should "have a previous version" do
       assert_nil @second_widget.previous_version # `create` events return `nil` for `reify`
       assert_equal @widget.versions[-2].reify.name, @last_widget.previous_version.name
     end
 
-    should 'have a next version' do
+    should "have a next version" do
       assert_equal @widget.versions[2].reify.name, @second_widget.next_version.name
       assert_equal @last_widget.next_version.name, @widget.name
     end
@@ -940,178 +1000,226 @@ class HasPaperTrailModelTest < ActiveSupport::TestCase
 
   context ":has_many :through" do
     setup do
-      @book = Book.create :title => 'War and Peace'
-      @dostoyevsky  = Person.create :name => 'Dostoyevsky'
-      @solzhenitsyn = Person.create :name => 'Solzhenitsyn'
+      @book = Book.create title: "War and Peace"
+      @dostoyevsky = Person.create name: "Dostoyevsky"
+      @solzhenitsyn = Person.create name: "Solzhenitsyn"
     end
 
-    should 'store version on source <<' do
+    should "store version on source <<" do
       count = PaperTrail::Version.count
       @book.authors << @dostoyevsky
       assert_equal 1, PaperTrail::Version.count - count
       assert_equal PaperTrail::Version.last, @book.authorships.first.versions.first
     end
 
-    should 'store version on source create' do
+    should "store version on source create" do
       count = PaperTrail::Version.count
-      @book.authors.create :name => 'Tolstoy'
+      @book.authors.create name: "Tolstoy"
       assert_equal 2, PaperTrail::Version.count - count
-      assert_same_elements [Person.last, Authorship.last], [PaperTrail::Version.order(:id).to_a[-2].item, PaperTrail::Version.last.item]
+      actual = [
+        PaperTrail::Version.order(:id).to_a[-2].item,
+        PaperTrail::Version.last.item
+      ]
+      assert_same_elements [Person.last, Authorship.last], actual
     end
 
-    should 'store version on join destroy' do
+    should "store version on join destroy" do
       @book.authors << @dostoyevsky
       count = PaperTrail::Version.count
-      @book.authorships(true).last.destroy
+      @book.authorships.reload.last.destroy
       assert_equal 1, PaperTrail::Version.count - count
       assert_equal @book, PaperTrail::Version.last.reify.book
-      assert_equal @dostoyevsky, PaperTrail::Version.last.reify.person
+      assert_equal @dostoyevsky, PaperTrail::Version.last.reify.author
     end
 
-    should 'store version on join clear' do
+    should "store version on join clear" do
       @book.authors << @dostoyevsky
       count = PaperTrail::Version.count
-      @book.authorships(true).destroy_all
+      @book.authorships.reload.destroy_all
       assert_equal 1, PaperTrail::Version.count - count
       assert_equal @book, PaperTrail::Version.last.reify.book
-      assert_equal @dostoyevsky, PaperTrail::Version.last.reify.person
+      assert_equal @dostoyevsky, PaperTrail::Version.last.reify.author
     end
   end
 
-  context 'When an attribute has a custom serializer' do
+  context "When an attribute has a custom serializer" do
     setup do
-      @person = Person.new(:time_zone => "Samoa")
+      @person = Person.new(time_zone: "Samoa")
     end
 
     should "be an instance of ActiveSupport::TimeZone" do
       assert_equal ActiveSupport::TimeZone, @person.time_zone.class
     end
 
-    context 'when the model is saved' do
+    context "when the model is saved" do
       setup do
         @changes_before_save = @person.changes.dup
         @person.save!
       end
 
       # Test for serialization:
-      should 'version.object_changes should not have stored the default, ridiculously long (to_yaml) serialization of the TimeZone object' do
-        assert @person.versions.last.object_changes.length < 105, "object_changes length was #{@person.versions.last.object_changes.length}"
+      should "version.object_changes should store long serialization of TimeZone object" do
+        len = @person.versions.last.object_changes.length
+        assert len < 105, "object_changes length was #{len}"
       end
+
       # It should store the serialized value.
-      should 'version.object_changes attribute should have stored the value returned by the attribute serializer' do
-        as_stored_in_version = HashWithIndifferentAccess[YAML::load(@person.versions.last.object_changes)]
-        assert_equal [nil, 'Samoa'], as_stored_in_version[:time_zone]
+      should "version.object_changes attribute should have stored the value from serializer" do
+        as_stored_in_version = HashWithIndifferentAccess[
+          YAML.load(@person.versions.last.object_changes)
+        ]
+        assert_equal [nil, "Samoa"], as_stored_in_version[:time_zone]
         serialized_value = Person::TimeZoneSerializer.dump(@person.time_zone)
         assert_equal serialized_value, as_stored_in_version[:time_zone].last
       end
 
       # Tests for unserialization:
-      should 'version.changeset should convert the attribute value back to its original, unserialized value' do
+      should "version.changeset should convert attribute to original, unserialized value" do
         unserialized_value = Person::TimeZoneSerializer.load(@person.time_zone)
-        assert_equal unserialized_value, @person.versions.last.changeset[:time_zone].last
+        assert_equal unserialized_value,
+          @person.versions.last.changeset[:time_zone].last
       end
+
       should "record.changes (before save) returns the original, unserialized values" do
-        assert_equal [NilClass, ActiveSupport::TimeZone], @changes_before_save[:time_zone].map(&:class)
+        assert_equal [NilClass, ActiveSupport::TimeZone],
+          @changes_before_save[:time_zone].map(&:class)
       end
-      should 'version.changeset should be the same as record.changes was before the save' do
-        assert_equal @changes_before_save, @person.versions.last.changeset.delete_if { |key, val| key.to_sym == :id }
-        assert_equal [NilClass, ActiveSupport::TimeZone], @person.versions.last.changeset[:time_zone].map(&:class)
+
+      should "version.changeset should be the same as record.changes was before the save" do
+        actual = @person.versions.last.changeset.delete_if { |k, _v| k.to_sym == :id }
+        assert_equal @changes_before_save, actual
+        actual = @person.versions.last.changeset[:time_zone].map(&:class)
+        assert_equal [NilClass, ActiveSupport::TimeZone], actual
       end
 
-      context 'when that attribute is updated' do
+      context "when that attribute is updated" do
         setup do
           @attribute_value_before_change = @person.time_zone
-          @person.assign_attributes({ :time_zone => 'Pacific Time (US & Canada)' })
+          @person.assign_attributes(time_zone: "Pacific Time (US & Canada)")
           @changes_before_save = @person.changes.dup
           @person.save!
         end
 
-        # Tests for serialization:
-        # Before the serialized attributes fix, the object/object_changes value that was stored was ridiculously long (58723).
-        should 'version.object should not have stored the default, ridiculously long (to_yaml) serialization of the TimeZone object' do
-          assert @person.versions.last.object.length < 105, "object length was #{@person.versions.last.object.length}"
+        # Tests for serialization
+        # -----------------------
+        #
+        # Before the serialized attributes fix, the object/object_changes value
+        # that was stored was ridiculously long (58723).
+        #
+        # version.object should not have stored the default, ridiculously long
+        # (to_yaml) serialization of the TimeZone object.
+        should "object should not store long serialization of TimeZone object" do
+          len = @person.versions.last.object.length
+          assert len < 105, "object length was #{len}"
         end
-        # Need an additional clause to detect what version of ActiveRecord is being used for this test because AR4 injects the `updated_at` column into the changeset for updates to models
-        should 'version.object_changes should not have stored the default, ridiculously long (to_yaml) serialization of the TimeZone object' do
-          assert @person.versions.last.object_changes.length < (ActiveRecord::VERSION::MAJOR < 4 ? 105 : 118), "object_changes length was #{@person.versions.last.object_changes.length}"
+
+        # Need an additional clause to detect what version of ActiveRecord is
+        # being used for this test because AR4 injects the `updated_at` column
+        # into the changeset for updates to models.
+        #
+        # version.object_changes should not have stored the default,
+        # ridiculously long (to_yaml) serialization of the TimeZone object
+        should "object_changes should not store long serialization of TimeZone object" do
+          max_len = ActiveRecord::VERSION::MAJOR < 4 ? 105 : 118
+          len = @person.versions.last.object_changes.length
+          assert len < max_len, "object_changes length was #{len}"
         end
+
         # But now it stores the short, serialized value.
-        should 'version.object attribute should have stored the value returned by the attribute serializer' do
-          as_stored_in_version = HashWithIndifferentAccess[YAML::load(@person.versions.last.object)]
-          assert_equal 'Samoa', as_stored_in_version[:time_zone]
+        should "version.object attribute should have stored value from serializer" do
+          as_stored_in_version = HashWithIndifferentAccess[
+            YAML.load(@person.versions.last.object)
+          ]
+          assert_equal "Samoa", as_stored_in_version[:time_zone]
           serialized_value = Person::TimeZoneSerializer.dump(@attribute_value_before_change)
           assert_equal serialized_value, as_stored_in_version[:time_zone]
         end
-        should 'version.object_changes attribute should have stored the value returned by the attribute serializer' do
-          as_stored_in_version = HashWithIndifferentAccess[YAML::load(@person.versions.last.object_changes)]
-          assert_equal ['Samoa', 'Pacific Time (US & Canada)'], as_stored_in_version[:time_zone]
+
+        should "version.object_changes attribute should have stored value from serializer" do
+          as_stored_in_version = HashWithIndifferentAccess[
+            YAML.load(@person.versions.last.object_changes)
+          ]
+          assert_equal ["Samoa", "Pacific Time (US & Canada)"], as_stored_in_version[:time_zone]
           serialized_value = Person::TimeZoneSerializer.dump(@person.time_zone)
           assert_equal serialized_value, as_stored_in_version[:time_zone].last
         end
 
         # Tests for unserialization:
-        should 'version.reify should convert the attribute value back to its original, unserialized value' do
+        should "version.reify should convert attribute to original, unserialized value" do
           unserialized_value = Person::TimeZoneSerializer.load(@attribute_value_before_change)
-          assert_equal unserialized_value, @person.versions.last.reify.time_zone
+          assert_equal unserialized_value,
+            @person.versions.last.reify.time_zone
         end
-        should 'version.changeset should convert the attribute value back to its original, unserialized value' do
+
+        should "version.changeset should convert attribute to original, unserialized value" do
           unserialized_value = Person::TimeZoneSerializer.load(@person.time_zone)
-          assert_equal unserialized_value, @person.versions.last.changeset[:time_zone].last
+          assert_equal unserialized_value,
+            @person.versions.last.changeset[:time_zone].last
         end
+
         should "record.changes (before save) returns the original, unserialized values" do
-          assert_equal [ActiveSupport::TimeZone, ActiveSupport::TimeZone], @changes_before_save[:time_zone].map(&:class)
+          assert_equal [ActiveSupport::TimeZone, ActiveSupport::TimeZone],
+            @changes_before_save[:time_zone].map(&:class)
         end
-        should 'version.changeset should be the same as record.changes was before the save' do
+
+        should "version.changeset should be the same as record.changes was before the save" do
           assert_equal @changes_before_save, @person.versions.last.changeset
-          assert_equal [ActiveSupport::TimeZone, ActiveSupport::TimeZone], @person.versions.last.changeset[:time_zone].map(&:class)
+          assert_equal [ActiveSupport::TimeZone, ActiveSupport::TimeZone],
+            @person.versions.last.changeset[:time_zone].map(&:class)
         end
-
       end
     end
   end
 
-
-  context 'A new model instance which uses a custom PaperTrail::Version class' do
+  context "A new model instance which uses a custom PaperTrail::Version class" do
     setup { @post = Post.new }
 
-    context 'which is then saved' do
+    context "which is then saved" do
       setup { @post.save }
-      should 'change the number of post versions' do assert_equal 1, PostVersion.count end
-      should 'not change the number of versions' do assert_equal(0, PaperTrail::Version.count) end
+      should "change the number of post versions" do assert_equal 1, PostVersion.count end
+      should "not change the number of versions" do assert_equal(0, PaperTrail::Version.count) end
     end
   end
 
-  context 'An existing model instance which uses a custom PaperTrail::Version class' do
+  context "An existing model instance which uses a custom PaperTrail::Version class" do
     setup { @post = Post.create }
-    should 'have one post version' do assert_equal(1, PostVersion.count) end
+    should "have one post version" do assert_equal(1, PostVersion.count) end
 
-    context 'on the first version' do
+    context "on the first version" do
       setup { @version = @post.versions.first }
 
-      should 'have the correct index' do
+      should "have the correct index" do
         assert_equal 0, @version.index
       end
     end
 
-    should 'have versions of the custom class' do
+    should "have versions of the custom class" do
       assert_equal "PostVersion", @post.versions.first.class.name
     end
 
-    context 'which is modified' do
-      setup { @post.update_attributes({ :content => "Some new content" }) }
-      should 'change the number of post versions' do assert_equal(2, PostVersion.count) end
-      should 'not change the number of versions' do assert_equal(0, PaperTrail::Version.count) end
+    context "which is modified" do
+      setup do
+        @post.update_attributes(content: "Some new content")
+      end
+
+      should "change the number of post versions" do
+        assert_equal(2, PostVersion.count)
+      end
+
+      should "not change the number of versions" do
+        assert_equal(0, PaperTrail::Version.count)
+      end
+
       should "not have stored changes when object_changes column doesn't exist" do
         assert_nil @post.versions.last.changeset
       end
     end
   end
 
-
-  context 'An overwritten default accessor' do
+  context "An overwritten default accessor" do
     setup do
-      @song = Song.create :length => 4
-      @song.update_attributes :length => 5
+      @song = Song.create length: 4
+      @song.update_attributes length: 5
     end
 
     should 'return "overwritten" value on live instance' do
@@ -1121,74 +1229,73 @@ class HasPaperTrailModelTest < ActiveSupport::TestCase
       assert_equal 4, @song.versions.last.reify.length
     end
 
-    context 'Has a virtual attribute injected into the ActiveModel::Dirty changes' do
+    context "Has a virtual attribute injected into the ActiveModel::Dirty changes" do
       setup do
-        @song.name = 'Good Vibrations'
+        @song.name = "Good Vibrations"
         @song.save
-        @song.name = 'Yellow Submarine'
+        @song.name = "Yellow Submarine"
       end
 
-      should 'return persist the changes on the live instance properly' do
-        assert_equal 'Yellow Submarine', @song.name
+      should "return persist the changes on the live instance properly" do
+        assert_equal "Yellow Submarine", @song.name
       end
       should 'return "overwritten" virtual attribute on the reified instance' do
-        assert_equal 'Good Vibrations', @song.versions.last.reify.name
+        assert_equal "Good Vibrations", @song.versions.last.reify.name
       end
     end
   end
 
-
-  context 'An unsaved record' do
+  context "An unsaved record" do
     setup do
       @widget = Widget.new
       @widget.destroy
     end
-    should 'not have a version created on destroy' do
+    should "not have a version created on destroy" do
       assert @widget.versions.empty?
     end
   end
 
-  context 'A model with a custom association' do
+  context "A model with a custom association" do
     setup do
       @doc = Document.create
-      @doc.update_attributes :name => 'Doc 1'
+      @doc.update_attributes name: "Doc 1"
     end
 
-    should 'not respond to versions method' do
+    should "not respond to versions method" do
       assert !@doc.respond_to?(:versions)
     end
 
-    should 'create a new version record' do
+    should "create a new version record" do
       assert_equal 2, @doc.paper_trail_versions.length
     end
 
-    should 'respond to `next_version` as normal' do
+    should "respond to `next_version` as normal" do
       assert_equal @doc.paper_trail_versions.last.reify.next_version.name, @doc.name
     end
 
-    should 'respond to `previous_version` as normal' do
-      @doc.update_attributes :name => 'Doc 2'
+    should "respond to `previous_version` as normal" do
+      @doc.update_attributes name: "Doc 2"
       assert_equal 3, @doc.paper_trail_versions.length
-      assert_equal 'Doc 1', @doc.previous_version.name
+      assert_equal "Doc 1", @doc.previous_version.name
     end
   end
 
-  context 'The `on` option' do
-    context 'on create' do
+  context "The `on` option" do
+    context "on create" do
       setup do
         Fluxor.instance_eval <<-END
           has_paper_trail :on => [:create]
         END
         @fluxor = Fluxor.create
-        @fluxor.update_attributes :name => 'blah'
+        @fluxor.update_attributes name: "blah"
         @fluxor.destroy
       end
-      should 'only have a version for the create event' do
+      should "only have a version for the create event" do
         assert_equal 1, @fluxor.versions.length
-        assert_equal 'create', @fluxor.versions.last.event
+        assert_equal "create", @fluxor.versions.last.event
       end
     end
-    context 'on update' do
+    context "on update" do
       setup do
         Fluxor.reset_callbacks :create
         Fluxor.reset_callbacks :update
@@ -1197,15 +1304,15 @@ class HasPaperTrailModelTest < ActiveSupport::TestCase
           has_paper_trail :on => [:update]
         END
         @fluxor = Fluxor.create
-        @fluxor.update_attributes :name => 'blah'
+        @fluxor.update_attributes name: "blah"
         @fluxor.destroy
       end
-      should 'only have a version for the update event' do
+      should "only have a version for the update event" do
         assert_equal 1, @fluxor.versions.length
-        assert_equal 'update', @fluxor.versions.last.event
+        assert_equal "update", @fluxor.versions.last.event
       end
     end
-    context 'on destroy' do
+    context "on destroy" do
       setup do
         Fluxor.reset_callbacks :create
         Fluxor.reset_callbacks :update
@@ -1214,15 +1321,15 @@ class HasPaperTrailModelTest < ActiveSupport::TestCase
           has_paper_trail :on => [:destroy]
         END
         @fluxor = Fluxor.create
-        @fluxor.update_attributes :name => 'blah'
+        @fluxor.update_attributes name: "blah"
         @fluxor.destroy
       end
-      should 'only have a version for the destroy event' do
+      should "only have a version for the destroy event" do
         assert_equal 1, @fluxor.versions.length
-        assert_equal 'destroy', @fluxor.versions.last.event
+        assert_equal "destroy", @fluxor.versions.last.event
       end
     end
-    context 'on []' do
+    context "on []" do
       setup do
         Fluxor.reset_callbacks :create
         Fluxor.reset_callbacks :update
@@ -1231,23 +1338,23 @@ class HasPaperTrailModelTest < ActiveSupport::TestCase
           has_paper_trail :on => []
         END
         @fluxor = Fluxor.create
-        @fluxor.update_attributes :name => 'blah'
+        @fluxor.update_attributes name: "blah"
       end
 
       teardown do
         @fluxor.destroy
       end
 
-      should 'not have any versions' do
+      should "not have any versions" do
         assert_equal 0, @fluxor.versions.length
       end
 
-      should 'still respond to touch_with_version' do
+      should "still respond to touch_with_version" do
         @fluxor.touch_with_version
         assert_equal 1, @fluxor.versions.length
       end
     end
-    context 'allows a symbol to be passed' do
+    context "allows a symbol to be passed" do
       setup do
         Fluxor.reset_callbacks :create
         Fluxor.reset_callbacks :update
@@ -1256,54 +1363,54 @@ class HasPaperTrailModelTest < ActiveSupport::TestCase
           has_paper_trail :on => :create
         END
         @fluxor = Fluxor.create
-        @fluxor.update_attributes :name => 'blah'
+        @fluxor.update_attributes name: "blah"
         @fluxor.destroy
       end
-      should 'only have a version for hte create event' do
+      should "only have a version for hte create event" do
         assert_equal 1, @fluxor.versions.length
-        assert_equal 'create', @fluxor.versions.last.event
+        assert_equal "create", @fluxor.versions.last.event
       end
     end
   end
 
-  context 'A model with column version and custom version_method' do
+  context "A model with column version and custom version_method" do
     setup do
-      @legacy_widget = LegacyWidget.create(:name => "foo", :version => 2)
+      @legacy_widget = LegacyWidget.create(name: "foo", version: 2)
     end
 
-    should 'set version on create' do
+    should "set version on create" do
       assert_equal 2, @legacy_widget.version
     end
 
-    should 'allow version updates' do
-      @legacy_widget.update_attributes :version => 3
+    should "allow version updates" do
+      @legacy_widget.update_attributes version: 3
       assert_equal 3, @legacy_widget.version
     end
 
-    should 'create a new version record' do
+    should "create a new version record" do
       assert_equal 1, @legacy_widget.versions.size
     end
   end
 
-  context 'A reified item with a column -version- and custom version_method' do
+  context "A reified item with a column -version- and custom version_method" do
     setup do
-      widget = LegacyWidget.create(:name => "foo", :version => 2)
-      %w( bar baz ).each { |name| widget.update_attributes :name => name }
+      widget = LegacyWidget.create(name: "foo", version: 2)
+      %w( bar baz ).each { |name| widget.update_attributes name: name }
       @version = widget.versions.last
       @widget = @version.reify
     end
 
-    should 'know which version it came from' do
+    should "know which version it came from" do
       assert_equal @version, @widget.custom_version
     end
 
-    should 'return its previous self' do
+    should "return its previous self" do
       assert_equal @widget.versions[-2].reify, @widget.previous_version
     end
   end
 
-  context 'custom events' do
-    context 'on create' do
+  context "custom events" do
+    context "on create" do
       setup do
         Fluxor.reset_callbacks :create
         Fluxor.reset_callbacks :update
@@ -1311,16 +1418,16 @@ class HasPaperTrailModelTest < ActiveSupport::TestCase
         Fluxor.instance_eval <<-END
           has_paper_trail :on => [:create]
         END
-        @fluxor = Fluxor.new.tap { |model| model.paper_trail_event = 'created' }
-        @fluxor.update_attributes :name => 'blah'
+        @fluxor = Fluxor.new.tap { |model| model.paper_trail_event = "created" }
+        @fluxor.update_attributes name: "blah"
         @fluxor.destroy
       end
-      should 'only have a version for the created event' do
+      should "only have a version for the created event" do
         assert_equal 1, @fluxor.versions.length
-        assert_equal 'created', @fluxor.versions.last.event
+        assert_equal "created", @fluxor.versions.last.event
       end
     end
-    context 'on update' do
+    context "on update" do
       setup do
         Fluxor.reset_callbacks :create
         Fluxor.reset_callbacks :update
@@ -1328,16 +1435,16 @@ class HasPaperTrailModelTest < ActiveSupport::TestCase
         Fluxor.instance_eval <<-END
           has_paper_trail :on => [:update]
         END
-        @fluxor = Fluxor.create.tap { |model| model.paper_trail_event = 'name_updated' }
-        @fluxor.update_attributes :name => 'blah'
+        @fluxor = Fluxor.create.tap { |model| model.paper_trail_event = "name_updated" }
+        @fluxor.update_attributes name: "blah"
         @fluxor.destroy
       end
-      should 'only have a version for the name_updated event' do
+      should "only have a version for the name_updated event" do
         assert_equal 1, @fluxor.versions.length
-        assert_equal 'name_updated', @fluxor.versions.last.event
+        assert_equal "name_updated", @fluxor.versions.last.event
       end
     end
-    context 'on destroy' do
+    context "on destroy" do
       setup do
         Fluxor.reset_callbacks :create
         Fluxor.reset_callbacks :update
@@ -1345,28 +1452,28 @@ class HasPaperTrailModelTest < ActiveSupport::TestCase
         Fluxor.instance_eval <<-END
           has_paper_trail :on => [:destroy]
         END
-        @fluxor = Fluxor.create.tap { |model| model.paper_trail_event = 'destroyed' }
-        @fluxor.update_attributes :name => 'blah'
+        @fluxor = Fluxor.create.tap { |model| model.paper_trail_event = "destroyed" }
+        @fluxor.update_attributes name: "blah"
         @fluxor.destroy
       end
-      should 'only have a version for the destroy event' do
+      should "only have a version for the destroy event" do
         assert_equal 1, @fluxor.versions.length
-        assert_equal 'destroyed', @fluxor.versions.last.event
+        assert_equal "destroyed", @fluxor.versions.last.event
       end
     end
   end
 
-  context '`PaperTrail::Config.version_limit` set' do
+  context "`PaperTrail::Config.version_limit` set" do
     setup do
       PaperTrail.config.version_limit = 2
-      @widget = Widget.create! :name => 'Henry'
-      6.times { @widget.update_attribute(:name, Faker::Lorem.word) }
+      @widget = Widget.create! name: "Henry"
+      6.times { @widget.update_attribute(:name, FFaker::Lorem.word) }
     end
 
     teardown { PaperTrail.config.version_limit = nil }
 
     should "limit the number of versions to 3 (2 plus the created at event)" do
-      assert_equal 'create', @widget.versions.first.event
+      assert_equal "create", @widget.versions.first.event
       assert_equal 3, @widget.versions.size
     end
   end