draftsman 0.3.1 → 0.3.2

data/spec/models/parent_spec.rb

@@ -4,7 +4,7 @@ describe Parent do
   let(:parent) { Parent.new(:name => 'Marge') }
   let(:child)  { Child.new(:name => 'Lisa', :parent => parent) }
 
-  describe :publish! do
+  describe 'publish!' do
     context 'parent `create` draft with child `create` draft' do
       before do
         parent.draft_creation
@@ -13,24 +13,24 @@ describe Parent do
 
       subject { parent.draft.publish! }
 
-      its 'parent should be published' do
+      it 'publishes the parent' do
         subject
-        parent.reload.should be_published
+        expect(parent.reload.published?).to eql true
       end
 
-      its 'parent should not be a draft' do
+      it "removes the parent's draft" do
         subject
-        parent.reload.should_not be_draft
+        expect(parent.reload.draft?).to eql false
       end
 
-      its 'child should be a draft' do
+      it 'keeps the child as a draft' do
         subject
-        child.reload.should be_draft
+        expect(child.reload.draft?).to eql true
       end
 
-      its 'child should not be published' do
+      it 'does not publish the child' do
         subject
-        child.reload.should_not be_published
+        expect(child.reload.published?).to eql false
       end
 
       it 'destroys 1 draft' do
@@ -65,7 +65,7 @@ describe Parent do
     end
   end
 
-  describe :revert! do
+  describe 'revert!' do
     context 'parent `create` draft with child `create` draft' do
       before do
         parent.draft_creation
@@ -100,9 +100,17 @@ describe Parent do
         parent.reload
       end
 
-      it { should be_persisted }
-      it { should_not be_draft }
-      it { should_not be_trashed }
+      it 'is persisted to the database' do
+        expect(subject).to be_persisted
+      end
+
+      it 'is no longer a draft' do
+        expect(subject.draft?).to eql false
+      end
+
+      it 'is no longer trashed' do
+        expect(subject.trashed?).to eql false
+      end
 
       it "keeps the child's draft" do
         expect { subject }.to_not change(Draftsman::Draft.where(:item_type => 'Child'), :count)
@@ -112,24 +120,24 @@ describe Parent do
         expect { subject }.to change(Draftsman::Draft.where(:item_type => 'Parent'), :count).by(-1)
       end
 
-      its 'child should remain a draft' do
+      it "keeps the child's draft" do
         subject
-        child.should be_draft
+        expect(child.draft?).to eql true
       end
 
-      its 'child should still be a `destroy` draft' do
+      it "keeps the child as a `destroy` draft" do
         subject
-        child.draft.reload.should be_destroy
+        expect(child.draft.reload.destroy?).to eql true
       end
 
-      its 'child should still be trashed' do
+      it 'keeps the child trashed' do
         subject
-        child.should be_trashed
+        expect(child.trashed?).to eql true
       end
     end
   end
 
-  describe :draft_publication_dependencies do
+  describe 'draft_publication_dependencies' do
     context 'parent `create` draft with child `create` draft' do
       before do
         parent.draft_creation
@@ -137,7 +145,10 @@ describe Parent do
       end
 
       subject { parent.draft }
-      its(:draft_publication_dependencies) { should be_empty }
+
+      it 'does not have publication dependencies' do
+        expect(subject.draft_publication_dependencies).to be_empty
+      end
     end
 
     context 'parent `update` draft with child `create` draft' do
@@ -149,7 +160,10 @@ describe Parent do
       end
 
       subject { parent.draft }
-      its(:draft_publication_dependencies) { should be_empty }
+
+      it 'does not have publication dependencies' do
+        expect(subject.draft_publication_dependencies).to be_empty
+      end
     end
 
     context 'parent `destroy` draft with child `destroy` draft' do
@@ -160,12 +174,18 @@ describe Parent do
       end
 
       subject { parent.draft }
-      its(:draft_publication_dependencies) { should be_present }
-      its(:draft_publication_dependencies) { should include child.draft }
+
+      it 'has publication dependencies' do
+        expect(subject.draft_publication_dependencies).to be_present
+      end
+
+      it "has the child's draft as a publication dependency" do
+        expect(subject.draft_publication_dependencies).to include child.draft
+      end
     end
   end
 
-  describe :draft_reversion_dependencies do
+  describe 'draft_reversion_dependencies' do
     context 'parent `create` draft with child `create` draft' do
       before do
         parent.draft_creation
@@ -173,8 +193,14 @@ describe Parent do
       end
 
       subject { parent.draft }
-      its(:draft_reversion_dependencies) { should be_present }
-      its(:draft_reversion_dependencies) { should include child.draft }
+
+      it 'has reversion dependencies' do
+        expect(subject.draft_reversion_dependencies).to be_present
+      end
+
+      it "has the child's draft as a reversion dependency" do
+        expect(subject.draft_reversion_dependencies).to include child.draft
+      end
     end
 
     context 'parent `destroy` draft with child `destroy` draft' do
