1 files changed, 29 insertions, 8 deletions
diff --git a/spec/models/user_preference_spec.rb b/spec/models/user_preference_spec.rb
index 64d9d9a78b4..2898613545c 100644
--- a/spec/models/user_preference_spec.rb
+++ b/spec/models/user_preference_spec.rb
@@ -6,22 +6,43 @@ describe UserPreference do
   describe '#set_notes_filter' do
     let(:issuable) { build_stubbed(:issue) }
     let(:user_preference) { create(:user_preference) }
-    let(:only_comments) { described_class::NOTES_FILTERS[:only_comments] }
 
-    it 'returns updated discussion filter' do
-      filter_name =
-        user_preference.set_notes_filter(only_comments, issuable)
+    shared_examples 'setting system notes' do
+      it 'returns updated discussion filter' do
+        filter_name =
+          user_preference.set_notes_filter(filter, issuable)
+
+        expect(filter_name).to eq(filter)
+      end
+
+      it 'updates discussion filter for issuable class' do
+        user_preference.set_notes_filter(filter, issuable)
+
+        expect(user_preference.reload.issue_notes_filter).to eq(filter)
+      end
+    end
+
+    context 'when filter is set to all notes' do
+      let(:filter) { described_class::NOTES_FILTERS[:all_notes] }
+
+      it_behaves_like 'setting system notes'
+    end
+
+    context 'when filter is set to only comments' do
+      let(:filter) { described_class::NOTES_FILTERS[:only_comments] }
 
-      expect(filter_name).to eq(only_comments)
+      it_behaves_like 'setting system notes'
     end
 
-    it 'updates discussion filter for issuable class' do
-      user_preference.set_notes_filter(only_comments, issuable)
+    context 'when filter is set to only activity' do
+      let(:filter) { described_class::NOTES_FILTERS[:only_activity] }
 
-      expect(user_preference.reload.issue_notes_filter).to eq(only_comments)
+      it_behaves_like 'setting system notes'
     end
 
     context 'when notes_filter parameter is invalid' do
+      let(:only_comments) { described_class::NOTES_FILTERS[:only_comments] }
+
       it 'returns the current notes filter' do
         user_preference.set_notes_filter(only_comments, issuable)