Add latest changes from gitlab-org/gitlab@13-3-stable-ee

1 files changed, 21 insertions, 20 deletions

diff --git a/spec/support/shared_examples/models/concerns/timebox_shared_examples.rb b/spec/support/shared_examples/models/concerns/timebox_shared_examples.rb
index 32d502af5a2..15ca1f56bd0 100644
--- a/spec/support/shared_examples/models/concerns/timebox_shared_examples.rb
+++ b/spec/support/shared_examples/models/concerns/timebox_shared_examples.rb
@@ -3,7 +3,8 @@
 RSpec.shared_examples 'a timebox' do |timebox_type|
   let(:project) { create(:project, :public) }
   let(:group) { create(:group) }
-  let(:timebox) { create(timebox_type, project: project) }
+  let(:timebox_args) { [] }
+  let(:timebox) { create(timebox_type, *timebox_args, project: project) }
   let(:issue) { create(:issue, project: project) }
   let(:user) { create(:user) }
   let(:timebox_table_name) { timebox_type.to_s.pluralize.to_sym }
@@ -12,7 +13,7 @@ RSpec.shared_examples 'a timebox' do |timebox_type|
     context 'with a project' do
       it_behaves_like 'AtomicInternalId' do
         let(:internal_id_attribute) { :iid }
-        let(:instance) { build(timebox_type, project: build(:project), group: nil) }
+        let(:instance) { build(timebox_type, *timebox_args, project: build(:project), group: nil) }
         let(:scope) { :project }
         let(:scope_attrs) { { project: instance.project } }
         let(:usage) { timebox_table_name }
@@ -22,7 +23,7 @@ RSpec.shared_examples 'a timebox' do |timebox_type|
     context 'with a group' do
       it_behaves_like 'AtomicInternalId' do
         let(:internal_id_attribute) { :iid }
-        let(:instance) { build(timebox_type, project: nil, group: build(:group)) }
+        let(:instance) { build(timebox_type, *timebox_args, project: nil, group: build(:group)) }
         let(:scope) { :group }
         let(:scope_attrs) { { namespace: instance.group } }
         let(:usage) { timebox_table_name }
@@ -37,14 +38,14 @@ RSpec.shared_examples 'a timebox' do |timebox_type|
 
     describe 'start_date' do
       it 'adds an error when start_date is greater then due_date' do
-        timebox = build(timebox_type, start_date: Date.tomorrow, due_date: Date.yesterday)
+        timebox = build(timebox_type, *timebox_args, start_date: Date.tomorrow, due_date: Date.yesterday)
 
         expect(timebox).not_to be_valid
         expect(timebox.errors[:due_date]).to include("must be greater than start date")
       end
 
       it 'adds an error when start_date is greater than 9999-12-31' do
-        timebox = build(timebox_type, start_date: Date.new(10000, 1, 1))
+        timebox = build(timebox_type, *timebox_args, start_date: Date.new(10000, 1, 1))
 
         expect(timebox).not_to be_valid
         expect(timebox.errors[:start_date]).to include("date must not be after 9999-12-31")
@@ -53,7 +54,7 @@ RSpec.shared_examples 'a timebox' do |timebox_type|
 
     describe 'due_date' do
       it 'adds an error when due_date is greater than 9999-12-31' do
-        timebox = build(timebox_type, due_date: Date.new(10000, 1, 1))
+        timebox = build(timebox_type, *timebox_args, due_date: Date.new(10000, 1, 1))
 
         expect(timebox).not_to be_valid
         expect(timebox.errors[:due_date]).to include("date must not be after 9999-12-31")
@@ -64,7 +65,7 @@ RSpec.shared_examples 'a timebox' do |timebox_type|
       it { is_expected.to validate_presence_of(:title) }
 
       it 'is invalid if title would be empty after sanitation' do
-        timebox = build(timebox_type, project: project, title: '<img src=x onerror=prompt(1)>')
+        timebox = build(timebox_type, *timebox_args, project: project, title: '<img src=x onerror=prompt(1)>')
 
         expect(timebox).not_to be_valid
         expect(timebox.errors[:title]).to include("can't be blank")
@@ -73,7 +74,7 @@ RSpec.shared_examples 'a timebox' do |timebox_type|
 
     describe '#timebox_type_check' do
       it 'is invalid if it has both project_id and group_id' do
-        timebox = build(timebox_type, group: group)
+        timebox = build(timebox_type, *timebox_args, group: group)
         timebox.project = project
 
         expect(timebox).not_to be_valid
