active_data 1.0.0 → 1.1.0

data/spec/lib/active_data/model/associations/reflections/references_many_spec.rb

@@ -1,16 +1,16 @@
-# encoding: UTF-8
 require 'spec_helper'
 
 describe ActiveData::Model::Associations::Reflections::ReferencesMany do
   before do
     stub_class(:author, ActiveRecord::Base) do
-      scope :name_starts_with_a, -> { where('name LIKE "a%"') }
+      scope :name_starts_with_a, -> { name_starts_with('a') }
+      scope :name_starts_with, ->(letter) { where("name LIKE '#{letter}%'") }
     end
 
     stub_model(:book) do
       include ActiveData::Model::Associations
 
-      attribute :title
+      attribute :title, String
       references_many :authors
     end
   end
@@ -27,17 +27,21 @@ describe ActiveData::Model::Associations::Reflections::ReferencesMany do
       stub_model(:book) do
         include ActiveData::Model::Associations
 
-        attribute :title
+        attribute :title, String
         references_many :creators, class_name: 'Author'
       end
     end
 
     let(:book) { Book.new }
 
-    specify { expect { book.creators << author }
-      .to change { book.creators }.from([]).to([author]) }
-    specify { expect { book.creators << author }
-      .to change { book.creator_ids }.from([]).to([author.id]) }
+    specify do
+      expect { book.creators << author }
+        .to change { book.creators }.from([]).to([author])
+    end
+    specify do
+      expect { book.creators << author }
+        .to change { book.creator_ids }.from([]).to([author.id])
+    end
   end
 
   describe ':primary_key' do
@@ -51,10 +55,14 @@ describe ActiveData::Model::Associations::Reflections::ReferencesMany do
 
     let(:author) { Author.create!(name: 'Rick') }
 
-    specify { expect { book.author_names = [author.name] }
-      .to change { book.authors }.from([]).to([author]) }
-    specify { expect { book.authors = [author] }
-      .to change { book.author_names }.from([]).to([author.name]) }
+    specify do
+      expect { book.author_names = [author.name] }
+        .to change { book.authors }.from([]).to([author])
+    end
+    specify do
+      expect { book.authors = [author] }
+        .to change { book.author_names }.from([]).to([author.name])
+    end
   end
 
   describe ':reference_key' do
@@ -67,10 +75,14 @@ describe ActiveData::Model::Associations::Reflections::ReferencesMany do
 
     let(:author) { Author.create!(name: 'Rick') }
 
-    specify { expect { book.identify = [author.id] }
-      .to change { book.authors }.from([]).to([author]) }
-    specify { expect { book.authors = [author] }
-      .to change { book.identify }.from([]).to([author.id]) }
+    specify do
+      expect { book.identify = [author.id] }
+        .to change { book.authors }.from([]).to([author])
+    end
+    specify do
+      expect { book.authors = [author] }
+        .to change { book.identify }.from([]).to([author.id])
+    end
   end
 
   describe ':default' do
@@ -146,30 +158,63 @@ describe ActiveData::Model::Associations::Reflections::ReferencesMany do
     it_behaves_like :new_record_default, -> { Author.new(name: 'Author') }
   end
 
+  describe 'Book.inspect' do
+    specify { expect(Book.inspect).to eq('Book(authors: ReferencesMany(Author), title: String, author_ids: (reference))') }
+  end
+
   describe '#scope' do
     before do
       stub_model(:book) do
         include ActiveData::Model::Associations
-        references_many :authors, -> { name_starts_with_a }
+        references_many :authors, ->(owner) { name_starts_with(owner.letter) }
+        attribute :letter, String
       end
     end
 
+    let(:book) { Book.new(letter: 'a') }
     let!(:author1) { Author.create!(name: 'Rick') }
     let!(:author2) { Author.create!(name: 'Aaron') }
