test/unit/serializer_test.rb in paper_trail-4.2.0 vs test/unit/serializer_test.rb in paper_trail-5.0.0

@@ -1,117 +1,118 @@
-require 'test_helper'
-require 'custom_json_serializer'
+require "test_helper"
+require "custom_json_serializer"
 
 class SerializerTest < ActiveSupport::TestCase
-
-  context 'YAML Serializer' do
+  context "YAML Serializer" do
     setup do
       Fluxor.instance_eval <<-END
         has_paper_trail
       END
 
-      @fluxor = Fluxor.create :name => 'Some text.'
-      @original_fluxor_attributes = @fluxor.send(:attributes_before_change) # this is exactly what PaperTrail serializes
-      @fluxor.update_attributes :name => 'Some more text.'
+      @fluxor = Fluxor.create name: "Some text."
+
+      # this is exactly what PaperTrail serializes
+      @original_fluxor_attributes = @fluxor.send(:attributes_before_change)
+
+      @fluxor.update_attributes name: "Some more text."
     end
 
-    should 'work with the default `YAML` serializer' do
+    should "work with the default `YAML` serializer" do
       # Normal behaviour
       assert_equal 2, @fluxor.versions.length
       assert_nil @fluxor.versions[0].reify
-      assert_equal 'Some text.', @fluxor.versions[1].reify.name
+      assert_equal "Some text.", @fluxor.versions[1].reify.name
 
       # Check values are stored as `YAML`.
       assert_equal @original_fluxor_attributes, YAML.load(@fluxor.versions[1].object)
-      # This test can't consistently pass in Ruby1.8 because hashes do no preserve order, which means the order of the
-      # attributes in the `YAML` can't be ensured.
-      if RUBY_VERSION >= '1.9'
-        assert_equal YAML.dump(@original_fluxor_attributes), @fluxor.versions[1].object
-      end
+      assert_equal YAML.dump(@original_fluxor_attributes), @fluxor.versions[1].object
     end
   end
 
-  context 'JSON Serializer' do
+  context "JSON Serializer" do
     setup do
       PaperTrail.configure do |config|
         config.serializer = PaperTrail::Serializers::JSON
       end
 
       Fluxor.instance_eval <<-END
         has_paper_trail
       END
 
-      @fluxor = Fluxor.create :name => 'Some text.'
-      @original_fluxor_attributes = @fluxor.send(:attributes_before_change) # this is exactly what PaperTrail serializes
-      @fluxor.update_attributes :name => 'Some more text.'
+      @fluxor = Fluxor.create name: "Some text."
+
+      # this is exactly what PaperTrail serializes
+      @original_fluxor_attributes = @fluxor.send(:attributes_before_change)
+
+      @fluxor.update_attributes name: "Some more text."
     end
 
     teardown do
       PaperTrail.config.serializer = PaperTrail::Serializers::YAML
     end
 
-    should 'reify with JSON serializer' do
+    should "reify with JSON serializer" do
       # Normal behaviour
       assert_equal 2, @fluxor.versions.length
       assert_nil @fluxor.versions[0].reify
-      assert_equal 'Some text.', @fluxor.versions[1].reify.name
+      assert_equal "Some text.", @fluxor.versions[1].reify.name
 
       # Check values are stored as JSON.
-      assert_equal @original_fluxor_attributes, ActiveSupport::JSON.decode(@fluxor.versions[1].object)
-      # This test can't consistently pass in Ruby1.8 because hashes do no preserve order, which means the order of the
-      # attributes in the JSON can't be ensured.
-      if RUBY_VERSION >= '1.9'
-        assert_equal ActiveSupport::JSON.encode(@original_fluxor_attributes), @fluxor.versions[1].object
-      end
+      assert_equal @original_fluxor_attributes,
+        ActiveSupport::JSON.decode(@fluxor.versions[1].object)
+      assert_equal ActiveSupport::JSON.encode(@original_fluxor_attributes),
+        @fluxor.versions[1].object
     end
 
-    should 'store object_changes' do
-      initial_changeset = {"name" => [nil, "Some text."], "id" => [nil, @fluxor.id]}
-      second_changeset =  {"name"=>["Some text.", "Some more text."]}
+    should "store object_changes" do
+      initial_changeset = { "name" => [nil, "Some text."], "id" => [nil, @fluxor.id] }
+      second_changeset = { "name" => ["Some text.", "Some more text."] }
       assert_equal initial_changeset, @fluxor.versions[0].changeset
       assert_equal second_changeset,  @fluxor.versions[1].changeset
     end
   end
 
-  context 'Custom Serializer' do
+  context "Custom Serializer" do
     setup do
       PaperTrail.configure do |config|
         config.serializer = CustomJsonSerializer
       end
 
       Fluxor.instance_eval <<-END
         has_paper_trail
       END
 
       @fluxor = Fluxor.create
-      @original_fluxor_attributes = @fluxor.send(:attributes_before_change).reject { |k,v| v.nil? } # this is exactly what PaperTrail serializes
-      @fluxor.update_attributes :name => 'Some more text.'
+
+      # this is exactly what PaperTrail serializes
+      @original_fluxor_attributes = @fluxor.
+        send(:attributes_before_change).
+        reject { |_k, v| v.nil? }
+
+      @fluxor.update_attributes name: "Some more text."
     end
 
     teardown do
       PaperTrail.config.serializer = PaperTrail::Serializers::YAML
     end
 
-    should 'reify with custom serializer' do
+    should "reify with custom serializer" do
       # Normal behaviour
       assert_equal 2, @fluxor.versions.length
       assert_nil @fluxor.versions[0].reify
       assert_nil @fluxor.versions[1].reify.name
 
       # Check values are stored as JSON.
-      assert_equal @original_fluxor_attributes, ActiveSupport::JSON.decode(@fluxor.versions[1].object)
-      # This test can't consistently pass in Ruby1.8 because hashes do no preserve order, which means the order of the
-      # attributes in the JSON can't be ensured.
-      if RUBY_VERSION >= '1.9'
-        assert_equal ActiveSupport::JSON.encode(@original_fluxor_attributes), @fluxor.versions[1].object
-      end
+      assert_equal @original_fluxor_attributes,
+        ActiveSupport::JSON.decode(@fluxor.versions[1].object)
+      assert_equal ActiveSupport::JSON.encode(@original_fluxor_attributes),
+        @fluxor.versions[1].object
     end
 
-    should 'store object_changes' do
-      initial_changeset = {"id" => [nil, @fluxor.id]}
-      second_changeset =  {"name"=>[nil, "Some more text."]}
+    should "store object_changes" do
+      initial_changeset = { "id" => [nil, @fluxor.id] }
+      second_changeset = { "name" => [nil, "Some more text."] }
       assert_equal initial_changeset, @fluxor.versions[0].changeset
       assert_equal second_changeset,  @fluxor.versions[1].changeset
     end
   end
-
 end