Add latest changes from gitlab-org/gitlab@master

2 files changed, 0 insertions, 28 deletions

diff --git a/spec/helpers/registrations_helper_spec.rb b/spec/helpers/registrations_helper_spec.rb
index eec87bc8712..b2f9a794cb3 100644
--- a/spec/helpers/registrations_helper_spec.rb
+++ b/spec/helpers/registrations_helper_spec.rb
@@ -8,20 +8,4 @@ RSpec.describe RegistrationsHelper do
       expect(helper.signup_username_data_attributes.keys).to include(:min_length, :min_length_message, :max_length, :max_length_message, :qa_selector)
     end
   end
-
-  describe '#arkose_labs_challenge_enabled?' do
-    before do
-      stub_application_setting(
-        arkose_labs_private_api_key: nil,
-        arkose_labs_public_api_key: nil,
-        arkose_labs_namespace: nil
-      )
-      stub_env('ARKOSE_LABS_PRIVATE_KEY', nil)
-      stub_env('ARKOSE_LABS_PUBLIC_KEY', nil)
-    end
-
-    it 'is false' do
-      expect(helper.arkose_labs_challenge_enabled?).to eq false
-    end
-  end
 end
diff --git a/spec/helpers/todos_helper_spec.rb b/spec/helpers/todos_helper_spec.rb
index 26951b0c1e7..8d24e9576e0 100644
--- a/spec/helpers/todos_helper_spec.rb
+++ b/spec/helpers/todos_helper_spec.rb
@@ -135,18 +135,6 @@ RSpec.describe TodosHelper do
     context 'when given a task' do
       let(:todo) { task_todo }
 
-      context 'when the use_iid_in_work_items_path feature flag is disabled' do
-        before do
-          stub_feature_flags(use_iid_in_work_items_path: false)
-        end
-
-        it 'responds with an appropriate path' do
-          path = helper.todo_target_path(todo)
-
-          expect(path).to eq("/#{todo.project.full_path}/-/work_items/#{todo.target.id}")
-        end
-      end
-
       it 'responds with an appropriate path using iid' do
         path = helper.todo_target_path(todo)