granite-form 0.5.0 → 0.6.1

data/spec/granite/form/model/associations/reflections/embeds_many_spec.rb

@@ -14,6 +14,7 @@ describe Granite::Form::Model::Associations::Reflections::EmbedsMany do
       embeds_many :projects
     end
   end
+
   let(:user) { User.new }
 
   context ':read, :write' do
@@ -24,14 +25,14 @@ describe Granite::Form::Model::Associations::Reflections::EmbedsMany do
 
         attribute :name
         embeds_many :projects,
-          read: lambda { |reflection, object|
-            value = object.instance_variable_get("@_value_#{reflection.name}")
-            JSON.parse(value) if value.present?
-          },
-          write: lambda { |reflection, object, value|
-            value = value.to_json if value
-            object.instance_variable_set("@_value_#{reflection.name}", value)
-          }
+                    read: lambda { |reflection, object|
+                      value = object.instance_variable_get("@_value_#{reflection.name}")
+                      JSON.parse(value) if value.present?
+                    },
+                    write: lambda { |reflection, object, value|
+                      value = value.to_json if value
+                      object.instance_variable_set("@_value_#{reflection.name}", value)
+                    }
       end
     end
 
@@ -55,16 +56,18 @@ describe Granite::Form::Model::Associations::Reflections::EmbedsMany do
 
     describe '#build' do
       let(:project) { Project.new title: 'Project' }
+
       specify { expect(user.projects.build(title: 'Project')).to eq(project) }
       specify { expect { user.projects.build(title: 'Project') }.to change { user.projects }.from([]).to([project]) }
     end
 
     describe '#reload' do
       let(:project) { Project.new title: 'Project' }
+
       before do
-        user.write_attribute(:projects, [{title: 'Project'}])
+        user.write_attribute(:projects, [{ title: 'Project' }])
+        user.projects.build
       end
-      before { user.projects.build }
 
       specify { expect(user.projects.count).to eq(2) }
       specify { expect(user.projects.reload).to eq([project]) }
@@ -72,26 +75,42 @@ describe Granite::Form::Model::Associations::Reflections::EmbedsMany do
 
     describe '#concat' do
       let(:project) { Project.new title: 'Project' }
+
       specify { expect { user.projects.concat project }.to change { user.projects }.from([]).to([project]) }
-      specify { expect { user.projects.concat project, 'string' }.to raise_error Granite::Form::AssociationTypeMismatch }
+
+      specify do
+        expect do
+          user.projects.concat project, 'string'
+        end.to raise_error Granite::Form::AssociationTypeMismatch
+      end
 
       context do
         let(:other) { Project.new title: 'Other' }
+
         before { user.projects = [other] }
-        specify { expect { user.projects.concat project }.to change { user.projects }.from([other]).to([other, project]) }
+
+        specify do
+          expect { user.projects.concat project }
+            .to change { user.projects }
+            .from([other])
+            .to([other, project])
+        end
       end
     end
   end
 
   describe '#projects=' do
     let(:project) { Project.new title: 'Project' }
+
     specify { expect { user.projects = [] }.not_to change { user.projects }.from([]) }
     specify { expect { user.projects = [project] }.to change { user.projects }.from([]).to([project]) }
     specify { expect { user.projects = [project, 'string'] }.to raise_error Granite::Form::AssociationTypeMismatch }
 
     context do
       let(:other) { Project.new title: 'Other' }
+
       before { user.projects = [other] }
+
       specify { expect { user.projects = [project] }.to change { user.projects }.from([other]).to([project]) }
       specify { expect { user.projects = [] }.to change { user.projects }.from([other]).to([]) }
     end
@@ -112,8 +131,18 @@ describe Granite::Form::Model::Associations::Reflections::EmbedsMany do
 
       specify { expect(User.reflect_on_association(:projects).klass).to eq(User::Project) }
       specify { expect(User.new.projects).to eq([]) }
-      specify { expect(User.new.tap { |u| u.projects.build(title: 'Project') }.projects).to be_a(Granite::Form::Model::Associations::Collection::Embedded) }
-      specify { expect(User.new.tap { |u| u.projects.build(title: 'Project') }.projects).to match([have_attributes(title: 'Project')]) }
+
+      specify do
+        user = User.new
+        user.projects.build(title: 'Project')
+        expect(user.projects).to be_a(Granite::Form::Model::Associations::Collection::Embedded)
+      end
+
+      specify do
+        user = User.new
+        user.projects.build(title: 'Project')
+        expect(user.projects).to match([have_attributes(title: 'Project')])
+      end
     end
 
     context do
