1 files changed, 15 insertions, 27 deletions
diff --git a/spec/support/shared_examples/models/wiki_shared_examples.rb b/spec/support/shared_examples/models/wiki_shared_examples.rb
index 6b243aef3e6..2498bf35a09 100644
--- a/spec/support/shared_examples/models/wiki_shared_examples.rb
+++ b/spec/support/shared_examples/models/wiki_shared_examples.rb
@@ -469,34 +469,30 @@ RSpec.shared_examples 'wiki model' do
   end
 
   describe '#delete_page' do
-    shared_examples 'delete_page operations' do
-      let(:page) { create(:wiki_page, wiki: wiki) }
+    let(:page) { create(:wiki_page, wiki: wiki) }
 
-      it 'deletes the page' do
-        subject.delete_page(page)
+    it 'deletes the page' do
+      subject.delete_page(page)
 
-        expect(subject.list_pages.count).to eq(0)
-      end
+      expect(subject.list_pages.count).to eq(0)
+    end
 
-      it 'sets the correct commit email' do
-        subject.delete_page(page)
+    it 'sets the correct commit email' do
+      subject.delete_page(page)
 
-        expect(user.commit_email).not_to eq(user.email)
-        expect(commit.author_email).to eq(user.commit_email)
-        expect(commit.committer_email).to eq(user.commit_email)
-      end
+      expect(user.commit_email).not_to eq(user.email)
+      expect(commit.author_email).to eq(user.commit_email)
+      expect(commit.committer_email).to eq(user.commit_email)
+    end
 
-      it 'runs after_wiki_activity callbacks' do
-        page
+    it 'runs after_wiki_activity callbacks' do
+      page
 
-        expect(subject).to receive(:after_wiki_activity)
+      expect(subject).to receive(:after_wiki_activity)
 
-        subject.delete_page(page)
-      end
+      subject.delete_page(page)
     end
 
-    it_behaves_like 'delete_page operations'
-
     context 'when an error is raised' do
       it 'logs the error and returns false' do
         page = build(:wiki_page, wiki: wiki)
@@ -509,14 +505,6 @@ RSpec.shared_examples 'wiki model' do
         expect(subject.delete_page(page)).to be_falsey
       end
     end
-
-    context 'when feature flag :gitaly_replace_wiki_delete_page is disabled' do
-      before do
-        stub_feature_flags(gitaly_replace_wiki_delete_page: false)
-      end
-
-      it_behaves_like 'delete_page operations'
-    end
   end
 
   describe '#ensure_repository' do