1 files changed, 31 insertions, 15 deletions
diff --git a/spec/models/todo_spec.rb b/spec/models/todo_spec.rb
index 44e81455a67..a9c4c6680cd 100644
--- a/spec/models/todo_spec.rb
+++ b/spec/models/todo_spec.rb
@@ -200,26 +200,42 @@ RSpec.describe Todo do
   describe '#self_assigned?' do
     let(:user_1) { build(:user) }
 
-    before do
-      subject.user = user_1
-      subject.author = user_1
-      subject.action = Todo::ASSIGNED
-    end
+    context 'when self_added' do
+      before do
+        subject.user = user_1
+        subject.author = user_1
+      end
 
-    it 'is true when todo is ASSIGNED and self_added' do
-      expect(subject).to be_self_assigned
-    end
+      it 'returns true for ASSIGNED' do
+        subject.action = Todo::ASSIGNED
+
+        expect(subject).to be_self_assigned
+      end
 
-    it 'is false when the todo is not ASSIGNED' do
-      subject.action = Todo::MENTIONED
+      it 'returns true for REVIEW_REQUESTED' do
+        subject.action = Todo::REVIEW_REQUESTED
 
-      expect(subject).not_to be_self_assigned
+        expect(subject).to be_self_assigned
+      end
+
+      it 'returns false for other action' do
+        subject.action = Todo::MENTIONED
+
+        expect(subject).not_to be_self_assigned
+      end
     end
 
-    it 'is false when todo is not self_added' do
-      subject.author = build(:user)
+    context 'when todo is not self_added' do
+      before do
+        subject.user = user_1
+        subject.author = build(:user)
+      end
 
-      expect(subject).not_to be_self_assigned
+      it 'returns false' do
+        subject.action = Todo::ASSIGNED
+
+        expect(subject).not_to be_self_assigned
+      end
     end
   end
 
@@ -427,7 +443,7 @@ RSpec.describe Todo do
     it 'updates updated_at' do
       create(:todo, :pending)
 
-      Timecop.freeze(1.day.from_now) do
+      travel_to(1.day.from_now) do
         expected_update_date = Time.current.utc
 
         ids = described_class.batch_update(state: :done)