@@ -130,8 +159,14 @@ describe Granite::Form::Model::Associations::Reflections::EmbedsMany do
 
       specify { expect(User.reflect_on_association(:projects).klass).to eq(User::Project) }
       specify { expect(User.new.projects).to eq([]) }
-      specify { expect(User.new.tap { |u| u.projects.build(title: 'Project') }.projects).to be_a(Granite::Form::Model::Associations::Collection::Embedded) }
-      specify { expect(User.new.tap { |u| u.projects.build(title: 'Project') }.projects).to match([have_attributes(title: 'Project', value: nil)]) }
+
+      specify do
+        user = User.new
+        user.projects.build(title: 'Project')
+        expect(user.projects)
+          .to be_a(Granite::Form::Model::Associations::Collection::Embedded)
+          .and match([have_attributes(title: 'Project', value: nil)])
+      end
     end
   end
 end

data/spec/granite/form/model/associations/reflections/embeds_one_spec.rb

@@ -15,6 +15,7 @@ describe Granite::Form::Model::Associations::Reflections::EmbedsOne do
       embeds_one :author
     end
   end
+
   let(:book) { Book.new }
 
   specify { expect(book.author).to be_nil }
@@ -27,14 +28,14 @@ describe Granite::Form::Model::Associations::Reflections::EmbedsOne do
 
         attribute :title
         embeds_one :author,
-          read: lambda { |reflection, object|
-            value = object.instance_variable_get("@_value_#{reflection.name}")
-            JSON.parse(value) if value.present?
-          },
-          write: lambda { |reflection, object, value|
-            value = value.to_json if value
-            object.instance_variable_set("@_value_#{reflection.name}", value)
-          }
+                   read: lambda { |reflection, object|
+                     value = object.instance_variable_get("@_value_#{reflection.name}")
+                     JSON.parse(value) if value.present?
+                   },
+                   write: lambda { |reflection, object, value|
+                     value = value.to_json if value
+                     object.instance_variable_set("@_value_#{reflection.name}", value)
+                   }
       end
     end
 
@@ -53,12 +54,15 @@ describe Granite::Form::Model::Associations::Reflections::EmbedsOne do
 
   describe '#author=' do
     let(:author) { Author.new name: 'Author' }
+
     specify { expect { book.author = author }.to change { book.author }.from(nil).to(author) }
     specify { expect { book.author = 'string' }.to raise_error Granite::Form::AssociationTypeMismatch }
 
     context do
       let(:other) { Author.new name: 'Other' }
+
       before { book.author = other }
+
       specify { expect { book.author = author }.to change { book.author }.from(other).to(author) }
       specify { expect { book.author = nil }.to change { book.author }.from(other).to(nil) }
     end
@@ -66,6 +70,7 @@ describe Granite::Form::Model::Associations::Reflections::EmbedsOne do
 
   describe '#build_author' do
     let(:author) { Author.new name: 'Author' }
+
     specify { expect(book.build_author(name: 'Author')).to eq(author) }
     specify { expect { book.build_author(name: 'Author') }.to change { book.author }.from(nil).to(author) }
   end
@@ -104,7 +109,12 @@ describe Granite::Form::Model::Associations::Reflections::EmbedsOne do
       specify { expect(Book.reflect_on_association(:author).klass).to eq(Book::Author) }
       specify { expect(Book.new.author).to be_nil }
       specify { expect(Book.new.tap { |b| b.build_author(name: 'Author') }.author).to be_a(Book::Author) }
-      specify { expect(Book.new.tap { |b| b.build_author(name: 'Author') }.author).to have_attributes(name: 'Author', age: nil) }
+
+      specify do
+        book = Book.new
+        book.build_author(name: 'Author')
+        expect(book.author).to have_attributes(name: 'Author', age: nil)
+      end
     end
   end
 end

data/spec/granite/form/model/associations/reflections/references_many_spec.rb

