Add latest changes from gitlab-org/gitlab@master

6 files changed, 22 insertions, 50 deletions

diff --git a/spec/factories/ai/service_access_tokens.rb b/spec/factories/ai/service_access_tokens.rb
index 0598eed52c4..307b87dc8c8 100644
--- a/spec/factories/ai/service_access_tokens.rb
+++ b/spec/factories/ai/service_access_tokens.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 FactoryBot.define do
-  factory :service_access_token, class: 'Ai::ServiceAccessToken' do
+  factory :service_access_token, class: 'CloudConnector::ServiceAccessToken' do
     token { SecureRandom.alphanumeric(10) }
     expires_at { Time.current + 1.day }
 
diff --git a/spec/features/dashboard/groups_list_spec.rb b/spec/features/dashboard/groups_list_spec.rb
index 745e45478d1..059c39e193d 100644
--- a/spec/features/dashboard/groups_list_spec.rb
+++ b/spec/features/dashboard/groups_list_spec.rb
@@ -10,7 +10,7 @@ RSpec.describe 'Dashboard Groups page', :js, feature_category: :groups_and_proje
 
   def click_group_caret(group)
     within("#group-#{group.id}") do
-      first('.folder-caret').click
+      find_by_testid('group-item-toggle-button').click
     end
     wait_for_requests
   end
diff --git a/spec/frontend/groups/components/group_item_spec.js b/spec/frontend/groups/components/group_item_spec.js
index 26c97a7cb41..5b96ecb4750 100644
--- a/spec/frontend/groups/components/group_item_spec.js
+++ b/spec/frontend/groups/components/group_item_spec.js
@@ -269,7 +269,6 @@ describe('GroupItemComponent', () => {
       expect(vm.$el.querySelector('.group-row-contents .stats')).toBeDefined();
 
       expect(vm.$el.querySelector('.folder-toggle-wrap')).toBeDefined();
-      expect(vm.$el.querySelector('.folder-toggle-wrap .folder-caret')).toBeDefined();
       expect(vm.$el.querySelector('.folder-toggle-wrap .item-type-icon')).toBeDefined();
 
       expect(vm.$el.querySelector('.avatar-container')).toBeDefined();
diff --git a/spec/frontend/groups/components/item_caret_spec.js b/spec/frontend/groups/components/item_caret_spec.js
deleted file mode 100644
index ff273fcf6da..00000000000
--- a/spec/frontend/groups/components/item_caret_spec.js
+++ /dev/null
@@ -1,41 +0,0 @@
-import { GlIcon } from '@gitlab/ui';
-import { shallowMount } from '@vue/test-utils';
-import ItemCaret from '~/groups/components/item_caret.vue';
-
-describe('ItemCaret', () => {
-  let wrapper;
-
-  const defaultProps = {
-    isGroupOpen: false,
-  };
-
-  const createComponent = (props = {}) => {
-    wrapper = shallowMount(ItemCaret, {
-      propsData: { ...defaultProps, ...props },
-    });
-  };
-
-  const findAllGlIcons = () => wrapper.findAllComponents(GlIcon);
-  const findGlIcon = () => wrapper.findComponent(GlIcon);
-
-  describe('template', () => {
-    it('renders component template correctly', () => {
-      createComponent();
-
-      expect(wrapper.classes()).toContain('folder-caret');
-      expect(findAllGlIcons()).toHaveLength(1);
-    });
-
-    it.each`
-      isGroupOpen | icon
-      ${true}     | ${'chevron-down'}
-      ${false}    | ${'chevron-right'}
-    `('renders "$icon" icon when `isGroupOpen` is $isGroupOpen', ({ isGroupOpen, icon }) => {
-      createComponent({
-        isGroupOpen,
-      });
-
-      expect(findGlIcon().props('name')).toBe(icon);
-    });
-  });
-});
diff --git a/spec/models/ai/service_access_token_spec.rb b/spec/models/cloud_connector/service_access_token_spec.rb
index d491735e604..4239ec486a5 100644
--- a/spec/models/ai/service_access_token_spec.rb
+++ b/spec/models/cloud_connector/service_access_token_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe Ai::ServiceAccessToken, type: :model, feature_category: :cloud_connector do
+RSpec.describe CloudConnector::ServiceAccessToken, type: :model, feature_category: :cloud_connector do
   describe '.expired', :freeze_time do
     let_it_be(:expired_token) { create(:service_access_token, :expired) }
     let_it_be(:active_token) {  create(:service_access_token, :active) }
@@ -22,16 +22,18 @@ RSpec.describe Ai::ServiceAccessToken, type: :model, feature_category: :cloud_co
   end
 
   describe '#token' do
+    subject(:service_access_token) { described_class.new }
+
     let(:token_value) { 'Abc' }
 
     it 'is encrypted' do
-      subject.token = token_value
+      service_access_token.token = token_value
 
       aggregate_failures do
-        expect(subject.encrypted_token_iv).to be_present
-        expect(subject.encrypted_token).to be_present
-        expect(subject.encrypted_token).not_to eq(token_value)
-        expect(subject.token).to eq(token_value)
+        expect(service_access_token.encrypted_token_iv).to be_present
+        expect(service_access_token.encrypted_token).to be_present
+        expect(service_access_token.encrypted_token).not_to eq(token_value)
+        expect(service_access_token.token).to eq(token_value)
       end
     end
 
diff --git a/spec/scripts/internal_events/cli_spec.rb b/spec/scripts/internal_events/cli_spec.rb
index 54169e0dc2d..30d4db7d195 100644
--- a/spec/scripts/internal_events/cli_spec.rb
+++ b/spec/scripts/internal_events/cli_spec.rb
@@ -89,6 +89,18 @@ RSpec.describe Cli, feature_category: :service_ping do
     YAML.safe_load(File.read('spec/fixtures/scripts/internal_events/new_events.yml')).each do |test_case|
       it_behaves_like 'creates the right defintion files', test_case['description'], test_case
     end
+
+    context 'with invalid event name' do
+      it 'prompts user to select another name' do
+        queue_cli_inputs([
+          "1\n", # Enum-select: New Event -- start tracking when an action or scenario occurs on gitlab instances
+          "Engineer uses Internal Event CLI to define a new event\n", # Submit description
+          "badDDD_ event (name) with // prob.lems\n" # Submit action name
+        ])
+
+        expect_cli_output { prompt.output.string.include?('Invalid event name.') }
+      end
+    end
   end
 
   context 'when creating new metrics' do