1 files changed, 1 insertions, 46 deletions

diff --git a/spec/models/operations/feature_flag_spec.rb b/spec/models/operations/feature_flag_spec.rb
index d689632e2b4..e709470b312 100644
--- a/spec/models/operations/feature_flag_spec.rb
+++ b/spec/models/operations/feature_flag_spec.rb
@@ -13,7 +13,7 @@ RSpec.describe Operations::FeatureFlag do
 
   describe 'associations' do
     it { is_expected.to belong_to(:project) }
-    it { is_expected.to have_many(:scopes) }
+    it { is_expected.to have_many(:strategies) }
   end
 
   describe '.reference_pattern' do
@@ -52,17 +52,6 @@ RSpec.describe Operations::FeatureFlag do
     it { is_expected.to define_enum_for(:version).with_values(new_version_flag: 2) }
 
     context 'a version 2 feature flag' do
-      it 'is invalid if associated with Operations::FeatureFlagScope models' do
-        project = create(:project)
-        feature_flag = described_class.new({ name: 'test', project: project, version: 2,
-                                 scopes_attributes: [{ environment_scope: '*', active: false }] })
-
-        expect(feature_flag.valid?).to eq(false)
-        expect(feature_flag.errors.messages).to eq({
-          version_associations: ["version 2 feature flags may not have scopes"]
-        })
-      end
-
       it 'is valid if associated with Operations::FeatureFlags::Strategy models' do
         project = create(:project)
         feature_flag = described_class.create!({ name: 'test', project: project, version: 2,
@@ -81,18 +70,6 @@ RSpec.describe Operations::FeatureFlag do
     end
   end
 
-  describe 'the default scope' do
-    let_it_be(:project) { create(:project) }
-
-    context 'with a version 2 feature flag' do
-      it 'does not create a default scope' do
-        feature_flag = described_class.create!({ name: 'test', project: project, scopes_attributes: [], version: 2 })
-
-        expect(feature_flag.scopes).to eq([])
-      end
-    end
-  end
-
   describe '.enabled' do
     subject { described_class.enabled }
 
@@ -187,26 +164,4 @@ RSpec.describe Operations::FeatureFlag do
       expect(subject.hook_attrs).to eq(hook_attrs)
     end
   end
-
-  describe "#execute_hooks" do
-    let_it_be(:user) { create(:user) }
-    let_it_be(:project) { create(:project) }
-    let_it_be(:feature_flag) { create(:operations_feature_flag, project: project) }
-
-    it 'does not execute the hook when feature_flag event is disabled' do
-      create(:project_hook, project: project, feature_flag_events: false)
-      expect(WebHookWorker).not_to receive(:perform_async)
-
-      feature_flag.execute_hooks(user)
-      feature_flag.touch
-    end
-
-    it 'executes hook when feature_flag event is enabled' do
-      hook = create(:project_hook, project: project, feature_flag_events: true)
-      expect(WebHookWorker).to receive(:perform_async).with(hook.id, an_instance_of(Hash), 'feature_flag_hooks')
-
-      feature_flag.execute_hooks(user)
-      feature_flag.touch
-    end
-  end
 end