@@ -38,6 +38,7 @@ describe Granite::Form::Model::Associations::Reflections::ReferencesMany 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])
@@ -59,6 +60,7 @@ describe Granite::Form::Model::Associations::Reflections::ReferencesMany 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])
@@ -79,6 +81,7 @@ describe Granite::Form::Model::Associations::Reflections::ReferencesMany 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])
@@ -86,7 +89,7 @@ describe Granite::Form::Model::Associations::Reflections::ReferencesMany do
   end
 
   describe ':default' do
-    shared_examples_for :persisted_default do |default|
+    shared_examples_for 'persisted default' do |default|
       before do
         stub_model(:book) do
           include Granite::Form::Model::Associations
@@ -119,10 +122,10 @@ describe Granite::Form::Model::Associations::Reflections::ReferencesMany do
       specify { expect { book.owner_ids = '' }.to change { book.owners }.from([author]).to([]) }
     end
 
-    it_behaves_like :persisted_default, -> { authors.map(&:id) }
-    it_behaves_like :persisted_default, -> { authors }
+    it_behaves_like 'persisted default', -> { authors.map(&:id) }
+    it_behaves_like 'persisted default', -> { authors }
 
-    shared_examples_for :new_record_default do |default|
+    shared_examples_for 'new record default' do |default|
       before do
         stub_model(:book) do
           include Granite::Form::Model::Associations
@@ -139,7 +142,14 @@ describe Granite::Form::Model::Associations::Reflections::ReferencesMany do
       specify { expect { book.owners = [other] }.to change { book.owner_ids }.from([nil]).to([other.id]) }
       specify { expect { book.owners = [other] }.to change { book.owners }.from([an_instance_of(Author)]).to([other]) }
       specify { expect { book.owner_ids = [other.id] }.to change { book.owner_ids }.from([nil]).to([other.id]) }
-      specify { expect { book.owner_ids = [other.id] }.to change { book.owners }.from([an_instance_of(Author)]).to([other]) }
+
+      specify do
+        expect { book.owner_ids = [other.id] }
+          .to change { book.owners }
+          .from([an_instance_of(Author)])
+          .to([other])
+      end
+
       specify { expect { book.owners = [] }.to change { book.owner_ids }.from([nil]).to([]) }
       specify { expect { book.owners = [] }.to change { book.owners }.from([an_instance_of(Author)]).to([]) }
       specify { expect { book.owner_ids = [] }.not_to change { book.owner_ids }.from([nil]) }
@@ -154,12 +164,14 @@ describe Granite::Form::Model::Associations::Reflections::ReferencesMany do
       specify { expect { book.owner_ids = '' }.to change { book.owners }.from([an_instance_of(Author)]).to([]) }
     end
 
-    it_behaves_like :new_record_default, name: 'Author'
-    it_behaves_like :new_record_default, -> { Author.new(name: 'Author') }
+    it_behaves_like 'new record default', name: 'Author'
+    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))') }
+    specify do
+      expect(Book.inspect).to eq('Book(authors: ReferencesMany(Author), title: String, author_ids: (reference))')
+    end
   end
 
   describe '#scope' do
@@ -179,6 +191,7 @@ describe Granite::Form::Model::Associations::Reflections::ReferencesMany 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])
@@ -188,6 +201,7 @@ describe Granite::Form::Model::Associations::Reflections::ReferencesMany 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])
@@ -197,6 +211,7 @@ describe Granite::Form::Model::Associations::Reflections::ReferencesMany do
       expect { book.authors = [author1, author2] }
         .to change { book.authors.reload }.from([]).to([author2])
     end
