Merge branch 'master' into 'refactor-snippets-finder'refactor-snippets-finder

# Conflicts:
#   spec/models/project_spec.rb

1 files changed, 9 insertions, 1 deletions

diff --git a/spec/finders/notes_finder_spec.rb b/spec/finders/notes_finder_spec.rb
index de9974c45e1..b51f1955ac4 100644
--- a/spec/finders/notes_finder_spec.rb
+++ b/spec/finders/notes_finder_spec.rb
@@ -13,7 +13,7 @@ describe NotesFinder do
       let!(:comment) { create(:note_on_issue, project: project) }
       let!(:system_note) { create(:note_on_issue, project: project, system: true) }
 
-      it 'filters system notes' do
+      it 'returns only user notes when using only_comments filter' do
         finder = described_class.new(project, user, notes_filter: UserPreference::NOTES_FILTERS[:only_comments])
 
         notes = finder.execute
@@ -21,6 +21,14 @@ describe NotesFinder do
         expect(notes).to match_array(comment)
       end
 
+      it 'returns only system notes when using only_activity filters' do
+        finder = described_class.new(project, user, notes_filter: UserPreference::NOTES_FILTERS[:only_activity])
+
+        notes = finder.execute
+
+        expect(notes).to match_array(system_note)
+      end
+
       it 'gets all notes' do
         finder = described_class.new(project, user, notes_filter: UserPreference::NOTES_FILTERS[:all_activity])