7 files changed, 81 insertions, 79 deletions

diff --git a/spec/models/ci/group_variable_spec.rb b/spec/models/ci/group_variable_spec.rb
index 0e249ec528f..a2751b9fb20 100644
--- a/spec/models/ci/group_variable_spec.rb
+++ b/spec/models/ci/group_variable_spec.rb
@@ -65,4 +65,16 @@ RSpec.describe Ci::GroupVariable, feature_category: :secrets_management do
       expect(subject.audit_details).to eq(subject.key)
     end
   end
+
+  describe '#group_name' do
+    it "equals to the name of the group the variable belongs to" do
+      expect(subject.group_name).to eq(subject.group.name)
+    end
+  end
+
+  describe '#group_ci_cd_settings_path' do
+    it "equals to the path of the CI/CD settings of the group the variable belongs to" do
+      expect(subject.group_ci_cd_settings_path).to eq(Gitlab::Routing.url_helpers.group_settings_ci_cd_path(subject.group))
+    end
+  end
 end
diff --git a/spec/models/concerns/issuable_spec.rb b/spec/models/concerns/issuable_spec.rb
index ea6baac455f..de46da4e27b 100644
--- a/spec/models/concerns/issuable_spec.rb
+++ b/spec/models/concerns/issuable_spec.rb
@@ -860,22 +860,16 @@ RSpec.describe Issuable do
     end
   end
 
-  describe '#first_contribution?' do
+  describe '#first_contribution?', feature_category: :code_review_workflow do
     let(:group) { create(:group) }
     let(:project) { create(:project, namespace: group) }
     let(:other_project) { create(:project) }
-    let(:owner) { create(:owner) }
-    let(:maintainer) { create(:user) }
-    let(:reporter) { create(:user) }
     let(:guest) { create(:user) }
 
     let(:contributor) { create(:user) }
     let(:first_time_contributor) { create(:user) }
 
     before do
-      group.add_owner(owner)
-      project.add_maintainer(maintainer)
-      project.add_reporter(reporter)
       project.add_guest(guest)
       project.add_guest(contributor)
       project.add_guest(first_time_contributor)
@@ -886,24 +880,6 @@ RSpec.describe Issuable do
     let(:merged_mr_other_project) { create(:merge_request, :merged, author: first_time_contributor, target_project: other_project, source_project: other_project) }
 
     context "for merge requests" do
-      it "is false for MAINTAINER" do
-        mr = create(:merge_request, author: maintainer, target_project: project, source_project: project)
-
-        expect(mr).not_to be_first_contribution
-      end
-
-      it "is false for OWNER" do
-        mr = create(:merge_request, author: owner, target_project: project, source_project: project)
-
-        expect(mr).not_to be_first_contribution
-      end
-
-      it "is false for REPORTER" do
-        mr = create(:merge_request, author: reporter, target_project: project, source_project: project)
-
-        expect(mr).not_to be_first_contribution
-      end
-
       it "is true when you don't have any merged MR" do
         expect(open_mr).to be_first_contribution
         expect(merged_mr).not_to be_first_contribution
diff --git a/spec/models/concerns/taskable_spec.rb b/spec/models/concerns/taskable_spec.rb
index 20de8995d13..dad0db2d898 100644
--- a/spec/models/concerns/taskable_spec.rb
+++ b/spec/models/concerns/taskable_spec.rb
@@ -27,6 +27,9 @@ RSpec.describe Taskable, feature_category: :team_planning do
 
         + [ ] Narrow no-break space (U+202F)
         + [ ] Thin space (U+2009)
+
+        1. [ ] Numbered 1
+        2) [x] Numbered 2
       MARKDOWN
     end
 
@@ -35,7 +38,9 @@ RSpec.describe Taskable, feature_category: :team_planning do
         TaskList::Item.new('- [ ]', 'First item'),
         TaskList::Item.new('- [x]', 'Second item'),
         TaskList::Item.new('* [x]', 'First item'),
-        TaskList::Item.new('* [ ]', 'Second item')
+        TaskList::Item.new('* [ ]', 'Second item'),
+        TaskList::Item.new('1. [ ]', 'Numbered 1'),
+        TaskList::Item.new('2) [x]', 'Numbered 2')
       ]
     end
 
