Add 'only history' option to notes filter

1 files changed, 14 insertions, 2 deletions

diff --git a/spec/support/shared_examples/controllers/issuable_notes_filter_shared_examples.rb b/spec/support/shared_examples/controllers/issuable_notes_filter_shared_examples.rb
index 9c9d7ad781e..95e69328080 100644
--- a/spec/support/shared_examples/controllers/issuable_notes_filter_shared_examples.rb
+++ b/spec/support/shared_examples/controllers/issuable_notes_filter_shared_examples.rb
@@ -34,12 +34,24 @@ shared_examples 'issuable notes filter' do
     expect(user.reload.notes_filter_for(issuable)).to eq(0)
   end
 
-  it 'returns no system note' do
+  it 'returns only user comments' do
     user.set_notes_filter(UserPreference::NOTES_FILTERS[:only_comments], issuable)
 
     get :discussions, namespace_id: project.namespace, project_id: project, id: issuable.iid
+    discussions = JSON.parse(response.body)
 
-    expect(JSON.parse(response.body).count).to eq(1)
+    expect(discussions.count).to eq(1)
+    expect(discussions.first["notes"].first["system"]).to be(false)
+  end
+
+  it 'returns only activity notes' do
+    user.set_notes_filter(UserPreference::NOTES_FILTERS[:only_activity], issuable)
+
+    get :discussions, namespace_id: project.namespace, project_id: project, id: issuable.iid
+    discussions = JSON.parse(response.body)
+
+    expect(discussions.count).to eq(1)
+    expect(discussions.first["notes"].first["system"]).to be(true)
   end
 
   context 'when filter is set to "only_comments"' do