Add latest changes from gitlab-org/gitlab@master

1 files changed, 3 insertions, 1 deletions

diff --git a/spec/models/analytics/devops_adoption/segment_selection_spec.rb b/spec/models/analytics/devops_adoption/segment_selection_spec.rb
index 5866cbaa48e..64ef6636f2c 100644
--- a/spec/models/analytics/devops_adoption/segment_selection_spec.rb
+++ b/spec/models/analytics/devops_adoption/segment_selection_spec.rb
@@ -51,11 +51,13 @@ RSpec.describe Analytics::DevopsAdoption::SegmentSelection, type: :model do
     context 'limit the number of segment selections' do
       let_it_be(:segment) { create(:devops_adoption_segment) }
 
-      subject { build(:devops_adoption_segment_selection, segment: segment, project: project) }
+      subject { build(:devops_adoption_segment_selection, project: project, segment: segment) }
 
       before do
         create(:devops_adoption_segment_selection, :project, segment: segment)
 
+        segment.reload
+
         stub_const("#{described_class}::ALLOWED_SELECTIONS_PER_SEGMENT", 1)
       end