+
     specify do
       expect { book.authors = [author1, author2] }
         .to change {
@@ -228,14 +243,17 @@ describe Granite::Form::Model::Associations::Reflections::ReferencesMany do
 
     describe '#reload' do
       before { book.authors << author.tap { |a| a.name = 'Don Juan' } }
+
       it { expect { book.authors.reload }.to change { book.authors.map(&:name) }.from(['Don Juan']).to(['Rick']) }
     end
 
     describe '#concat' do
       it { expect { book.authors.concat author }.to change { book.authors }.from([]).to([author]) }
       it { expect { book.authors << author << other }.to change { book.authors }.from([]).to([author, other]) }
+
       context 'no duplication' do
         before { book.authors << author }
+
         it { expect { book.authors.concat author }.not_to change { book.authors }.from([author]) }
       end
     end
@@ -249,8 +267,20 @@ describe Granite::Form::Model::Associations::Reflections::ReferencesMany do
 
   describe '#author_ids' do
     it { expect(book_with_author.author_ids).to eq([author.id]) }
-    xit { expect { book_with_author.author_ids << other.id }.to change { book_with_author.authors }.from([author]).to([author, other]) }
-    it { expect { book_with_author.author_ids = [other.id] }.to change { book_with_author.authors }.from([author]).to([other]) }
+
+    xit do
+      expect { book_with_author.author_ids << other.id }
+        .to change { book_with_author.authors }
+        .from([author])
+        .to([author, other])
+    end
+
+    it {
+      expect { book_with_author.author_ids = [other.id] }
+        .to change { book_with_author.authors }
+        .from([author])
+        .to([other])
+    }
   end
 
   describe '#authors=' do
@@ -259,6 +289,7 @@ describe Granite::Form::Model::Associations::Reflections::ReferencesMany do
 
     context do
       before { book.authors = [other] }
+
       specify { expect { book.authors = [author] }.to change { book.authors }.from([other]).to([author]) }
       specify { expect { book.authors = [author] }.to change { book.author_ids }.from([other.id]).to([author.id]) }
       specify { expect { book.authors = [] }.to change { book.authors }.from([other]).to([]) }
@@ -267,16 +298,19 @@ describe Granite::Form::Model::Associations::Reflections::ReferencesMany do
 
     context 'model not persisted' do
       let(:author) { Author.new }
+
       specify { expect { book.authors = [author, other] }.to change { book.authors }.from([]).to([author, other]) }
       specify { expect { book.authors = [author, other] }.to change { book.author_ids }.from([]).to([nil, other.id]) }
 
       context do
         before { book.authors = [author, other] }
+
         specify do
           expect { author.save! }.to change { book.author_ids }.from([nil, other.id])
-            .to(match([be_a(Integer), other.id]))
+                                                               .to(match([be_a(Integer), other.id]))
         end
-        specify { expect { author.save! }.not_to change { book.authors } }
+
+        specify { expect { author.save! }.not_to(change { book.authors }) }
       end
     end
   end
@@ -289,12 +323,30 @@ describe Granite::Form::Model::Associations::Reflections::ReferencesMany do
     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([]) }
 
-    specify { expect { book.author_ids = [author.id.next.to_s, author.id] }.to change { book.author_ids }.from([]).to([author.id]) }
-    specify { expect { book.author_ids = [author.id.next.to_s, author.id] }.to change { book.authors }.from([]).to([author]) }
+    specify do
+      expect { book.author_ids = [author.id.next.to_s, author.id] }
+        .to change { book.author_ids }
+        .from([])
+        .to([author.id])
+    end
+
+    specify do
+      expect { book.author_ids = [author.id.next.to_s, author.id] }
+        .to change { book.authors }
+        .from([])
+        .to([author])
+    end
 
     context do
       before { book.authors = [other] }
-      specify { expect { book.author_ids = [author.id] }.to change { book.author_ids }.from([other.id]).to([author.id]) }
+
+      specify do
+        expect { book.author_ids = [author.id] }
+          .to change { book.author_ids }
+          .from([other.id])
+          .to([author.id])
+      end
+
       specify { expect { book.author_ids = [author.id] }.to change { book.authors }.from([other]).to([author]) }
       specify { expect { book.author_ids = [] }.to change { book.author_ids }.from([other.id]).to([]) }
       specify { expect { book.author_ids = [] }.to change { book.authors }.from([other]).to([]) }

data/spec/granite/form/model/associations/reflections/references_one_spec.rb

@@ -14,6 +14,7 @@ describe Granite::Form::Model::Associations::Reflections::ReferencesOne do
       references_one :author
     end
   end
+
   let(:book) { Book.new }
 
   specify { expect(book.author).to be_nil }
@@ -27,12 +28,14 @@ describe Granite::Form::Model::Associations::Reflections::ReferencesOne do
         references_one :creator, class_name: 'Author'
       end
     end
+
     let(:author) { Author.create!(name: 'Rick') }
 
     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)