-    specify { expect { book.authors = [author1, author2] }
-      .to change { book.authors }.from([]).to([author1, author2]) }
-    specify { expect { book.authors = [author1, author2] }
-      .to change { book.author_ids }.from([]).to([author1.id, author2.id]) }
-
-    specify { expect { book.author_ids = [author1.id, author2.id] }
-      .to change { book.authors }.from([]).to([author2]) }
-    specify { expect { book.author_ids = [author1.id, author2.id] }
-      .to change { book.author_ids }.from([]).to([author2.id]) }
-
-    specify { expect { book.authors = [author1, author2] }
-      .to change { book.authors.reload }.from([]).to([author2]) }
-    specify { expect { book.authors = [author1, author2] }
-      .to change { book.authors.reload; book.author_ids }.from([]).to([author2.id]) }
+
+    specify do
+      expect { book.authors = [author1, author2] }
+        .to change { book.authors }.from([]).to([author1, author2])
+    end
+    specify do
+      expect { book.authors = [author1, author2] }
+        .to change { book.author_ids }.from([]).to([author1.id, author2.id])
+    end
+
+    specify do
+      expect { book.author_ids = [author1.id, author2.id] }
+        .to change { book.authors }.from([]).to([author2])
+    end
+    specify do
+      expect { book.author_ids = [author1.id, author2.id] }
+        .to change { book.author_ids }.from([]).to([author2.id])
+    end
+
+    specify do
+      expect { book.authors = [author1, author2] }
+        .to change { book.authors.reload }.from([]).to([author2])
+    end
+    specify do
+      expect { book.authors = [author1, author2] }
+        .to change {
+          book.authors.reload
+          book.author_ids
+        }.from([]).to([author2.id])
+    end
+
+    context do
+      let(:book2) { Book.new(letter: 'r') }
+
+      specify 'scope is not cached too much' do
+        expect { book.author_ids = [author1.id, author2.id] }
+          .to change { book.authors }.from([]).to([author2])
+        expect { book2.author_ids = [author1.id, author2.id] }
+          .to change { book2.authors }.from([]).to([author1])
+      end
+    end
   end
 
   describe '#author' do
@@ -227,8 +272,10 @@ describe ActiveData::Model::Associations::Reflections::ReferencesMany do
 
       context do
         before { book.authors = [author, other] }
-        specify { expect { author.save! }.to change { book.author_ids }.from([nil, other.id])
-          .to(match([an_instance_of(Fixnum), other.id])) }
+        specify do
+          expect { author.save! }.to change { book.author_ids }.from([nil, other.id])
+            .to(match([be_a(Integer), other.id]))
+        end
         specify { expect { author.save! }.not_to change { book.authors } }
       end
     end
@@ -237,6 +284,7 @@ describe ActiveData::Model::Associations::Reflections::ReferencesMany do
   describe '#author_ids=' do
     specify { expect { book.author_ids = [author.id] }.to change { book.author_ids }.from([]).to([author.id]) }
     specify { expect { book.author_ids = [author.id] }.to change { book.authors }.from([]).to([author]) }
+    specify { expect { book.author_ids = [author] }.to change { book.authors }.from([]).to([author]) }
 
     specify { expect { book.author_ids = [author.id.next.to_s] }.not_to change { book.author_ids }.from([]) }
     specify { expect { book.author_ids = [author.id.next.to_s] }.not_to change { book.authors }.from([]) }

data/spec/lib/active_data/model/associations/reflections/references_one_spec.rb

@@ -1,16 +1,16 @@
-# encoding: UTF-8
 require 'spec_helper'
 
 describe ActiveData::Model::Associations::Reflections::ReferencesOne do
   before do
     stub_class(:author, ActiveRecord::Base) do
-      scope :name_starts_with_a, -> { where('name LIKE "a%"') }
+      scope :name_starts_with_a, -> { name_starts_with('a') }
+      scope :name_starts_with, ->(letter) { where("name LIKE '#{letter}%'") }
     end
 
     stub_model(:book) do
       include ActiveData::Model::Associations
 
