Add latest changes from gitlab-org/gitlab@master

1 files changed, 13 insertions, 0 deletions

diff --git a/spec/finders/todos_finder_spec.rb b/spec/finders/todos_finder_spec.rb
index 6234d596745..75aa10c66a2 100644
--- a/spec/finders/todos_finder_spec.rb
+++ b/spec/finders/todos_finder_spec.rb
@@ -234,6 +234,19 @@ describe TodosFinder do
     end
   end
 
+  describe '.todo_types' do
+    it 'returns the expected types' do
+      expected_result =
+        if Gitlab.ee?
+          %w[Epic Issue MergeRequest]
+        else
+          %w[Issue MergeRequest]
+        end
+
+      expect(described_class.todo_types).to contain_exactly(*expected_result)
+    end
+  end
+
   describe '#any_for_target?' do
     it 'returns true if there are any todos for the given target' do
       todo = create(:todo, :pending)