Add latest changes from gitlab-org/gitlab@master

1 files changed, 17 insertions, 35 deletions

diff --git a/spec/support/shared_examples/models/versioned_description_shared_examples.rb b/spec/support/shared_examples/models/versioned_description_shared_examples.rb
index 59124af19ec..8fee2494af7 100644
--- a/spec/support/shared_examples/models/versioned_description_shared_examples.rb
+++ b/spec/support/shared_examples/models/versioned_description_shared_examples.rb
@@ -9,54 +9,36 @@ RSpec.shared_examples 'versioned description' do
     let(:factory_name) { described_class.name.underscore.to_sym }
     let!(:model) { create(factory_name, description: 'Original description') }
 
-    context 'when feature is enabled' do
+    context 'when description was changed' do
       before do
-        stub_feature_flags(save_description_versions: true)
+        model.update!(description: 'New description')
       end
 
-      context 'when description was changed' do
-        before do
-          model.update!(description: 'New description')
-        end
-
-        it 'saves the old and new description for the first update' do
-          expect(model.description_versions.first.description).to eq('Original description')
-          expect(model.description_versions.last.description).to eq('New description')
-        end
-
-        it 'only saves the new description for subsequent updates' do
-          expect { model.update!(description: 'Another description') }.to change { model.description_versions.count }.by(1)
-
-          expect(model.description_versions.last.description).to eq('Another description')
-        end
+      it 'saves the old and new description for the first update' do
+        expect(model.description_versions.first.description).to eq('Original description')
+        expect(model.description_versions.last.description).to eq('New description')
+      end
 
-        it 'sets the new description version to `saved_description_version`' do
-          expect(model.saved_description_version).to eq(model.description_versions.last)
-        end
+      it 'only saves the new description for subsequent updates' do
+        expect { model.update!(description: 'Another description') }.to change { model.description_versions.count }.by(1)
 
-        it 'clears `saved_description_version` after another save that does not change description' do
-          model.save!
+        expect(model.description_versions.last.description).to eq('Another description')
+      end
 
-          expect(model.saved_description_version).to be_nil
-        end
+      it 'sets the new description version to `saved_description_version`' do
+        expect(model.saved_description_version).to eq(model.description_versions.last)
       end
 
-      context 'when description was not changed' do
-        it 'does not save any description version' do
-          expect { model.save! }.not_to change { model.description_versions.count }
+      it 'clears `saved_description_version` after another save that does not change description' do
+        model.save!
 
-          expect(model.saved_description_version).to be_nil
-        end
+        expect(model.saved_description_version).to be_nil
       end
     end
 
-    context 'when feature is disabled' do
-      before do
-        stub_feature_flags(save_description_versions: false)
-      end
-
+    context 'when description was not changed' do
       it 'does not save any description version' do
-        expect { model.update!(description: 'New description') }.not_to change { model.description_versions.count }
+        expect { model.save! }.not_to change { model.description_versions.count }
 
         expect(model.saved_description_version).to be_nil
       end