-      attribute :title
+      attribute :title, String
       references_one :author
     end
   end
@@ -23,16 +23,20 @@ describe ActiveData::Model::Associations::Reflections::ReferencesOne do
       stub_model(:book) do
         include ActiveData::Model::Associations
 
-        attribute :title
+        attribute :title, String
         references_one :creator, class_name: 'Author'
       end
     end
     let(:author) { Author.create!(name: 'Rick') }
 
-    specify { expect { book.creator = author }
-      .to change { book.creator }.from(nil).to(author) }
-    specify { expect { book.creator = author }
-      .to change { book.creator_id }.from(nil).to(author.id) }
+    specify do
+      expect { book.creator = author }
+        .to change { book.creator }.from(nil).to(author)
+    end
+    specify do
+      expect { book.creator = author }
+        .to change { book.creator_id }.from(nil).to(author.id)
+    end
   end
 
   describe ':primary_key' do
@@ -46,10 +50,14 @@ describe ActiveData::Model::Associations::Reflections::ReferencesOne do
 
     let(:author) { Author.create!(name: 'Rick') }
 
-    specify { expect { book.author_name = author.name }
-      .to change { book.author }.from(nil).to(author) }
-    specify { expect { book.author = author }
-      .to change { book.author_name }.from(nil).to(author.name) }
+    specify do
+      expect { book.author_name = author.name }
+        .to change { book.author }.from(nil).to(author)
+    end
+    specify do
+      expect { book.author = author }
+        .to change { book.author_name }.from(nil).to(author.name)
+    end
   end
 
   describe ':reference_key' do
@@ -62,10 +70,14 @@ describe ActiveData::Model::Associations::Reflections::ReferencesOne do
 
     let(:author) { Author.create!(name: 'Rick') }
 
-    specify { expect { book.identify = author.id }
-      .to change { book.author }.from(nil).to(author) }
-    specify { expect { book.author = author }
-      .to change { book.identify }.from(nil).to(author.id) }
+    specify do
+      expect { book.identify = author.id }
+        .to change { book.author }.from(nil).to(author)
+    end
+    specify do
+      expect { book.author = author }
+        .to change { book.identify }.from(nil).to(author.id)
+    end
   end
 
   describe ':default' do
@@ -129,36 +141,81 @@ describe ActiveData::Model::Associations::Reflections::ReferencesOne do
     it_behaves_like :new_record_default, -> { Author.new(name: 'Author') }
   end
 
+  describe 'Book.inspect' do
+    specify { expect(Book.inspect).to eq('Book(author: ReferencesOne(Author), title: String, author_id: (reference))') }
+  end
+
   describe '#scope' do
     before do
       stub_model(:book) do
         include ActiveData::Model::Associations
-        references_one :author, -> { name_starts_with_a }
+        references_one :author, ->(owner) { name_starts_with(owner.letter) }
+        attribute :letter, String
       end
     end
 
+    let(:book) { Book.new(letter: 'a') }
     let!(:author1) { Author.create!(name: 'Rick') }
     let!(:author2) { Author.create!(name: 'Aaron') }
 