@@ -185,7 +211,10 @@ describe Parent do
       end
 
       subject { parent.draft }
-      its(:draft_reversion_dependencies) { should be_empty }
+
+      it 'does not have reversion dependencies' do
+        expect(subject.draft_reversion_dependencies).to be_empty
+      end
     end
   end
 end

data/spec/models/skipper_spec.rb

@@ -2,24 +2,47 @@ require 'spec_helper'
 
 describe Skipper do
   let(:skipper) { Skipper.new :name => 'Bob', :skip_me => 'Skipped 1' }
-  it { should be_draftable }
 
-  describe :draft_creation do
+  it 'is draftable' do
+    expect(subject.class.draftable?).to eql true
+  end
+
+  describe 'draft_creation' do
     subject do
       skipper.draft_creation
       skipper.reload
     end
 
-    it { should be_persisted }
-    it { should be_draft }
-    its(:draft_id) { should be_present }
-    its(:draft) { should be_present }
-    its(:draft) { should be_create }
-    its(:name) { should eql 'Bob' }
-    its(:skip_me) { should eql 'Skipped 1' }
+    it 'is persisted' do
+      expect(subject).to be_persisted
+    end
+
+    it 'is a draft' do
+      expect(subject.draft?).to eql true
+    end
+
+    it 'has a `draft_id`' do
+      expect(subject.draft_id).to be_present
+    end
+
+    it 'has a draft' do
+      expect(subject.draft).to be_present
+    end
+
+    it 'has a `create` draft' do
+      expect(subject.draft.create?).to eql true
+    end
+
+    it 'has a `name`' do
+      expect(subject.name).to eql 'Bob'
+    end
+
+    it 'has a value for `skip_me`' do
+      expect(subject.skip_me).to eql 'Skipped 1'
+    end
   end
 
-  describe :draft_update do
+  describe 'draft_update' do
     subject do
       skipper.draft_update
       skipper.reload
@@ -32,13 +55,33 @@ describe Skipper do
         skipper.skip_me = 'Skipped 2'
       end
 
-      it { should be_persisted }
-      it { should be_draft }
-      its(:draft_id) { should be_present }
-      its(:draft) { should be_present }
-      its(:draft) { should be_update }
-      its(:name) { should eql 'Bob' }
-      its(:skip_me) { should eql 'Skipped 2' }
+      it 'is persisted' do
+        expect(subject).to be_persisted
+      end
+
+      it 'is a draft' do
+        expect(subject.draft?).to eql true
+      end
+
+      it 'has a `draft_id`' do
+        expect(subject.draft_id).to be_present
+      end
+
+      it 'has a `draft`' do
+        expect(subject.draft).to be_present
+      end
+
+      it 'identifies as an `update` draft' do
+        expect(subject.draft.update?).to eql true
+      end
+
+      it 'has the original name' do
+        expect(subject.name).to eql 'Bob'
+      end
+
+      it 'has the updated skipped attribute' do
+        expect(subject.skip_me).to eql 'Skipped 2'
+      end
 
       it 'creates a new draft' do
         expect { subject }.to change(Draftsman::Draft, :count).by(1)
@@ -56,11 +99,25 @@ describe Skipper do
         skipper.skip_me = 'Skipped 2'
       end
 
-      it { should_not be_draft }
-      its(:draft_id) { should be_nil }
-      its(:draft) { should be_nil }
-      its(:name) { should eql 'Bob' }
-      its(:skip_me) { should eql 'Skipped 2' }
+      it 'is no longer a draft' do
+        expect(subject.draft?).to eql false
+      end
+
+      it 'no longer has a `draft_id`' do
+        expect(subject.draft_id).to be_nil
+      end
+
+      it 'no longer has a `draft`' do
+        expect(subject.draft).to be_nil
+      end
+
+      it 'has its original `name`' do
+        expect(subject.name).to eql 'Bob'
+      end
+
+      it "retains the updated skipped attribute's value" do
+        expect(subject.skip_me).to eql 'Skipped 2'
+      end
 
       it 'destroys the draft' do
         expect { subject }.to change(Draftsman::Draft.where(:id => skipper.draft_id), :count).by(-1)
@@ -76,31 +133,71 @@ describe Skipper do
           skipper.skip_me = 'Skipped 2'
         end
 
-        it { should be_persisted }
-        it { should be_draft }
-        its(:draft_id) { should be_present }
-        its(:draft) { should be_present }
-        its(:draft) { should be_create }
-        its(:name) { should eql 'Sam' }
-        its(:skip_me) { should eql 'Skipped 2' }
+        it 'is persisted' do
+          expect(subject).to be_persisted
+        end
+
+        it 'is a draft' do
+          expect(subject.draft?).to eql true
+        end
+
+        it 'has a `draft_id`' do
+          expect(subject.draft_id).to be_present
+        end
+
+        it 'has a `draft`' do
+          expect(subject.draft).to be_present
+        end
+
+        it 'has a `create` draft' do
+          expect(subject.draft.create?).to eql true
+        end
+
+        it 'has the updated `name`' do
+          expect(subject.name).to eql 'Sam'
+        end
+
+        it "retains the updated skipped attribute's value" do
+          expect(subject.skip_me).to eql 'Skipped 2'
+        end
 
         it 'updates the existing draft' do
           expect { subject }.to_not change(Draftsman::Draft.where(:id => skipper.draft_id), :count)
         end
 
