Add latest changes from gitlab-org/gitlab@master

3 files changed, 15 insertions, 6 deletions

diff --git a/spec/models/error_tracking/project_error_tracking_setting_spec.rb b/spec/models/error_tracking/project_error_tracking_setting_spec.rb
index 7be61f4950e..29255e53fcf 100644
--- a/spec/models/error_tracking/project_error_tracking_setting_spec.rb
+++ b/spec/models/error_tracking/project_error_tracking_setting_spec.rb
@@ -478,18 +478,17 @@ RSpec.describe ErrorTracking::ProjectErrorTrackingSetting do
   describe '#sentry_enabled' do
     using RSpec::Parameterized::TableSyntax
 
-    where(:enabled, :integrated, :feature_flag, :sentry_enabled) do
-      true  | false | false | true
-      true  | true  | false | true
-      true  | true  | true  | false
-      false | false | false | false
+    where(:enabled, :integrated, :sentry_enabled) do
+      true  | false | true
+      true  | true  | false
+      true  | true  | false
+      false | false | false
     end
 
     with_them do
       before do
         subject.enabled = enabled
         subject.integrated = integrated
-        stub_feature_flags(integrated_error_tracking: feature_flag)
       end
 
       it { expect(subject.sentry_enabled).to eq(sentry_enabled) }
diff --git a/spec/models/namespaces/project_namespace_spec.rb b/spec/models/namespaces/project_namespace_spec.rb
new file mode 100644
index 00000000000..e9d223b7555
--- /dev/null
+++ b/spec/models/namespaces/project_namespace_spec.rb
@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe Namespaces::ProjectNamespace, type: :model do
+  describe 'relationships' do
+    it { is_expected.to have_one(:project).with_foreign_key(:project_namespace_id).inverse_of(:project_namespace) }
+  end
+end
diff --git a/spec/models/project_spec.rb b/spec/models/project_spec.rb
index d0961fbd272..50bf36ff428 100644
--- a/spec/models/project_spec.rb
+++ b/spec/models/project_spec.rb
@@ -16,6 +16,7 @@ RSpec.describe Project, factory_default: :keep do
   describe 'associations' do
     it { is_expected.to belong_to(:group) }
     it { is_expected.to belong_to(:namespace) }
+    it { is_expected.to belong_to(:project_namespace).class_name('Namespaces::ProjectNamespace').with_foreign_key('project_namespace_id').inverse_of(:project) }
     it { is_expected.to belong_to(:creator).class_name('User') }
     it { is_expected.to belong_to(:pool_repository) }
     it { is_expected.to have_many(:users) }