@@ -98,7 +99,7 @@ RSpec.shared_examples 'a timebox' do |timebox_type|
       end
 
       context "per group" do
-        let(:timebox) { create(timebox_type, group: group) }
+        let(:timebox) { create(timebox_type, *timebox_args, group: group) }
 
         before do
           project.update(group: group)
@@ -111,7 +112,7 @@ RSpec.shared_examples 'a timebox' do |timebox_type|
         end
 
         it "does not accept the same title of a child project timebox" do
-          create(timebox_type, project: group.projects.first)
+          create(timebox_type, *timebox_args, project: group.projects.first)
 
           new_timebox = described_class.new(group: group, title: timebox.title)
 
@@ -143,7 +144,7 @@ RSpec.shared_examples 'a timebox' do |timebox_type|
     end
 
     context 'when project_id is not present' do
-      let(:timebox) { build(timebox_type, group: group) }
+      let(:timebox) { build(timebox_type, *timebox_args, group: group) }
 
       it 'returns false' do
         expect(timebox.project_timebox?).to be_falsey
@@ -153,7 +154,7 @@ RSpec.shared_examples 'a timebox' do |timebox_type|
 
   describe '#group_timebox?' do
     context 'when group_id is present' do
-      let(:timebox) { build(timebox_type, group: group) }
+      let(:timebox) { build(timebox_type, *timebox_args, group: group) }
 
       it 'returns true' do
         expect(timebox.group_timebox?).to be_truthy
@@ -168,7 +169,7 @@ RSpec.shared_examples 'a timebox' do |timebox_type|
   end
 
   describe '#safe_title' do
-    let(:timebox) { create(timebox_type, title: "<b>foo & bar -> 2.2</b>") }
+    let(:timebox) { create(timebox_type, *timebox_args, title: "<b>foo & bar -> 2.2</b>") }
 
     it 'normalizes the title for use as a slug' do
       expect(timebox.safe_title).to eq('foo-bar-22')
@@ -177,7 +178,7 @@ RSpec.shared_examples 'a timebox' do |timebox_type|
 
   describe '#resource_parent' do
     context 'when group is present' do
-      let(:timebox) { build(timebox_type, group: group) }
+      let(:timebox) { build(timebox_type, *timebox_args, group: group) }
 
       it 'returns the group' do
         expect(timebox.resource_parent).to eq(group)
@@ -192,7 +193,7 @@ RSpec.shared_examples 'a timebox' do |timebox_type|
   end
 
   describe "#title" do
-    let(:timebox) { create(timebox_type, title: "<b>foo & bar -> 2.2</b>") }
+    let(:timebox) { create(timebox_type, *timebox_args, title: "<b>foo & bar -> 2.2</b>") }
 
     it "sanitizes title" do
       expect(timebox.title).to eq("foo & bar -> 2.2")
@@ -203,28 +204,28 @@ RSpec.shared_examples 'a timebox' do |timebox_type|
     context "per project" do
       it "is true for projects with MRs enabled" do
         project = create(:project, :merge_requests_enabled)
-        timebox = create(timebox_type, project: project)
+        timebox = create(timebox_type, *timebox_args, project: project)
 
         expect(timebox.merge_requests_enabled?).to be_truthy
       end
 
       it "is false for projects with MRs disabled" do
         project = create(:project, :repository_enabled, :merge_requests_disabled)
-        timebox = create(timebox_type, project: project)
+        timebox = create(timebox_type, *timebox_args, project: project)
 
         expect(timebox.merge_requests_enabled?).to be_falsey
       end
 
       it "is false for projects with repository disabled" do
         project = create(:project, :repository_disabled)
-        timebox = create(timebox_type, project: project)
+        timebox = create(timebox_type, *timebox_args, project: project)
 
         expect(timebox.merge_requests_enabled?).to be_falsey
       end
     end
 
     context "per group" do
-      let(:timebox) { create(timebox_type, group: group) }
+      let(:timebox) { create(timebox_type, *timebox_args, group: group) }
 
       it "is always true for groups, for performance reasons" do
         expect(timebox.merge_requests_enabled?).to be_truthy
@@ -234,7 +235,7 @@ RSpec.shared_examples 'a timebox' do |timebox_type|
 
   describe '#to_ability_name' do
     it 'returns timebox' do
-      timebox = build(timebox_type)
+      timebox = build(timebox_type, *timebox_args)
 
       expect(timebox.to_ability_name).to eq(timebox_type.to_s)
     end