diff --git a/spec/models/merge_request_spec.rb b/spec/models/merge_request_spec.rb
index 72420e275c5..a5e68829c5d 100644
--- a/spec/models/merge_request_spec.rb
+++ b/spec/models/merge_request_spec.rb
@@ -4647,18 +4647,11 @@ RSpec.describe MergeRequest, factory_default: :keep, feature_category: :code_rev
           .to(false)
       end
 
-      it 'sets first_contribution to false' do
-        subject.mark_as_merged
-
-        expect(subject.state).to eq('merged')
-        expect(subject.first_contribution?).to be_falsey
-      end
-
-      context 'when it is a contribution from a project non-member' do
-        let(:non_member) { create(:user) }
+      context 'when it is a first contribution' do
+        let(:new_user) { create(:user) }
 
         before do
-          subject.update!(author: non_member)
+          subject.update!(author: new_user)
         end
 
         it 'sets first_contribution' do
@@ -4669,7 +4662,7 @@ RSpec.describe MergeRequest, factory_default: :keep, feature_category: :code_rev
         end
 
         it "doesn't set first_contribution not first contribution" do
-          create(:merged_merge_request, author: non_member)
+          create(:merged_merge_request, author: new_user)
 
           subject.mark_as_merged
 
diff --git a/spec/models/namespace_setting_spec.rb b/spec/models/namespace_setting_spec.rb
index e3d389a2a6e..ba0ce7d6f7f 100644
--- a/spec/models/namespace_setting_spec.rb
+++ b/spec/models/namespace_setting_spec.rb
@@ -194,7 +194,7 @@ RSpec.describe NamespaceSetting, feature_category: :subgroups, type: :model do
     context 'when a group has parent groups' do
       let(:grandparent) { create(:group, namespace_settings: settings) }
       let(:parent)      { create(:group, parent: grandparent) }
-      let!(:group) { create(:group, parent: parent) }
+      let!(:group)      { create(:group, parent: parent) }
 
       context "when a parent group has disabled diff previews" do
         let(:settings) { create(:namespace_settings, show_diff_preview_in_email: false) }
@@ -214,61 +214,87 @@ RSpec.describe NamespaceSetting, feature_category: :subgroups, type: :model do
     end
   end
 
-  describe '#runner_registration_enabled?' do
-    context 'when not a subgroup' do
-      let_it_be(:settings) { create(:namespace_settings) }
-      let_it_be(:group) { create(:group, namespace_settings: settings) }
+  context 'runner registration settings' do
+    shared_context 'with runner registration settings changing in hierarchy' do
+      context 'when there are no parents' do
+        let_it_be(:group) { create(:group) }
 
-      before do
-        group.update!(runner_registration_enabled: runner_registration_enabled)
+        it { is_expected.to be_truthy }
+
+        context 'when no group can register runners' do
+          before do
+            stub_application_setting(valid_runner_registrars: [])
+          end
+
+          it { is_expected.to be_falsey }
+        end
       end
 
-      context 'when :runner_registration_enabled is false' do
-        let(:runner_registration_enabled) { false }
+      context 'when there are parents' do
+        let_it_be(:grandparent) { create(:group) }
+        let_it_be(:parent)      { create(:group, parent: grandparent) }
+        let_it_be(:group)       { create(:group, parent: parent) }
 
-        it 'returns false' do
-          expect(group.runner_registration_enabled?).to be_falsey
+        before do
+          grandparent.update!(runner_registration_enabled: grandparent_runner_registration_enabled)
         end
 
-        it 'does not query the db' do
-          expect { group.runner_registration_enabled? }.not_to exceed_query_limit(0)
+        context 'when a parent group has runner registration disabled' do
+          let(:grandparent_runner_registration_enabled) { false }
+
+          it { is_expected.to be_falsey }
         end
-      end
 
-      context 'when :runner_registration_enabled is true' do
-        let(:runner_registration_enabled) { true }
+        context 'when all parent groups have runner registration enabled' do
+          let(:grandparent_runner_registration_enabled) { true }
 