@@ -54,6 +57,7 @@ describe Granite::Form::Model::Associations::Reflections::ReferencesOne 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)
@@ -74,6 +78,7 @@ describe Granite::Form::Model::Associations::Reflections::ReferencesOne 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)
@@ -81,7 +86,7 @@ describe Granite::Form::Model::Associations::Reflections::ReferencesOne do
   end
 
   describe ':default' do
-    shared_examples_for :persisted_default do |default|
+    shared_examples_for 'persisted default' do |default|
       before do
         stub_model(:book) do
           include Granite::Form::Model::Associations
@@ -108,10 +113,10 @@ describe Granite::Form::Model::Associations::Reflections::ReferencesOne do
       specify { expect { book.owner_id = '' }.to change { book.owner }.from(author).to(nil) }
     end
 
-    it_behaves_like :persisted_default, -> { author.id }
-    it_behaves_like :persisted_default, -> { author }
+    it_behaves_like 'persisted default', -> { author.id }
+    it_behaves_like 'persisted default', -> { author }
 
-    shared_examples_for :new_record_default do |default|
+    shared_examples_for 'new record default' do |default|
       before do
         stub_model(:book) do
           include Granite::Form::Model::Associations
@@ -137,8 +142,8 @@ describe Granite::Form::Model::Associations::Reflections::ReferencesOne do
       specify { expect { book.owner_id = '' }.to change { book.owner }.from(instance_of(Author)).to(nil) }
     end
 
-    it_behaves_like :new_record_default, name: 'Author'
-    it_behaves_like :new_record_default, -> { Author.new(name: 'Author') }
+    it_behaves_like 'new record default', name: 'Author'
+    it_behaves_like 'new record default', -> { Author.new(name: 'Author') }
   end
 
   describe 'Book.inspect' do
@@ -160,8 +165,9 @@ describe Granite::Form::Model::Associations::Reflections::ReferencesOne do
 
     specify do
       expect { book.author_id = author1.id }
-        .not_to change { book.author }
+        .not_to(change { book.author })
     end
+
     specify do
       expect { book.author_id = author2.id }
         .to change { book.author }.from(nil).to(author2)
@@ -171,6 +177,7 @@ describe Granite::Form::Model::Associations::Reflections::ReferencesOne 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)
@@ -183,6 +190,7 @@ describe Granite::Form::Model::Associations::Reflections::ReferencesOne do
           book.author_id
         }.from(nil).to(author1.id)
     end
+
     specify do
       expect { book.author = author2 }
         .to change {
@@ -193,11 +201,12 @@ describe Granite::Form::Model::Associations::Reflections::ReferencesOne do
 
     specify do
       expect { book.author = author1 }
-        .not_to change {
+        .not_to(change do
           book.association(:author).reload
           book.author
-        }
+        end)
     end
+
     specify do
       expect { book.author = author2 }
         .to change {
@@ -220,12 +229,15 @@ describe Granite::Form::Model::Associations::Reflections::ReferencesOne do
 
   describe '#author=' do
     let(:author) { Author.create! name: 'Author' }
+
     specify { expect { book.author = author }.to change { book.author }.from(nil).to(author) }
     specify { expect { book.author = 'string' }.to raise_error Granite::Form::AssociationTypeMismatch }
 
     context do
       let(:other) { Author.create! name: 'Other' }
+
       before { book.author = other }
+
       specify { expect { book.author = author }.to change { book.author }.from(other).to(author) }
       specify { expect { book.author = author }.to change { book.author_id }.from(other.id).to(author.id) }
       specify { expect { book.author = nil }.to change { book.author }.from(other).to(nil) }
@@ -234,29 +246,40 @@ describe Granite::Form::Model::Associations::Reflections::ReferencesOne do
 
     context 'model not persisted' do
       let(:author) { Author.new }
+
       specify { expect { book.author = author }.to change { book.author }.from(nil).to(author) }
       specify { expect { book.author = author }.not_to change { book.author_id }.from(nil) }
 
       context do
         before { book.author = author }
+
         specify { expect { author.save! }.to change { book.author_id }.from(nil).to(be_a(Integer)) }
-        specify { expect { author.save! }.not_to change { book.author } }
+        specify { expect { author.save! }.not_to(change { book.author }) }
       end
     end
   end
 
   describe '#author_id=' 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 do
+      expect { book.author_id = author.id.next.to_s }
+        .to change { book.author_id }
+        .from(nil)
+        .to(author.id.next)
+    end
+
     specify { expect { book.author_id = author.id.next.to_s }.not_to change { book.author }.from(nil) }
 
     context do
       let(:other) { Author.create!(name: 'Other') }
+
       before { book.author = other }
+
       specify { expect { book.author_id = author.id }.to change { book.author_id }.from(other.id).to(author.id) }
       specify { expect { book.author_id = author.id }.to change { book.author }.from(other).to(author) }
       specify { expect { book.author_id = nil }.to change { book.author_id }.from(other.id).to(nil) }

data/spec/granite/form/model/associations/validations_spec.rb

@@ -38,16 +38,18 @@ describe Granite::Form::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) }
-    specify { expect { user.validate }.not_to change { user.errors.messages } }
+    specify { expect { user.validate }.not_to(change { user.errors.messages }) }
 
     context do
       let(:author_attributes) { {} }
 
       specify { expect(user.validate).to eq(false) }
