Add latest changes from gitlab-org/gitlab@master

1 files changed, 3 insertions, 19 deletions

diff --git a/spec/finders/events_finder_spec.rb b/spec/finders/events_finder_spec.rb
index b13ef7e94e7..fe2e449f03d 100644
--- a/spec/finders/events_finder_spec.rb
+++ b/spec/finders/events_finder_spec.rb
@@ -66,29 +66,13 @@ RSpec.describe EventsFinder do
     end
   end
 
-  describe 'wiki events feature flag' do
+  describe 'wiki events' do
     let_it_be(:events) { create_list(:wiki_page_event, 3, project: public_project) }
 
     subject(:finder) { described_class.new(source: public_project, target_type: 'wiki', current_user: user) }
 
-    context 'the wiki_events feature flag is disabled' do
-      before do
-        stub_feature_flags(wiki_events: false)
-      end
-
-      it 'omits the wiki page events' do
-        expect(finder.execute).to be_empty
-      end
-    end
-
-    context 'the wiki_events feature flag is enabled' do
-      before do
-        stub_feature_flags(wiki_events: true)
-      end
-
-      it 'can find the wiki events' do
-        expect(finder.execute).to match_array(events)
-      end
+    it 'can find the wiki events' do
+      expect(finder.execute).to match_array(events)
     end
   end