-        its "draft's `name` is updated" do
-          subject.draft.reify.name.should eql 'Sam'
+        it "updates the draft's `name`" do
+          expect(subject.draft.reify.name).to eql 'Sam'
         end
       end
 
       context 'with no changes' do
-        it { should be_persisted }
-        it { should be_draft }
-        its(:draft_id) { should be_present }
-        its(:draft) { should be_present }
-        its(:draft) { should be_create }
-        its(:name) { should eql 'Bob' }
-        its(:skip_me) { should eql 'Skipped 1' }
+        it 'is persisted' do
+          expect(subject).to be_persisted
+        end
+
+        it 'is a draft' do
+          expect(subject.draft?).to eql true
+        end
+
+        it 'has a `draft_id`' do
+          expect(subject.draft_id).to be_present
+        end
+
+        it 'has a `draft`' do
+          expect(subject.draft).to be_present
+        end
+
+        it 'has a `create` draft' do
+          expect(subject.draft.create?).to eql true
+        end
+
+        it 'has the original `name`' do
+          expect(subject.name).to eql 'Bob'
+        end
+
+        it "has the original skipped attribute's value" do
+          expect(subject.skip_me).to eql 'Skipped 1'
+        end
 
         it "doesn't change the number of drafts" do
           expect { subject }.to_not change(Draftsman::Draft.where(:id => skipper.draft_id), :count)
@@ -120,45 +217,86 @@ describe Skipper do
 
       context 'with changes' do
         before { skipper.name = 'Steve' }
-        it { should be_persisted }
-        it { should be_draft }
-        its(:draft_id) { should be_present }
-        its(:draft) { should be_present }
-        its(:draft) { should be_update }
-        its(:name) { should eql 'Bob' }
-        its(:skip_me) { should eql 'Skipped 2' }
+
+        it 'is persisted' do
+          expect(subject).to be_persisted
+        end
+
+        it 'is a draft' do
+          expect(subject.draft?).to eql true
+        end
+
+        it 'has a `draft_id`' do
+          expect(subject.draft_id).to be_present
+        end
+
+        it 'has a `draft`' do
+          expect(subject.draft).to be_present
+        end
+
+        it 'has an `update` draft' do
+          expect(subject.draft.update?).to eql true
+        end
+
+        it 'has the original `name`' do
+          expect(subject.name).to eql 'Bob'
+        end
+
+        it "has the updated skipped attribute's value" do
+          expect(subject.skip_me).to eql 'Skipped 2'
+        end
 
         it 'updates the existing draft' do
           expect { subject }.to_not change(Draftsman::Draft.where(:id => skipper.draft_id), :count)
         end
 
-        its "draft's `name` is updated" do
-          subject.draft.reify.name.should eql 'Steve'
+        it "updates the draft's `name`" do
+          expect(subject.draft.reify.name).to eql 'Steve'
         end
       end
 
       context 'with no changes' do
-        it { should be_persisted }
-        it { should be_draft }
-        its(:draft_id) { should be_present }
-        its(:draft) { should be_present }
-        its(:draft) { should be_update }
-        its(:name) { should eql 'Bob' }
-        its(:skip_me) { should eql 'Skipped 2' }
+        it 'is persisted' do
+          expect(subject).to be_persisted
+        end
+
+        it 'is a draft' do
+          expect(subject.draft?).to eql true
+        end
+
+        it 'has a `draft_id`' do
+          expect(subject.draft_id).to be_present
+        end
+
+        it 'has a `draft`' do
+          expect(subject.draft).to be_present
+        end
+
+        it 'has an `update` draft' do
+          expect(subject.draft.update?).to eql true
+        end
+
+        it 'has the original `name`' do
+          expect(subject.name).to eql 'Bob'
+        end
+
+        it "has the updated skipped attributes' value" do
+          expect(subject.skip_me).to eql 'Skipped 2'
+        end
 
         it "doesn't change the number of drafts" do
           expect { subject }.to_not change(Draftsman::Draft.where(:id => skipper.draft_id), :count)
         end
 
-        its "draft's `name` is not updated" do
-          subject.draft.reify.name.should eql 'Sam'
+        it "does not update the draft's `name`" do
+          expect(subject.draft.reify.name).to eql 'Sam'
         end
       end
     end
   end
 
   # Not applicable to this customization
-  describe :draft_destroy do
+  describe 'draft_destroy' do
   end
 
   # Not applicable to this customization