spec/models/widget_spec.rb in paper_trail-4.0.0.beta2 vs spec/models/widget_spec.rb in paper_trail-4.0.0.rc1

@@ -119,25 +119,25 @@
     end
   end
 
   describe "Methods" do
     describe "Instance", :versioning => true do
-      describe '#originator' do
-        it { is_expected.to respond_to(:originator) }
+      describe '#paper_trail_originator' do
+        it { is_expected.to respond_to(:paper_trail_originator) }
 
         describe "return value" do
           let(:orig_name) { Faker::Name.name }
           let(:new_name) { Faker::Name.name }
           before { PaperTrail.whodunnit = orig_name }
 
           context "accessed from live model instance" do
             specify { expect(widget).to be_live }
 
             it "should return the originator for the model at a given state" do
-              expect(widget.originator).to eq(orig_name)
+              expect(widget.paper_trail_originator).to eq(orig_name)
               widget.whodunnit(new_name) { |w| w.update_attributes(:name => 'Elizabeth') }
-              expect(widget.originator).to eq(new_name)
+              expect(widget.paper_trail_originator).to eq(new_name)
             end
           end
 
           context "accessed from a reified model instance" do
             before do
@@ -148,11 +148,11 @@
 
             context "default behavior (no `options[:dup]` option passed in)" do
               let(:reified_widget) { widget.versions[1].reify }
 
               it "should return the appropriate originator" do
-                expect(reified_widget.originator).to eq(orig_name)
+                expect(reified_widget.paper_trail_originator).to eq(orig_name)
               end
 
               it "should not create a new model instance" do
                 expect(reified_widget).not_to be_new_record
               end
@@ -160,17 +160,38 @@
 
             context "creating a new instance (`options[:dup] == true`)" do
               let(:reified_widget) { widget.versions[1].reify(:dup => true) }
 
               it "should return the appropriate originator" do
-                expect(reified_widget.originator).to eq(orig_name)
+                expect(reified_widget.paper_trail_originator).to eq(orig_name)
               end
 
               it "should not create a new model instance" do
                 expect(reified_widget).to be_new_record
               end
             end
           end
+        end
+      end
+
+      describe "#originator" do
+        subject { widget }
+
+        it { is_expected.to respond_to(:originator) }
+        let(:warning_msg) do
+          "DEPRECATED: use `paper_trail_originator` instead of `originator`." +
+          " Support for `originator` will be removed in PaperTrail 4.0"
+        end
+
+        it 'should set the invoke `paper_trail_originator`' do
+          is_expected.to receive(:warn)
+          is_expected.to receive(:paper_trail_originator)
+          subject.originator
+        end
+
+        it 'should display a deprecation warning' do
+          is_expected.to receive(:warn).with(warning_msg)
+          subject.originator
         end
       end
 
       describe '#version_at' do
         it { is_expected.to respond_to(:version_at) }