-    specify { expect { book.author_id = author1.id }
-      .not_to change { book.author } }
-    specify { expect { book.author_id = author2.id }
-      .to change { book.author }.from(nil).to(author2) }
-
-    specify { expect { book.author = author1 }
-      .to change { book.author_id }.from(nil).to(author1.id) }
-    specify { expect { book.author = author2 }
-      .to change { book.author_id }.from(nil).to(author2.id) }
-
-    specify { expect { book.author = author1 }
-      .to change { book.association(:author).reload; book.author_id }.from(nil).to(author1.id) }
-    specify { expect { book.author = author2 }
-      .to change { book.association(:author).reload; book.author_id }.from(nil).to(author2.id) }
-
-    specify { expect { book.author = author1 }
-      .not_to change { book.association(:author).reload; book.author } }
-    specify { expect { book.author = author2 }
-      .to change { book.association(:author).reload; book.author }.from(nil).to(author2) }
+    specify do
+      expect { book.author_id = author1.id }
+        .not_to change { book.author }
+    end
+    specify do
+      expect { book.author_id = author2.id }
+        .to change { book.author }.from(nil).to(author2)
+    end
+
+    specify do
+      expect { book.author = author1 }
+        .to change { book.author_id }.from(nil).to(author1.id)
+    end
+    specify do
+      expect { book.author = author2 }
+        .to change { book.author_id }.from(nil).to(author2.id)
+    end
+
+    specify do
+      expect { book.author = author1 }
+        .to change {
+          book.association(:author).reload
+          book.author_id
+        }.from(nil).to(author1.id)
+    end
+    specify do
+      expect { book.author = author2 }
+        .to change {
+          book.association(:author).reload
+          book.author_id
+        }.from(nil).to(author2.id)
+    end
+
+    specify do
+      expect { book.author = author1 }
+        .not_to change {
+          book.association(:author).reload
+          book.author
+        }
+    end
+    specify do
+      expect { book.author = author2 }
+        .to change {
+          book.association(:author).reload
+          book.author
+        }.from(nil).to(author2)
+    end
+
+    context do
+      let(:book2) { Book.new(letter: 'r') }
+
+      specify 'scope is not cached too much' do
+        expect { book.author_id = author2.id }
+          .to change { book.author }.from(nil).to(author2)
+        expect { book2.author_id = author1.id }
+          .to change { book2.author }.from(nil).to(author1)
+      end
+    end
   end
 
   describe '#author=' do
@@ -182,7 +239,7 @@ describe ActiveData::Model::Associations::Reflections::ReferencesOne do
 
       context do
         before { book.author = author }
-        specify { expect { author.save! }.to change { book.author_id }.from(nil).to(an_instance_of(Fixnum)) }
+        specify { expect { author.save! }.to change { book.author_id }.from(nil).to(be_a(Integer)) }
         specify { expect { author.save! }.not_to change { book.author } }
       end
     end
@@ -192,6 +249,7 @@ describe ActiveData::Model::Associations::Reflections::ReferencesOne do
     let(:author) { Author.create!(name: 'Author') }
     specify { expect { book.author_id = author.id }.to change { book.author_id }.from(nil).to(author.id) }
     specify { expect { book.author_id = author.id }.to change { book.author }.from(nil).to(author) }
+    specify { expect { book.author_id = author }.to change { book.author }.from(nil).to(author) }
 
     specify { expect { book.author_id = author.id.next.to_s }.to change { book.author_id }.from(nil).to(author.id.next) }
     specify { expect { book.author_id = author.id.next.to_s }.not_to change { book.author }.from(nil) }
@@ -205,4 +263,25 @@ describe ActiveData::Model::Associations::Reflections::ReferencesOne do
       specify { expect { book.author_id = nil }.to change { book.author }.from(other).to(nil) }
     end
   end
+
+  describe '#build_author' do
+    specify { expect(book.build_author(name: 'Author')).to be_a(Author) }
+    specify { expect(book.build_author(name: 'Author')).not_to be_persisted }
+    specify { expect { book.build_author(name: 'Author') }.to change { book.author }.from(nil).to(an_instance_of(Author)) }
+    specify { expect { book.build_author(name: 'Author') }.not_to change { book.author_id }.from(nil) }
+  end
+
+  describe '#create_author' do
+    specify { expect(book.create_author(name: 'Author')).to be_a(Author) }
+    specify { expect(book.create_author(name: 'Author')).to be_persisted }
+    specify { expect { book.create_author(name: 'Author') }.to change { book.author }.from(nil).to(an_instance_of(Author)) }
+    specify { expect { book.create_author(name: 'Author') }.to change { book.author_id }.from(nil).to(be_a(Integer)) }
+  end
+
+  describe '#create_author!' do
+    specify { expect(book.create_author!(name: 'Author')).to be_a(Author) }
+    specify { expect(book.create_author!(name: 'Author')).to be_persisted }
+    specify { expect { book.create_author!(name: 'Author') }.to change { book.author }.from(nil).to(an_instance_of(Author)) }
+    specify { expect { book.create_author!(name: 'Author') }.to change { book.author_id }.from(nil).to(be_a(Integer)) }
+  end
 end