-        it 'returns true' do
-          expect(group.runner_registration_enabled?).to be_truthy
+          it { is_expected.to be_truthy }
         end
       end
     end
 
-    context 'when a group has parent groups' do
-      let_it_be(:grandparent) { create(:group) }
-      let_it_be(:parent)      { create(:group, parent: grandparent) }
-      let_it_be(:group)       { create(:group, parent: parent) }
+    describe '#runner_registration_enabled?' do
+      subject(:group_setting) { group.runner_registration_enabled? }
+
+      let_it_be(:settings) { create(:namespace_settings) }
+      let_it_be(:group) { create(:group, namespace_settings: settings) }
 
       before do
-        grandparent.update!(runner_registration_enabled: runner_registration_enabled)
+        group.update!(runner_registration_enabled: group_runner_registration_enabled)
       end
 
-      context 'when a parent group has runner registration disabled' do
-        let(:runner_registration_enabled) { false }
+      context 'when runner registration is enabled' do
+        let(:group_runner_registration_enabled) { true }
 
-        it 'returns false' do
-          expect(group.runner_registration_enabled?).to be_falsey
-        end
+        it { is_expected.to be_truthy }
+
+        it_behaves_like 'with runner registration settings changing in hierarchy'
       end
 
-      context 'when all parent groups have runner registration enabled' do
-        let(:runner_registration_enabled) { true }
+      context 'when runner registration is disabled' do
+        let(:group_runner_registration_enabled) { false }
 
-        it 'returns true' do
-          expect(group.runner_registration_enabled?).to be_truthy
+        it { is_expected.to be_falsey }
+
+        it 'does not query the db' do
+          expect { group.runner_registration_enabled? }.not_to exceed_query_limit(0)
+        end
+
+        context 'when group runner registration is disallowed' do
+          before do
+            stub_application_setting(valid_runner_registrars: [])
+          end
+
+          it { is_expected.to be_falsey }
         end
       end
     end
+
+    describe '#all_ancestors_have_runner_registration_enabled?' do
+      subject(:group_setting) { group.all_ancestors_have_runner_registration_enabled? }
+
+      it_behaves_like 'with runner registration settings changing in hierarchy'
+    end
   end
 
   describe '#allow_runner_registration_token?' do
diff --git a/spec/models/user_preference_spec.rb b/spec/models/user_preference_spec.rb
index e085ff934b2..1d7ecb724bf 100644
--- a/spec/models/user_preference_spec.rb
+++ b/spec/models/user_preference_spec.rb
@@ -48,13 +48,6 @@ RSpec.describe UserPreference, feature_category: :user_profile do
       end
     end
 
-    describe 'use_legacy_web_ide' do
-      it { is_expected.to allow_value(true).for(:use_legacy_web_ide) }
-      it { is_expected.to allow_value(false).for(:use_legacy_web_ide) }
-      it { is_expected.not_to allow_value(nil).for(:use_legacy_web_ide) }
-      it { is_expected.not_to allow_value("").for(:use_legacy_web_ide) }
-    end
-
     describe 'pass_user_identities_to_ci_jwt' do
       it { is_expected.to allow_value(true).for(:pass_user_identities_to_ci_jwt) }
       it { is_expected.to allow_value(false).for(:pass_user_identities_to_ci_jwt) }
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index 8b6e3199529..eaf4ecda635 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -75,9 +75,6 @@ RSpec.describe User, feature_category: :user_profile do
     it { is_expected.to delegate_method(:diffs_addition_color).to(:user_preference) }
     it { is_expected.to delegate_method(:diffs_addition_color=).to(:user_preference).with_arguments(:args) }
 
-    it { is_expected.to delegate_method(:use_legacy_web_ide).to(:user_preference) }
-    it { is_expected.to delegate_method(:use_legacy_web_ide=).to(:user_preference).with_arguments(:args) }
-
     it { is_expected.to delegate_method(:use_new_navigation).to(:user_preference) }
     it { is_expected.to delegate_method(:use_new_navigation=).to(:user_preference).with_arguments(:args) }