+
       specify do
         expect { user.validate }.to change { user.errors.messages }
           .to('projects.0.author.name': ["can't be blank"])
@@ -58,13 +60,14 @@ describe Granite::Form::Model::Associations::Validations do
       let(:profile) { Profile.new }
 
       specify { expect(user.validate).to eq(true) }
-      specify { expect { user.validate }.not_to change { user.errors.messages } }
+      specify { expect { user.validate }.not_to(change { user.errors.messages }) }
     end
 
     context do
       let(:projects) { [project, Project.new] }
 
       specify { expect(user.validate).to eq(false) }
+
       specify do
         expect { user.validate }.to change { user.errors.messages }
           .to('projects.1.title': ["can't be blank"])
@@ -77,7 +80,8 @@ describe Granite::Form::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) }
@@ -85,14 +89,16 @@ describe Granite::Form::Model::Associations::Validations do
     specify { expect { user.validate_ancestry! }.not_to raise_error }
     specify { expect(user.valid_ancestry?).to eq(true) }
     specify { expect(user.invalid_ancestry?).to eq(false) }
-    specify { expect { user.validate_ancestry }.not_to change { user.errors.messages } }
+    specify { expect { user.validate_ancestry }.not_to(change { user.errors.messages }) }
 
     context do
       let(:author_attributes) { {} }
+
       specify { expect(user.validate_ancestry).to eq(false) }
       specify { expect { user.validate_ancestry! }.to raise_error Granite::Form::ValidationError }
       specify { expect(user.valid_ancestry?).to eq(false) }
       specify { expect(user.invalid_ancestry?).to eq(true) }
+
       specify do
         expect { user.validate_ancestry }.to change { user.errors.messages }
           .to('projects.0.author.name': ["can't be blank"])
@@ -101,10 +107,12 @@ describe Granite::Form::Model::Associations::Validations do
 
     context do
       let(:profile) { Profile.new }
+
       specify { expect(user.validate_ancestry).to eq(false) }
       specify { expect { user.validate_ancestry! }.to raise_error Granite::Form::ValidationError }
       specify { expect(user.valid_ancestry?).to eq(false) }
       specify { expect(user.invalid_ancestry?).to eq(true) }
+
       specify do
         expect { user.validate_ancestry }.to change { user.errors.messages }
           .to('profile.first_name': ["can't be blank"])
@@ -113,10 +121,12 @@ describe Granite::Form::Model::Associations::Validations do
 
     context do
       let(:projects) { [project, Project.new] }
+
       specify { expect(user.validate_ancestry).to eq(false) }
       specify { expect { user.validate_ancestry! }.to raise_error Granite::Form::ValidationError }
       specify { expect(user.valid_ancestry?).to eq(false) }
       specify { expect(user.invalid_ancestry?).to eq(true) }
+
       specify do
         expect { user.validate_ancestry }.to change { user.errors.messages }
           .to('projects.1.title': ["can't be blank"])
@@ -124,6 +134,7 @@ describe Granite::Form::Model::Associations::Validations do
 
       context do
         before { user.update(login: '') }
+
         specify do
           expect { user.validate_ancestry }.to change { user.errors.messages }
             .to('projects.1.title': ["can't be blank"], login: ["can't be blank"])