data/spec/lib/active_data/model/associations/validations_spec.rb

@@ -5,6 +5,7 @@ describe ActiveData::Model::Associations::Validations do
     stub_model(:project) do
       include ActiveData::Model::Lifecycle
       include ActiveData::Model::Associations
+      include ActiveData::Model::Associations::Validations
 
       attribute :title, String
       validates :title, presence: true
@@ -25,6 +26,7 @@ describe ActiveData::Model::Associations::Validations do
 
     stub_model(:user) do
       include ActiveData::Model::Associations
+      include ActiveData::Model::Associations::Validations
 
       attribute :login, String
       validates :login, presence: true
@@ -39,7 +41,7 @@ describe ActiveData::Model::Associations::Validations do
     let(:project) { Project.new title: 'Project' }
     let(:projects) { [project] }
     let(:user) { User.new(login: 'Login', profile: profile, projects: projects) }
-    let(:author_attributes) { { name: 'Author' } }
+    let(:author_attributes) { {name: 'Author'} }
     before { project.build_author(author_attributes) }
 
     specify { expect(user.validate).to eq(true) }
@@ -49,8 +51,10 @@ describe ActiveData::Model::Associations::Validations do
       let(:author_attributes) { {} }
 
       specify { expect(user.validate).to eq(false) }
-      specify { expect { user.validate }.to change { user.errors.messages }
-        .to(:'projects.0.author.name' => ["can't be blank"]) }
+      specify do
+        expect { user.validate }.to change { user.errors.messages }
+          .to(:'projects.0.author.name' => ["can't be blank"])
+      end
     end
 
     context do
@@ -64,8 +68,10 @@ describe ActiveData::Model::Associations::Validations do
       let(:projects) { [project, Project.new] }
 
       specify { expect(user.validate).to eq(false) }
-      specify { expect { user.validate }.to change { user.errors.messages }
-        .to(:'projects.1.title' => ["can't be blank"]) }
+      specify do
+        expect { user.validate }.to change { user.errors.messages }
+          .to(:'projects.1.title' => ["can't be blank"])
+      end
     end
   end
 
@@ -74,7 +80,7 @@ describe ActiveData::Model::Associations::Validations do
     let(:project) { Project.new title: 'Project' }
     let(:projects) { [project] }
     let(:user) { User.new(login: 'Login', profile: profile, projects: projects) }
-    let(:author_attributes) { { name: 'Author' } }
+    let(:author_attributes) { {name: 'Author'} }
     before { project.build_author(author_attributes) }
 
     specify { expect(user.validate_ancestry).to eq(true) }
@@ -90,8 +96,10 @@ describe ActiveData::Model::Associations::Validations do
       specify { expect { user.validate_ancestry! }.to raise_error ActiveData::ValidationError }
       specify { expect(user.valid_ancestry?).to eq(false) }
       specify { expect(user.invalid_ancestry?).to eq(true) }
-      specify { expect { user.validate_ancestry }.to change { user.errors.messages }
-        .to(:'projects.0.author.name' => ["can't be blank"]) }
+      specify do
+        expect { user.validate_ancestry }.to change { user.errors.messages }
+          .to(:'projects.0.author.name' => ["can't be blank"])
+      end
     end
 
     context do
