diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-07-15 03:08:47 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-07-15 03:08:47 +0300 |
commit | a9d218667ee236846c5a3cd86103b1804c0be2bc (patch) | |
tree | c4f8342820893d9f8c5058fc845fed8804d3eaca /spec | |
parent | 34ee0b51d6b76bf987ce5e1cbe6a4f6cccc73910 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec')
-rw-r--r-- | spec/controllers/projects/settings/ci_cd_controller_spec.rb | 5 | ||||
-rw-r--r-- | spec/frontend/profile/preferences/components/profile_preferences_spec.js | 8 |
2 files changed, 2 insertions, 11 deletions
diff --git a/spec/controllers/projects/settings/ci_cd_controller_spec.rb b/spec/controllers/projects/settings/ci_cd_controller_spec.rb index 1c332eadc42..a1dbd27f49a 100644 --- a/spec/controllers/projects/settings/ci_cd_controller_spec.rb +++ b/spec/controllers/projects/settings/ci_cd_controller_spec.rb @@ -65,9 +65,8 @@ RSpec.describe Projects::Settings::CiCdController, feature_category: :continuous end context 'with group runners' do - let_it_be(:group) { create :group } - let_it_be(:project) { create :project, group: group } - let_it_be(:group_runner) { create(:ci_runner, :group, groups: [group]) } + let(:project) { other_project } + let!(:group_runner) { create(:ci_runner, :group, groups: [group]) } it 'sets group runners' do subject diff --git a/spec/frontend/profile/preferences/components/profile_preferences_spec.js b/spec/frontend/profile/preferences/components/profile_preferences_spec.js index 21167dccda9..144d9e76869 100644 --- a/spec/frontend/profile/preferences/components/profile_preferences_spec.js +++ b/spec/frontend/profile/preferences/components/profile_preferences_spec.js @@ -47,10 +47,6 @@ describe('ProfilePreferences component', () => { ); } - function findIntegrationsDivider() { - return wrapper.findByTestId('profile-preferences-integrations-rule'); - } - function findIntegrationsHeading() { return wrapper.findByTestId('profile-preferences-integrations-heading'); } @@ -86,21 +82,17 @@ describe('ProfilePreferences component', () => { it('should not render Integrations section', () => { wrapper = createComponent(); const views = wrapper.findAllComponents(IntegrationView); - const divider = findIntegrationsDivider(); const heading = findIntegrationsHeading(); - expect(divider.exists()).toBe(false); expect(heading.exists()).toBe(false); expect(views).toHaveLength(0); }); it('should render Integration section', () => { wrapper = createComponent({ provide: { integrationViews } }); - const divider = findIntegrationsDivider(); const heading = findIntegrationsHeading(); const views = wrapper.findAllComponents(IntegrationView); - expect(divider.exists()).toBe(true); expect(heading.exists()).toBe(true); expect(views).toHaveLength(integrationViews.length); }); |