@@ -100,8 +108,10 @@ describe ActiveData::Model::Associations::Validations do
       specify { expect { user.validate_ancestry! }.to raise_error ActiveData::ValidationError }
       specify { expect(user.valid_ancestry?).to eq(false) }
       specify { expect(user.invalid_ancestry?).to eq(true) }
-      specify { expect { user.validate_ancestry }.to change { user.errors.messages }
-        .to(:'profile.first_name' => ["can't be blank"]) }
+      specify do
+        expect { user.validate_ancestry }.to change { user.errors.messages }
+          .to(:'profile.first_name' => ["can't be blank"])
+      end
     end
 
     context do
@@ -110,44 +120,18 @@ describe ActiveData::Model::Associations::Validations do
       specify { expect { user.validate_ancestry! }.to raise_error ActiveData::ValidationError }
       specify { expect(user.valid_ancestry?).to eq(false) }
       specify { expect(user.invalid_ancestry?).to eq(true) }
-      specify { expect { user.validate_ancestry }.to change { user.errors.messages }
-        .to(:'projects.1.title' => ["can't be blank"]) }
+      specify do
+        expect { user.validate_ancestry }.to change { user.errors.messages }
+          .to(:'projects.1.title' => ["can't be blank"])
+      end
 
       context do
         before { user.update(login: '') }
-        specify { expect { user.validate_ancestry }.to change { user.errors.messages }
-          .to(:'projects.1.title' => ["can't be blank"], login: ["can't be blank"]) }
-      end
-    end
-  end
-
-  context 'represent attributes' do
-    before do
-      stub_class(:author, ActiveRecord::Base) do
-        validates :name, presence: true
-
-        # Emulate Active Record association auto save error.
-        def errors
-          super.tap do |errors|
-            errors.add(:'user.email', 'is invalid') if errors[:'user.email'].empty?
-          end
+        specify do
+          expect { user.validate_ancestry }.to change { user.errors.messages }
+            .to(:'projects.1.title' => ["can't be blank"], login: ["can't be blank"])
         end
       end
-
-      stub_model(:post) do
-        include ActiveData::Model::Associations
-
-        references_one :author
-        represents :name, of: :author
-        represents :email, of: :author
-      end
     end
-
-    let(:post) { Post.new(author: Author.new) }
-
-    specify { expect { post.validate_ancestry }.to change { post.errors.messages }
-      .to(hash_including(:'author.user.email' => ['is invalid'], name: ["can't be blank"])) }
-    specify { expect { post.validate }.to change { post.errors.messages }
-      .to(hash_including(:'author.user.email' => ['is invalid'], name: ["can't be blank"])) }
   end
 end

data/spec/lib/active_data/model/associations_spec.rb

@@ -1,4 +1,3 @@
-# encoding: UTF-8
 require 'spec_helper'
 
 describe ActiveData::Model::Associations do
@@ -30,7 +29,7 @@ describe ActiveData::Model::Associations do
       specify { expect(Nobody.reflections.keys).to eq([]) }
       specify { expect(User.reflections.keys).to eq([:projects]) }
       specify { expect(Manager.reflections.keys).to eq([:managed_project]) }
-      specify { expect(Admin.reflections.keys).to eq([:projects, :admin_projects]) }
+      specify { expect(Admin.reflections.keys).to eq(%i[projects admin_projects]) }
     end
 
     describe '#reflect_on_association' do
@@ -43,21 +42,23 @@ describe ActiveData::Model::Associations do
 
   context 'class determine errors' do
     specify do
-      expect { stub_model do
-        include ActiveData::Model::Associations
+      expect do
+        stub_model do
+          include ActiveData::Model::Associations
 
-        embeds_one :author, class_name: 'Borogoves'
-      end.reflect_on_association(:author).klass }.to raise_error NameError
+          embeds_one :author, class_name: 'Borogoves'
+        end.reflect_on_association(:author).data_source end.to raise_error NameError
     end
 
     specify do
-      expect { stub_model(:user) do
-        include ActiveData::Model::Associations
-
-        embeds_many :projects, class_name: 'Borogoves' do
-          attribute :title
-        end
-      end.reflect_on_association(:projects).klass }.to raise_error NameError
+      expect do
+        stub_model(:user) do
+          include ActiveData::Model::Associations
+
+          embeds_many :projects, class_name: 'Borogoves' do
+            attribute :title
+          end
+        end.reflect_on_association(:projects).data_source end.to raise_error NameError
     end
   end
 
@@ -103,22 +104,24 @@ describe ActiveData::Model::Associations do
 
     let(:user) { User.new }
 
-    its(:projects) { should = [] }
-    its(:profile) { should = nil }
+    specify { expect(user.projects).to eq([]) }
+    specify { expect(user.profile).to be_nil }
 
     describe '.inspect' do
       specify { expect(User.inspect).to eq('User(profile: EmbedsOne(Profile), projects: EmbedsMany(Project), login: Object)') }
     end
 
     describe '.association_names' do
-      specify { expect(User.association_names).to eq([:profile, :projects]) }
+      specify { expect(User.association_names).to eq(%i[profile projects]) }
     end
 
     describe '#inspect' do
       let(:profile) { Profile.new first_name: 'Name' }
       let(:project) { Project.new title: 'Project' }
-      specify { expect(User.new(login: 'Login', profile: profile, projects: [project]).inspect)
-        .to eq('#<User profile: #<EmbedsOne #<Profile first_name: "Name", last_name: nil>>, projects: #<EmbedsMany [#<Project author: #<EmbedsOne nil>, title: "P...]>, login: "Login">') }
+      specify do
+        expect(User.new(login: 'Login', profile: profile, projects: [project]).inspect)
+          .to eq('#<User profile: #<EmbedsOne #<Profile first_name: "Name", last_name: nil>>, projects: #<EmbedsMany [#<Project author: #<EmbedsOne nil>, title: "P...]>, login: "Login">')
+      end
     end
 
     describe '#==' do
@@ -154,7 +157,7 @@ describe ActiveData::Model::Associations do
     end
 
     describe '#association_names' do
-      specify { expect(user.association_names).to eq([:profile, :projects]) }
+      specify { expect(user.association_names).to eq(%i[profile projects]) }
     end
 
     describe '#apply_association_changes!' do
@@ -163,10 +166,14 @@ describe ActiveData::Model::Associations do
       let(:user) { User.new(profile: profile, projects: [project]) }
       before { project.build_author(name: 'Author') }
 
-      specify { expect { user.apply_association_changes! }.to change { user.attributes['profile'] }
-        .from(nil).to('first_name' => 'Name', 'last_name' => nil) }
-      specify { expect { user.apply_association_changes! }.to change { user.attributes['projects'] }
-        .from(nil).to([{ 'title' => 'Project', 'author' => { 'name' => 'Author' } }]) }
+      specify do
+        expect { user.apply_association_changes! }.to change { user.attributes['profile'] }
+          .from(nil).to('first_name' => 'Name', 'last_name' => nil)
+      end
+      specify do
+        expect { user.apply_association_changes! }.to change { user.attributes['projects'] }
+          .from(nil).to([{'title' => 'Project', 'author' => {'name' => 'Author'}}])
+      end
 
       context do
         let(:project) { Project.new }
@@ -182,8 +189,10 @@ describe ActiveData::Model::Associations do
       before { project.build_author(name: 'Author') }
 
       specify { expect(User.instantiate(JSON.parse(user.to_json))).to eq(user) }
-      specify { expect(User.instantiate(JSON.parse(user.to_json))
-        .tap { |u| u.projects.first.author.name = 'Other' }).not_to eq(user) }
+      specify do
+        expect(User.instantiate(JSON.parse(user.to_json))
+        .tap { |u| u.projects.first.author.name = 'Other' }).not_to eq(user)
+      end
     end
   end
 end