pie title NETFLIX
"Time spent looking for movie" : 90
"Time spent watching it" : 10
`;
describe('content_editor/extensions/diagram', () => {
+ let tiptapEditor;
+ let doc;
+ let diagram;
+
+ const createEditor = () => {
+ tiptapEditor = createTestEditor({
+ extensions: [CodeBlockHighlight, Diagram],
+ });
+
+ ({
+ builders: { doc, diagram },
+ } = createDocBuilder({
+ tiptapEditor,
+ names: {
+ codeBlock: { nodeType: CodeBlockHighlight.name },
+ diagram: { nodeType: Diagram.name },
+ },
+ }));
+ };
+
it('inherits from code block highlight extension', () => {
expect(Diagram.parent).toBe(CodeBlockHighlight);
});
@@ -13,4 +36,23 @@ describe('content_editor/extensions/diagram', () => {
}),
);
});
+
+ describe('when parsing HTML', () => {
+ beforeEach(() => {
+ createEditor();
+
+ tiptapEditor.commands.setContent(DIAGRAM_HTML);
+ });
+
+ it('parses HTML correctly into a diagram block', () => {
+ expect(tiptapEditor.getJSON()).toEqual(
+ doc(
+ diagram(
+ { language: 'mermaid' },
+ 'pie title NETFLIX\n "Time spent looking for movie" : 90\n "Time spent watching it" : 10',
+ ),
+ ).toJSON(),
+ );
+ });
+ });
});
diff --git a/spec/frontend/integrations/edit/components/jira_issues_fields_spec.js b/spec/frontend/integrations/edit/components/jira_issues_fields_spec.js
index d06a3d0a389..b8de438c302 100644
--- a/spec/frontend/integrations/edit/components/jira_issues_fields_spec.js
+++ b/spec/frontend/integrations/edit/components/jira_issues_fields_spec.js
@@ -1,5 +1,4 @@
import { GlFormCheckbox, GlFormInput } from '@gitlab/ui';
-import { nextTick } from 'vue';
import { mountExtended, shallowMountExtended } from 'helpers/vue_test_utils_helper';
import JiraIssuesFields from '~/integrations/edit/components/jira_issues_fields.vue';
@@ -32,19 +31,13 @@ describe('JiraIssuesFields', () => {
};
const findEnableCheckbox = () => wrapper.findComponent(GlFormCheckbox);
+ const findProjectKeys = () => wrapper.findComponent(GlFormInput);
const findEnableCheckboxDisabled = () =>
findEnableCheckbox().find('[type=checkbox]').attributes('disabled');
- const findProjectKey = () => wrapper.findComponent(GlFormInput);
- const findProjectKeys = () => wrapper.findByTestId('jira-project-keys');
- const findProjectKeyFormGroup = () => wrapper.findByTestId('project-key-form-group');
+ const findProjectKeysGroup = () => wrapper.findByTestId('jira-project-keys');
const findJiraForVulnerabilities = () => wrapper.findByTestId('jira-for-vulnerabilities');
const setEnableCheckbox = (isEnabled = true) => findEnableCheckbox().vm.$emit('input', isEnabled);
- const assertProjectKeyState = (expectedStateValue) => {
- expect(findProjectKey().attributes('state')).toBe(expectedStateValue);
- expect(findProjectKeyFormGroup().attributes('state')).toBe(expectedStateValue);
- };
-
describe('template', () => {
describe.each`
showJiraIssuesIntegration
@@ -80,8 +73,8 @@ describe('JiraIssuesFields', () => {
createComponent({ props: { initialProjectKey: '' } });
});
- it('does not render project_key input', () => {
- expect(findProjectKey().exists()).toBe(false);
+ it('does not render project keys input', () => {
+ expect(findProjectKeys().exists()).toBe(false);
});
// As per https://vuejs.org/v2/guide/forms.html#Checkbox-1,
@@ -99,134 +92,58 @@ describe('JiraIssuesFields', () => {
});
describe('on enable issues', () => {
- it('renders project_key input as required', async () => {
+ it('renders project keys input', async () => {
await setEnableCheckbox(true);
- expect(findProjectKey().exists()).toBe(true);
- expect(findProjectKey().attributes('required')).toBe('required');
+ expect(findProjectKeys().exists()).toBe(true);
});
});
});
- describe('when jira_multiple_project_keys is not enabled', () => {
+ describe('when initialProjectKeys is provided', () => {
+ const projectKeys = 'BE, FE';
+
beforeEach(() => {
createComponent({
mountFn: shallowMountExtended,
props: {
initialEnableJiraIssues: true,
- },
- });
- });
-
- it('does not render "Jira project keys" input', () => {
- expect(findProjectKeys().exists()).toBe(false);
- });
- });
-
- describe('when jira_multiple_project_keys is enabled', () => {
- beforeEach(() => {
- createComponent({
- mountFn: shallowMountExtended,
- props: {
- initialEnableJiraIssues: true,
- },
- provide: {
- glFeatures: {
- jiraMultipleProjectKeys: true,
- },
+ initialProjectKeys: projectKeys,
},
});
});
it('renders "Jira project keys" input', () => {
- expect(findProjectKeys().attributes('label')).toBe('Jira project keys');
+ expect(findProjectKeysGroup().attributes('label')).toBe('Jira project keys');
+ expect(findProjectKeys().attributes('value')).toBe(projectKeys);
});
});
- describe('Vulnerabilities creation', () => {
+ describe('when section is issue creation (for vulnarabilities)', () => {
+ const jiraIssueType = 'some-jira-issue-type';
+
beforeEach(() => {
- createComponent();
+ createComponent({
+ mountFn: shallowMountExtended,
+ props: {
+ isIssueCreation: true,
+ initialVulnerabilitiesIssuetype: jiraIssueType,
+ },
+ });
});
- it.each([true, false])(
- 'shows the jira-vulnerabilities component correctly when jira issues enables is set to "%s"',
- async (hasJiraIssuesEnabled) => {
- await setEnableCheckbox(hasJiraIssuesEnabled);
-
- expect(findJiraForVulnerabilities().exists()).toBe(hasJiraIssuesEnabled);
- },
- );
-
- it('passes down the correct show-full-feature property', async () => {
- await setEnableCheckbox(true);
- expect(findJiraForVulnerabilities().attributes('show-full-feature')).toBe('true');
- wrapper.setProps({ showJiraVulnerabilitiesIntegration: false });
- await nextTick();
- expect(findJiraForVulnerabilities().attributes('show-full-feature')).toBeUndefined();
- });
-
- it('passes down the correct initial-issue-type-id value when value is empty', async () => {
- await setEnableCheckbox(true);
- expect(findJiraForVulnerabilities().attributes('initial-issue-type-id')).toBeUndefined();
- });
-
- it('passes down the correct initial-issue-type-id value when value is not empty', async () => {
- const jiraIssueType = 'some-jira-issue-type';
- wrapper.setProps({ initialVulnerabilitiesIssuetype: jiraIssueType });
- await setEnableCheckbox(true);
- expect(findJiraForVulnerabilities().attributes('initial-issue-type-id')).toBe(
- jiraIssueType,
- );
+ it('renders "Jira for vulnerabilities" component', () => {
+ expect(findJiraForVulnerabilities().attributes()).toMatchObject({
+ 'show-full-feature': 'true',
+ 'initial-issue-type-id': jiraIssueType,
+ });
});
it('emits "request-jira-issue-types` when the jira-vulnerabilities component requests to fetch issue types', async () => {
- await setEnableCheckbox(true);
await findJiraForVulnerabilities().vm.$emit('request-jira-issue-types');
expect(wrapper.emitted('request-jira-issue-types')).toHaveLength(1);
});
});
-
- describe('Project key input field', () => {
- it('sets Project Key `state` attribute to `true` by default', () => {
- createComponent({
- props: {
- initialProjectKey: '',
- initialEnableJiraIssues: true,
- },
- mountFn: shallowMountExtended,
- });
-
- assertProjectKeyState('true');
- });
-
- describe('when `isValidated` prop is true', () => {
- beforeEach(() => {
- createComponent({
- props: {
- initialProjectKey: '',
- initialEnableJiraIssues: true,
- isValidated: true,
- },
- mountFn: shallowMountExtended,
- });
- });
-
- describe('with no project key', () => {
- it('sets Project Key `state` attribute to `undefined`', () => {
- assertProjectKeyState(undefined);
- });
- });
-
- describe('when project key is set', () => {
- it('sets Project Key `state` attribute to `true`', async () => {
- // set the project key
- await findProjectKey().vm.$emit('input', 'AB');
-
- assertProjectKeyState('true');
- });
- });
- });
- });
});
});
diff --git a/spec/frontend/merge_requests/list/components/merge_requests_list_app_spec.js b/spec/frontend/merge_requests/list/components/merge_requests_list_app_spec.js
index 86fcd038d46..1e1239d4b28 100644
--- a/spec/frontend/merge_requests/list/components/merge_requests_list_app_spec.js
+++ b/spec/frontend/merge_requests/list/components/merge_requests_list_app_spec.js
@@ -10,6 +10,7 @@ import { convertToGraphQLId } from '~/graphql_shared/utils';
import {
TOKEN_TYPE_AUTHOR,
TOKEN_TYPE_DRAFT,
+ TOKEN_TYPE_SOURCE_BRANCH,
TOKEN_TYPE_TARGET_BRANCH,
} from '~/vue_shared/components/filtered_search_bar/constants';
import { mergeRequestListTabs } from '~/vue_shared/issuable/list/constants';
@@ -109,13 +110,14 @@ describe('Merge requests list app', () => {
{ type: TOKEN_TYPE_AUTHOR, preloadedUsers: [] },
{ type: TOKEN_TYPE_DRAFT },
{ type: TOKEN_TYPE_TARGET_BRANCH },
+ { type: TOKEN_TYPE_SOURCE_BRANCH },
]);
});
});
describe('when all tokens are available', () => {
beforeEach(async () => {
- setWindowLocation('?draft=yes&target_branches[]="branch-a"');
+ setWindowLocation('?draft=yes&target_branches[]=branch-a&source_branches[]=branch-b');
window.gon = {
current_user_id: mockCurrentUser.id,
current_user_fullname: mockCurrentUser.name,
@@ -142,6 +144,7 @@ describe('Merge requests list app', () => {
{ type: TOKEN_TYPE_AUTHOR, preloadedUsers },
{ type: TOKEN_TYPE_DRAFT },
{ type: TOKEN_TYPE_TARGET_BRANCH },
+ { type: TOKEN_TYPE_SOURCE_BRANCH },
]);
});
@@ -149,6 +152,7 @@ describe('Merge requests list app', () => {
expect(findIssuableList().props('initialFilterValue')).toMatchObject([
{ type: TOKEN_TYPE_DRAFT },
{ type: TOKEN_TYPE_TARGET_BRANCH },
+ { type: TOKEN_TYPE_SOURCE_BRANCH },
]);
});
});
diff --git a/spec/graphql/types/query_type_spec.rb b/spec/graphql/types/query_type_spec.rb
index 0b5739be9a1..ec4a1aa15f7 100644
--- a/spec/graphql/types/query_type_spec.rb
+++ b/spec/graphql/types/query_type_spec.rb
@@ -155,4 +155,14 @@ RSpec.describe GitlabSchema.types['Query'], feature_category: :shared do
is_expected.to have_graphql_resolver(Resolvers::Ml::ModelDetailResolver)
end
end
+
+ describe 'integration_exclusions field' do
+ subject { described_class.fields['integrationExclusions'] }
+
+ it 'returns metadata', :aggregate_failures do
+ is_expected.to have_graphql_arguments(:integrationName)
+ is_expected.to have_graphql_type(Types::Integrations::ExclusionType.connection_type)
+ is_expected.to have_graphql_resolver(Resolvers::Integrations::ExclusionsResolver)
+ end
+ end
end
diff --git a/spec/initializers/net_http_patch_spec.rb b/spec/initializers/net_http_patch_spec.rb
index 959eae954c4..246d9f1efb3 100644
--- a/spec/initializers/net_http_patch_spec.rb
+++ b/spec/initializers/net_http_patch_spec.rb
@@ -24,7 +24,7 @@ RSpec.describe 'Net::HTTP patch proxy user and password encoding', feature_categ
before do
allow(ENV).to receive(:[]).and_call_original
- allow(ENV).to receive(:[]).with('http_proxy').and_return(http_proxy)
+ stub_env('http_proxy', http_proxy)
end
it { is_expected.to eq(nil) }
@@ -64,7 +64,7 @@ RSpec.describe 'Net::HTTP patch proxy user and password encoding', feature_categ
before do
allow(ENV).to receive(:[]).and_call_original
- allow(ENV).to receive(:[]).with('http_proxy').and_return(http_proxy)
+ stub_env('http_proxy', http_proxy)
end
it { is_expected.to eq(nil) }
diff --git a/spec/lib/bulk_imports/ndjson_pipeline_spec.rb b/spec/lib/bulk_imports/ndjson_pipeline_spec.rb
index 55a9292e48d..56ebb885f5e 100644
--- a/spec/lib/bulk_imports/ndjson_pipeline_spec.rb
+++ b/spec/lib/bulk_imports/ndjson_pipeline_spec.rb
@@ -143,7 +143,8 @@ RSpec.describe BulkImports::NdjsonPipeline, feature_category: :importers do
members_mapper: instance_of(BulkImports::UsersMapper),
object_builder: Gitlab::ImportExport::Group::ObjectBuilder,
user: user,
- excluded_keys: nil
+ excluded_keys: nil,
+ import_source: Import::SOURCE_DIRECT_TRANSFER
)
.and_return(relation_object)
expect(relation_object).to receive(:assign_attributes).with(group: group)
diff --git a/spec/lib/gitlab/database/reflection_spec.rb b/spec/lib/gitlab/database/reflection_spec.rb
index aed0537af32..8371cfadf40 100644
--- a/spec/lib/gitlab/database/reflection_spec.rb
+++ b/spec/lib/gitlab/database/reflection_spec.rb
@@ -17,7 +17,7 @@ RSpec.describe Gitlab::Database::Reflection, feature_category: :database do
context 'when a username is not set' do
it 'returns the value of the USER environment variable' do
allow(database).to receive(:config).and_return(username: nil)
- allow(ENV).to receive(:[]).with('USER').and_return('bob')
+ stub_env('USER', 'bob')
expect(database.username).to eq('bob')
end
diff --git a/spec/lib/gitlab/import_export/all_models.yml b/spec/lib/gitlab/import_export/all_models.yml
index e34b3a88abe..c59d9f0a7e8 100644
--- a/spec/lib/gitlab/import_export/all_models.yml
+++ b/spec/lib/gitlab/import_export/all_models.yml
@@ -349,6 +349,7 @@ ci_pipelines:
- package_file_build_infos
- build_trace_chunks
- pipeline_metadata
+- build_execution_configs
pipeline_metadata:
- project
- pipeline
@@ -382,6 +383,7 @@ builds:
- needs
- resource
- pipeline
+- execution_config
- sourced_pipeline
- resource_group
- metadata
@@ -659,6 +661,7 @@ project:
- import_data
- commit_statuses
- ci_pipelines
+- build_execution_configs
- all_pipelines
- stages
- ci_refs
diff --git a/spec/lib/gitlab/import_export/base/relation_factory_spec.rb b/spec/lib/gitlab/import_export/base/relation_factory_spec.rb
index 5e63804c51c..86238e8d6e3 100644
--- a/spec/lib/gitlab/import_export/base/relation_factory_spec.rb
+++ b/spec/lib/gitlab/import_export/base/relation_factory_spec.rb
@@ -2,13 +2,14 @@
require 'spec_helper'
-RSpec.describe Gitlab::ImportExport::Base::RelationFactory do
+RSpec.describe Gitlab::ImportExport::Base::RelationFactory, feature_category: :importers do
let(:user) { create(:admin) }
let(:project) { create(:project) }
let(:members_mapper) { double('members_mapper').as_null_object }
let(:relation_sym) { :project_snippets }
let(:relation_hash) { {} }
let(:excluded_keys) { [] }
+ let(:import_source) { nil }
subject do
described_class.create( # rubocop:disable Rails/SaveBang
@@ -19,7 +20,8 @@ RSpec.describe Gitlab::ImportExport::Base::RelationFactory do
members_mapper: members_mapper,
user: user,
importable: project,
- excluded_keys: excluded_keys
+ excluded_keys: excluded_keys,
+ import_source: import_source
)
end
@@ -90,6 +92,24 @@ RSpec.describe Gitlab::ImportExport::Base::RelationFactory do
expect(subject).to be_instance_of(Note)
end
+ context 'when import_source is given' do
+ let(:import_source) { Import::SOURCE_DIRECT_TRANSFER }
+
+ it 'sets the imported_from' do
+ expect(subject.imported_from).to eq(import_source.to_s)
+ end
+
+ context 'when object does not have an imported_from attribute' do
+ let(:relation_sym) { :user }
+ let(:relation_hash) { attributes_for(:user) }
+
+ it 'works without an error' do
+ expect(subject).not_to respond_to(:imported_from) # Sanity check: This must be true for test subject
+ expect(subject).to be_instance_of(User)
+ end
+ end
+ end
+
context 'when relation contains user references' do
let(:new_user) { create(:user) }
let(:exported_member) do
diff --git a/spec/mailers/devise_mailer_spec.rb b/spec/mailers/devise_mailer_spec.rb
index 8bb60daaf57..65bcd08dade 100644
--- a/spec/mailers/devise_mailer_spec.rb
+++ b/spec/mailers/devise_mailer_spec.rb
@@ -54,6 +54,39 @@ RSpec.describe DeviseMailer, feature_category: :user_management do
expect(subject.body.encoded).to have_text user.email
end
end
+
+ context 'for secondary email' do
+ let(:secondary_email) { create(:email) }
+
+ subject { described_class.confirmation_instructions(secondary_email, 'faketoken', opts) }
+
+ it_behaves_like 'it validates recipients'
+
+ it 'has the correct subject and body', :aggregate_failures do
+ is_expected.to have_subject I18n.t('devise.mailer.confirmation_instructions.subject')
+
+ is_expected.to have_text_part_content(
+ format(_("%{name}, confirm your email address now!"), name: secondary_email.user.name)
+ )
+ is_expected.to have_html_part_content(
+ format(_("%{name}, confirm your email address now!"), name: secondary_email.user.name)
+ )
+
+ is_expected.to have_text_part_content(
+ secondary_email.email
+ )
+ is_expected.to have_html_part_content(
+ secondary_email.email
+ )
+
+ is_expected.to have_text_part_content(
+ format(_('Confirm this email address within %{cut_off_days} days, otherwise the email address is removed.'), cut_off_days: ApplicationSetting::USERS_UNCONFIRMED_SECONDARY_EMAILS_DELETE_AFTER_DAYS)
+ )
+ is_expected.to have_html_part_content(
+ format(_('Confirm this email address within %{cut_off_days} days, otherwise the email address is removed.'), cut_off_days: ApplicationSetting::USERS_UNCONFIRMED_SECONDARY_EMAILS_DELETE_AFTER_DAYS)
+ )
+ end
+ end
end
describe '#password_change_by_admin' do
diff --git a/spec/models/application_setting_spec.rb b/spec/models/application_setting_spec.rb
index 0582c3823b0..f2e352b3c2d 100644
--- a/spec/models/application_setting_spec.rb
+++ b/spec/models/application_setting_spec.rb
@@ -38,6 +38,12 @@ RSpec.describe ApplicationSetting, feature_category: :shared, type: :model do
it { expect(setting.silent_admin_exports_enabled).to eq(false) }
end
+ describe 'USERS_UNCONFIRMED_SECONDARY_EMAILS_DELETE_AFTER_DAYS' do
+ subject { described_class::USERS_UNCONFIRMED_SECONDARY_EMAILS_DELETE_AFTER_DAYS }
+
+ it { is_expected.to eq(3) }
+ end
+
describe 'validations' do
let(:http) { 'http://example.com' }
let(:https) { 'https://example.com' }
diff --git a/spec/models/ci/build_execution_config_spec.rb b/spec/models/ci/build_execution_config_spec.rb
new file mode 100644
index 00000000000..4604a14bb68
--- /dev/null
+++ b/spec/models/ci/build_execution_config_spec.rb
@@ -0,0 +1,51 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe Ci::BuildExecutionConfig, type: :model, feature_category: :pipeline_composition do
+ let_it_be(:execution_config) { create(:ci_builds_execution_configs) }
+
+ it { is_expected.to belong_to(:pipeline).class_name('Ci::Pipeline').inverse_of(:build_execution_configs) }
+ it { is_expected.to belong_to(:project) }
+ it { is_expected.to have_many(:builds).class_name('Ci::Build').inverse_of(:execution_config) }
+
+ describe 'validations' do
+ it { is_expected.to validate_presence_of(:run_steps) }
+ end
+
+ describe 'run_steps' do
+ it { is_expected.not_to allow_value("string").for(:run_steps) }
+ it { is_expected.not_to allow_value(1.0).for(:run_steps) }
+
+ it { is_expected.not_to allow_value(nil).for(:run_steps) }
+
+ it do
+ is_expected.to allow_value(
+ [
+ {
+ 'name' => 'step1',
+ 'step' => 'echo',
+ 'inputs' => { 'message' => 'Hello, World!' }
+ }
+ ]
+ ).for(:run_steps)
+ end
+ end
+
+ describe 'partitioning', :ci_partitionable do
+ include Ci::PartitioningHelpers
+
+ let(:pipeline) { create(:ci_pipeline) }
+ let(:execution_config) { FactoryBot.build(:ci_builds_execution_configs, pipeline: pipeline) }
+
+ before do
+ stub_current_partition_id
+ end
+
+ it 'assigns partition id to execution config' do
+ execution_config.save!
+
+ expect(execution_config.partition_id).to eq(ci_testing_partition_id)
+ end
+ end
+end
diff --git a/spec/models/ci/build_spec.rb b/spec/models/ci/build_spec.rb
index ec676a503c6..01de572c829 100644
--- a/spec/models/ci/build_spec.rb
+++ b/spec/models/ci/build_spec.rb
@@ -33,6 +33,7 @@ RSpec.describe Ci::Build, feature_category: :continuous_integration, factory_def
it { is_expected.to belong_to(:trigger_request) }
it { is_expected.to belong_to(:erased_by) }
it { is_expected.to belong_to(:pipeline).inverse_of(:builds) }
+ it { is_expected.to belong_to(:execution_config).class_name('Ci::BuildExecutionConfig').inverse_of(:builds) }
it { is_expected.to have_many(:needs).with_foreign_key(:build_id) }
diff --git a/spec/models/ci/pipeline_spec.rb b/spec/models/ci/pipeline_spec.rb
index f532477f7e5..c61ed4990bb 100644
--- a/spec/models/ci/pipeline_spec.rb
+++ b/spec/models/ci/pipeline_spec.rb
@@ -30,6 +30,7 @@ RSpec.describe Ci::Pipeline, :mailer, factory_default: :keep, feature_category:
it { is_expected.to have_many(:trigger_requests).with_foreign_key(:commit_id).inverse_of(:pipeline) }
it { is_expected.to have_many(:variables) }
it { is_expected.to have_many(:builds) }
+ it { is_expected.to have_many(:build_execution_configs).class_name('Ci::BuildExecutionConfig').inverse_of(:pipeline) }
it do
is_expected.to have_many(:statuses_order_id_desc)
diff --git a/spec/models/ci/processable_spec.rb b/spec/models/ci/processable_spec.rb
index 3b4e6898d91..590fc0a184f 100644
--- a/spec/models/ci/processable_spec.rb
+++ b/spec/models/ci/processable_spec.rb
@@ -98,7 +98,7 @@ RSpec.describe Ci::Processable, feature_category: :continuous_integration do
pipeline_id report_results pending_state pages_deployments
queuing_entry runtime_metadata trace_metadata
dast_site_profile dast_scanner_profile stage_id dast_site_profiles_build
- dast_scanner_profiles_build auto_canceled_by_partition_id].freeze
+ dast_scanner_profiles_build auto_canceled_by_partition_id execution_config_id execution_config].freeze
end
before_all do
diff --git a/spec/models/concerns/ci/partitionable_spec.rb b/spec/models/concerns/ci/partitionable_spec.rb
index 72a4e219a48..cadde88b712 100644
--- a/spec/models/concerns/ci/partitionable_spec.rb
+++ b/spec/models/concerns/ci/partitionable_spec.rb
@@ -193,6 +193,7 @@ RSpec.describe Ci::Partitionable, feature_category: :continuous_integration do
it 'returns a list of CI models being partitioned' do
expected_list = %w[
Ci::BuildMetadata
+ Ci::BuildExecutionConfig
Ci::BuildName
Ci::JobAnnotation
Ci::JobArtifact
diff --git a/spec/models/email_spec.rb b/spec/models/email_spec.rb
index ecb8f72470d..b73e525a324 100644
--- a/spec/models/email_spec.rb
+++ b/spec/models/email_spec.rb
@@ -42,14 +42,67 @@ RSpec.describe Email do
end
describe 'scopes' do
- let(:user) { create(:user, :unconfirmed) }
+ let_it_be(:unconfirmed_user) { create(:user, :unconfirmed) }
+ let_it_be(:confirmed_user) { create(:user) }
- it 'scopes confirmed emails' do
- create(:email, :confirmed, user: user)
- create(:email, user: user)
+ let_it_be(:unconfirmed_primary_email) { unconfirmed_user.email }
+ let_it_be(:confirmed_primary_email) { described_class.find_by_email(confirmed_user.email) }
- expect(user.emails.count).to eq 2
- expect(user.emails.confirmed.count).to eq 1
+ let_it_be(:unconfirmed_secondary_email) { create(:email, user: confirmed_user) }
+ let_it_be(:confirmed_secondary_email) { create(:email, :confirmed, user: confirmed_user) }
+
+ describe '.confirmed' do
+ it 'returns confirmed emails' do
+ expect(described_class.confirmed).to contain_exactly(
+ # after user's primary email is confirmed it is stored to 'emails' table
+ confirmed_primary_email,
+ confirmed_secondary_email
+ )
+ end
+ end
+
+ describe '.unconfirmed' do
+ it 'returns unconfirmed secondary emails' do
+ expect(described_class.unconfirmed).to contain_exactly(
+ # excludes `unconfirmed_primary_email` because
+ # user's primary email is not stored to 'emails' table till it is confirmed
+ unconfirmed_secondary_email
+ )
+ end
+ end
+
+ describe '.unconfirmed_and_created_before' do
+ let(:created_cut_off) { 3.days.ago }
+
+ let!(:unconfirmed_secondary_email_created_before_cut_off) do
+ create(:email, created_at: created_cut_off - 1.second)
+ end
+
+ let!(:unconfirmed_secondary_email_created_at_cut_off) do
+ create(:email, created_at: created_cut_off)
+ end
+
+ let!(:unconfirmed_secondary_email_created_after_cut_off) do
+ create(:email, created_at: created_cut_off + 1.second)
+ end
+
+ let!(:confirmed_secondary_email_created_before_cut_off) do
+ create(:email, :confirmed, created_at: created_cut_off - 1.second)
+ end
+
+ let!(:confirmed_secondary_email_created_at_cut_off) do
+ create(:email, :confirmed, created_at: created_cut_off)
+ end
+
+ let!(:confirmed_secondary_email_created_after_cut_off) do
+ create(:email, :confirmed, created_at: created_cut_off + 1.second)
+ end
+
+ it 'returns unconfirmed secondary emails created before timestamp passed in' do
+ expect(described_class.unconfirmed_and_created_before(created_cut_off)).to contain_exactly(
+ unconfirmed_secondary_email_created_before_cut_off
+ )
+ end
end
end
diff --git a/spec/models/group_spec.rb b/spec/models/group_spec.rb
index 7371f80de06..788201727bf 100644
--- a/spec/models/group_spec.rb
+++ b/spec/models/group_spec.rb
@@ -500,46 +500,6 @@ RSpec.describe Group, feature_category: :groups_and_projects do
end
end
- describe 'before_save :ensure_runner_registration_token_disabled_on_com' do
- let(:parent_namespace) { nil }
- let!(:namespace) { create(:group, parent: parent_namespace) }
-
- context 'when on self-managed' do
- it 'does not create a settings record' do
- expect(namespace.allow_runner_registration_token?).to eq true
- end
- end
-
- context 'when instance is dedicated' do
- before do
- Gitlab::CurrentSettings.update!(gitlab_dedicated_instance: true)
- end
-
- it 'does not create a settings record' do
- expect(namespace.allow_runner_registration_token?).to eq true
- end
- end
-
- context 'when on SaaS', :saas do
- it 'creates a settings record disallowing runner registration tokens' do
- expect(namespace.allow_runner_registration_token?).to eq false
- end
-
- context 'when namespace is not top-most' do
- let!(:parent_namespace) { create(:group) }
-
- it 'does not create a settings record and uses the default value for column' do
- expect(namespace.allow_runner_registration_token).to eq true
- end
-
- it 'uses the value from the parent namespace' do
- # allow_runner_registration_token? uses the value of the parent namespace and instance, so should return false
- expect(namespace.allow_runner_registration_token?).to eq false
- end
- end
- end
- end
-
context 'when creating a new project' do
let_it_be(:group) { create(:group) }
diff --git a/spec/models/import/source_user_spec.rb b/spec/models/import/source_user_spec.rb
index 43464715203..1aaf71830ad 100644
--- a/spec/models/import/source_user_spec.rb
+++ b/spec/models/import/source_user_spec.rb
@@ -35,6 +35,27 @@ RSpec.describe Import::SourceUser, type: :model, feature_category: :importers do
end
end
+ describe 'after_transition callback' do
+ subject(:source_user) { create(:import_source_user, :awaiting_approval, :with_reassign_to_user) }
+
+ it 'does not unset reassign_to_user on other transitions' do
+ expect { source_user.accept! }
+ .not_to change { source_user.reload.reassign_to_user }
+ end
+
+ it 'unsets reassign_to_user when rejected' do
+ expect { source_user.reject! }
+ .to change { source_user.reload.reassign_to_user }
+ .from(an_instance_of(User)).to(nil)
+ end
+
+ it 'unsets reassign_to_user when assignment is cancelled' do
+ expect { source_user.cancel_assignment! }
+ .to change { source_user.reload.reassign_to_user }
+ .from(an_instance_of(User)).to(nil)
+ end
+ end
+
describe '.find_source_user' do
let_it_be(:namespace_1) { create(:namespace) }
let_it_be(:namespace_2) { create(:namespace) }
diff --git a/spec/models/integrations/jira_spec.rb b/spec/models/integrations/jira_spec.rb
index 500f8a0369a..40de1709b1a 100644
--- a/spec/models/integrations/jira_spec.rb
+++ b/spec/models/integrations/jira_spec.rb
@@ -257,21 +257,6 @@ RSpec.describe Integrations::Jira, feature_category: :integrations do
it 'includes SECTION_TYPE_JIRA_ISSUE_CREATION' do
expect(sections).to include(described_class::SECTION_TYPE_JIRA_ISSUE_CREATION)
end
-
- context 'when jira_multiple_project_keys feature is disabled' do
- before do
- stub_feature_flags(jira_multiple_project_keys: false)
- end
-
- it 'does not include SECTION_TYPE_JIRA_ISSUE_CREATION' do
- expect(sections).not_to include(described_class::SECTION_TYPE_JIRA_ISSUE_CREATION)
- end
-
- it 'section SECTION_TYPE_JIRA_ISSUES title is "Issues"' do
- jira_issues_section = integration.sections.find { |s| s[:type] == described_class::SECTION_TYPE_JIRA_ISSUES }
- expect(jira_issues_section[:title]).to eq('Issues')
- end
- end
end
context 'when instance_level? is true' do
@@ -446,16 +431,6 @@ RSpec.describe Integrations::Jira, feature_category: :integrations do
expect(integration.jira_tracker_data.project_keys).to eq(project_keys)
end
- context 'when the jira_multiple_project_keys feature is disabled' do
- before do
- stub_feature_flags(jira_multiple_project_keys: false)
- end
-
- it 'copies project_key into project_keys' do
- expect(integration.jira_tracker_data.project_keys).to eq([project_key])
- end
- end
-
context 'when loading serverInfo' do
context 'with a Cloud instance' do
let(:server_info_results) { { 'deploymentType' => 'Cloud' } }
@@ -763,22 +738,6 @@ RSpec.describe Integrations::Jira, feature_category: :integrations do
expect(WebMock).to have_requested(:get, issue_url)
end
end
-
- context 'when jira_multiple_project_keys feature is disabled' do
- before do
- stub_feature_flags(jira_multiple_project_keys: false)
- end
-
- context 'when project_key matches issue_key' do
- let(:project_key) { 'JIRA' }
-
- it 'calls the Jira API to get the issue' do
- find_issue
-
- expect(WebMock).to have_requested(:get, issue_url)
- end
- end
- end
end
end
diff --git a/spec/models/work_items/parent_link_spec.rb b/spec/models/work_items/parent_link_spec.rb
index 301a019dbeb..17a8ab370f4 100644
--- a/spec/models/work_items/parent_link_spec.rb
+++ b/spec/models/work_items/parent_link_spec.rb
@@ -151,6 +151,21 @@ RSpec.describe WorkItems::ParentLink, feature_category: :portfolio_management do
it 'existing link is still valid' do
expect(link1).to be_valid
end
+
+ context 'when parent already exceeds maximum number of links' do
+ let_it_be(:task3) { create(:work_item, :task, project: project) }
+ let_it_be(:link2) { create(:parent_link, work_item_parent: issue, work_item: task2) }
+
+ it 'only invalidates new links' do
+ link3 = build(:parent_link, work_item_parent: issue, work_item: task3)
+
+ expect(link3).not_to be_valid
+ expect(link3.errors[:work_item_parent]).to include('parent already has maximum number of children.')
+
+ expect(link1).to be_valid
+ expect(link2).to be_valid
+ end
+ end
end
context 'when setting confidentiality' do
diff --git a/spec/requests/api/graphql/integrations/exclusions_spec.rb b/spec/requests/api/graphql/integrations/exclusions_spec.rb
new file mode 100644
index 00000000000..b99873bfea9
--- /dev/null
+++ b/spec/requests/api/graphql/integrations/exclusions_spec.rb
@@ -0,0 +1,69 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe 'Querying for integration exclusions', feature_category: :integrations do
+ include GraphqlHelpers
+ let_it_be(:project) { create(:project) }
+ let_it_be(:project2) { create(:project) }
+ let_it_be(:admin_user) { create(:admin) }
+ let_it_be(:user) { create(:user) }
+ let(:current_user) { admin_user }
+ let(:query) { graphql_query_for('integrationExclusions', args, fields) }
+ let(:args) { { 'integrationName' => :BEYOND_IDENTITY } }
+ let(:fields) do
+ <<~GRAPHQL
+ nodes {
+ project {
+ id
+ }
+ }
+ GRAPHQL
+ end
+
+ context 'when the user is authorized' do
+ let!(:instance_integration) { create(:beyond_identity_integration) }
+ let!(:integration_exclusion) do
+ create(:beyond_identity_integration, active: false, instance: false, project: project2, inherit_from_id: nil)
+ end
+
+ let!(:propagated_integration) do
+ create(:beyond_identity_integration, active: false, instance: false, project: project,
+ inherit_from_id: instance_integration.id)
+ end
+
+ before do
+ post_graphql(query, current_user: current_user)
+ end
+
+ it_behaves_like 'a working graphql query that returns data'
+
+ it 'returns projects that are custom exclusions' do
+ nodes = graphql_data['integrationExclusions']['nodes']
+ expect(nodes.size).to eq(1)
+ expect(nodes).to include(a_hash_including('project' => { 'id' => project2.to_global_id.to_s }))
+ end
+ end
+
+ context 'when the user is not authorized' do
+ let(:current_user) { user }
+
+ it 'responds with an error' do
+ post_graphql(query, current_user: current_user)
+ expect(graphql_errors.first['message']).to eq(
+ Gitlab::Graphql::Authorize::AuthorizeResource::RESOURCE_ACCESS_ERROR
+ )
+ end
+ end
+
+ context 'when the user is not authenticated' do
+ let(:current_user) { nil }
+
+ it 'responds with an error' do
+ post_graphql(query, current_user: current_user)
+ expect(graphql_errors.first['message']).to eq(
+ Gitlab::Graphql::Authorize::AuthorizeResource::RESOURCE_ACCESS_ERROR
+ )
+ end
+ end
+end
diff --git a/spec/requests/api/graphql/mutations/integrations/exclusions/create_spec.rb b/spec/requests/api/graphql/mutations/integrations/exclusions/create_spec.rb
new file mode 100644
index 00000000000..5d3e19c100d
--- /dev/null
+++ b/spec/requests/api/graphql/mutations/integrations/exclusions/create_spec.rb
@@ -0,0 +1,60 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe Mutations::Integrations::Exclusions::Create, feature_category: :integrations do
+ include GraphqlHelpers
+
+ let_it_be(:project) { create(:project) }
+ let_it_be(:project2) { create(:project) }
+ let_it_be(:admin_user) { create(:admin) }
+ let_it_be(:user) { create(:user) }
+ let(:current_user) { admin_user }
+ let(:mutation) { graphql_mutation(:integration_exclusion_create, args) }
+ let(:args) do
+ {
+ 'integrationName' => 'BEYOND_IDENTITY',
+ 'projectIds' => project_ids
+ }
+ end
+
+ let(:project_ids) { [project.to_global_id.to_s] }
+
+ subject(:resolve_mutation) { post_graphql_mutation(mutation, current_user: current_user) }
+
+ context 'when the user is not authorized' do
+ let(:current_user) { user }
+
+ it 'responds with an error' do
+ resolve_mutation
+ expect(graphql_errors.first['message']).to eq(
+ Gitlab::Graphql::Authorize::AuthorizeResource::RESOURCE_ACCESS_ERROR
+ )
+ end
+ end
+
+ context 'when the user is authorized' do
+ let(:current_user) { admin_user }
+
+ it 'creates inactive integrations for the projects' do
+ expect { resolve_mutation }.to change { Integration.count }.from(0).to(1)
+ end
+
+ context 'when integrations exist for the projects' do
+ let!(:instance_exclusion) { create(:beyond_identity_integration) }
+ let!(:existing_exclusion) do
+ create(:beyond_identity_integration, project: project2, active: false, inherit_from_id: instance_exclusion.id,
+ instance: false)
+ end
+
+ let(:project_ids) { [project, project2].map { |p| p.to_global_id.to_s } }
+
+ it 'updates existing integrations and creates integrations for projects' do
+ expect { resolve_mutation }.to change { Integration.count }.from(2).to(3)
+ existing_exclusion.reload
+ expect(existing_exclusion).not_to be_active
+ expect(existing_exclusion.inherit_from_id).to be_nil
+ end
+ end
+ end
+end
diff --git a/spec/requests/api/graphql/mutations/integrations/exclusions/delete_spec.rb b/spec/requests/api/graphql/mutations/integrations/exclusions/delete_spec.rb
new file mode 100644
index 00000000000..2e4dce2e4d0
--- /dev/null
+++ b/spec/requests/api/graphql/mutations/integrations/exclusions/delete_spec.rb
@@ -0,0 +1,61 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe Mutations::Integrations::Exclusions::Delete, feature_category: :integrations do
+ include GraphqlHelpers
+
+ let_it_be(:project) { create(:project) }
+ let_it_be(:admin_user) { create(:admin) }
+ let_it_be(:user) { create(:user) }
+ let(:current_user) { admin_user }
+ let(:mutation) { graphql_mutation(:integration_exclusion_delete, args) }
+ let(:args) do
+ {
+ 'integrationName' => 'BEYOND_IDENTITY',
+ 'projectIds' => project_ids
+ }
+ end
+
+ let(:project_ids) { [project.to_global_id.to_s] }
+
+ subject(:resolve_mutation) { post_graphql_mutation(mutation, current_user: current_user) }
+
+ context 'when the user is not authorized' do
+ let(:current_user) { user }
+
+ it 'responds with an error' do
+ resolve_mutation
+ expect(graphql_errors.first['message']).to eq(
+ Gitlab::Graphql::Authorize::AuthorizeResource::RESOURCE_ACCESS_ERROR
+ )
+ end
+ end
+
+ context 'when the user is authorized' do
+ let(:current_user) { admin_user }
+
+ it 'returns an empty array' do
+ resolve_mutation
+ expect(graphql_data['integrationExclusionDelete']['exclusions']).to eq([])
+ end
+
+ context 'and there are integrations' do
+ let!(:instance_integration) { create(:beyond_identity_integration) }
+ let!(:existing_exclusion) do
+ create(:beyond_identity_integration, project: project, active: false, inherit_from_id: nil,
+ instance: false)
+ end
+
+ it 'enables the integration for the specified project' do
+ resolve_mutation
+
+ existing_exclusion.reload
+ expect(existing_exclusion).to be_activated
+ expect(existing_exclusion.inherit_from_id).to eq(instance_integration.id)
+ exclusion_response = graphql_data['integrationExclusionDelete']['exclusions'][0]
+ expect(exclusion_response['project']['id']).to eq(project.to_global_id.to_s)
+ end
+ end
+ end
+end
diff --git a/spec/requests/import/source_users_controller_spec.rb b/spec/requests/import/source_users_controller_spec.rb
new file mode 100644
index 00000000000..63b3634e022
--- /dev/null
+++ b/spec/requests/import/source_users_controller_spec.rb
@@ -0,0 +1,104 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe Import::SourceUsersController, feature_category: :importers do
+ shared_examples 'it requires feature flag' do
+ context 'when :improved_user_mapping is disabled' do
+ it 'returns 404' do
+ stub_feature_flags(bulk_import_user_mapping: false)
+
+ subject
+
+ expect(response).to have_gitlab_http_status(:not_found)
+ end
+ end
+ end
+
+ shared_examples 'it requires the user to be signed in' do
+ context 'when the user is not signed in' do
+ it 'redirects to the login screen' do
+ subject
+
+ expect(response).to redirect_to(new_user_session_path)
+ end
+ end
+ end
+
+ let_it_be_with_reload(:source_user) { create(:import_source_user, :with_reassign_to_user, :awaiting_approval) }
+
+ describe 'POST /accept' do
+ let(:path) { accept_import_source_user_path(source_user) }
+
+ subject(:accept_invite) { post path }
+
+ context 'when signed in' do
+ before do
+ sign_in(source_user.reassign_to_user)
+ end
+
+ it { expect { accept_invite }.to change { source_user.reload.completed? }.from(false).to(true) }
+
+ it 'redirects with a notice when accepted' do
+ accept_invite
+
+ expect(response).to redirect_to(root_path)
+ expect(flash[:notice]).to match(/You have approved the reassignment/)
+ end
+
+ it 'can only be accepted by the reassign_to_user' do
+ source_user.update!(reassign_to_user: create(:user))
+
+ expect { accept_invite }.not_to change { source_user.reload.status }
+
+ expect(response).to have_gitlab_http_status(:not_found)
+ end
+
+ it 'cannot be accepted twice' do
+ source_user.accept!
+
+ accept_invite
+
+ expect(response).to redirect_to(root_path)
+ expect(flash[:alert]).to match(/could not be accepted/)
+ end
+ end
+
+ it_behaves_like 'it requires feature flag'
+ it_behaves_like 'it requires the user to be signed in'
+ end
+
+ describe 'POST /decline' do
+ let(:path) { decline_import_source_user_path(source_user) }
+
+ subject(:reject_invite) { post path }
+
+ context 'when signed in' do
+ before do
+ sign_in(source_user.reassign_to_user)
+ end
+
+ it { expect { reject_invite }.to change { source_user.reload.rejected? }.from(false).to(true) }
+ it { expect { reject_invite }.to change { source_user.reload.reassign_to_user }.from(instance_of(User)).to(nil) }
+
+ it 'redirects with a notice' do
+ reject_invite
+
+ expect(response).to redirect_to(root_path)
+ expect(flash[:notice]).to match(/You have rejected the reassignment/)
+ end
+
+ it 'cannot be declined after being accepted' do
+ source_user.accept!
+
+ reject_invite
+
+ expect(response).to redirect_to(root_path)
+ expect(flash[:alert]).to match(/could not be declined/)
+ end
+ end
+
+ it_behaves_like 'it requires feature flag'
+ it_behaves_like 'it requires the user to be signed in'
+ end
+end
diff --git a/spec/services/groups/create_service_spec.rb b/spec/services/groups/create_service_spec.rb
index ac829264778..d105a3308d3 100644
--- a/spec/services/groups/create_service_spec.rb
+++ b/spec/services/groups/create_service_spec.rb
@@ -128,6 +128,24 @@ RSpec.describe Groups::CreateService, '#execute', feature_category: :groups_and_
context 'with before_commit callback' do
it_behaves_like 'has sync-ed traversal_ids'
end
+
+ describe 'handling of allow_runner_registration_token default' do
+ context 'when on self-managed' do
+ it 'does not disallow runner registration token' do
+ expect(created_group.allow_runner_registration_token?).to eq true
+ end
+ end
+
+ context 'when instance is dedicated' do
+ before do
+ Gitlab::CurrentSettings.update!(gitlab_dedicated_instance: true)
+ end
+
+ it 'does not disallow runner registration token' do
+ expect(created_group.allow_runner_registration_token?).to eq true
+ end
+ end
+ end
end
context 'when user can not create a group' do
diff --git a/spec/support/shared_contexts/graphql/types/query_type_shared_context.rb b/spec/support/shared_contexts/graphql/types/query_type_shared_context.rb
index 391336526e3..cea5ce74f07 100644
--- a/spec/support/shared_contexts/graphql/types/query_type_shared_context.rb
+++ b/spec/support/shared_contexts/graphql/types/query_type_shared_context.rb
@@ -18,6 +18,7 @@ RSpec.shared_context 'with FOSS query type fields' do
:gitpod_enabled,
:group,
:groups,
+ :integration_exclusions,
:issue,
:issues,
:jobs,
diff --git a/spec/workers/users/unconfirmed_secondary_emails_deletion_cron_worker_spec.rb b/spec/workers/users/unconfirmed_secondary_emails_deletion_cron_worker_spec.rb
new file mode 100644
index 00000000000..cd6ede8ce2e
--- /dev/null
+++ b/spec/workers/users/unconfirmed_secondary_emails_deletion_cron_worker_spec.rb
@@ -0,0 +1,84 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe Users::UnconfirmedSecondaryEmailsDeletionCronWorker, feature_category: :user_management do
+ subject(:worker) { described_class.new }
+
+ it_behaves_like 'an idempotent worker'
+
+ describe '#perform' do
+ it 'deletes unconfirmed secondary emails created before the cutoff', :aggregate_failures, :freeze_time do
+ cut_off = ApplicationSetting::USERS_UNCONFIRMED_SECONDARY_EMAILS_DELETE_AFTER_DAYS.days.ago
+
+ unconfirmed_secondary_email_created_before_cut_off_1 = create(
+ :email,
+ created_at: cut_off - 1.second
+ )
+
+ unconfirmed_secondary_email_created_before_cut_off_2 = create(
+ :email,
+ created_at: cut_off - 1.day
+ )
+
+ unconfirmed_secondary_email_created_at_cut_off = create(
+ :email,
+ created_at: cut_off
+ )
+
+ unconfirmed_secondary_email_created_after_cut_off_1 = create(
+ :email,
+ created_at: cut_off + 1.second
+ )
+
+ unconfirmed_secondary_email_created_after_cut_off_2 = create(
+ :email,
+ created_at: cut_off + 1.day
+ )
+
+ confirmed_secondary_email_created_before_cut_off_1 = create(
+ :email,
+ :confirmed,
+ created_at: cut_off - 1.second
+ )
+
+ confirmed_secondary_email_created_before_cut_off_2 = create(
+ :email,
+ :confirmed,
+ created_at: cut_off - 1.day
+ )
+
+ confirmed_secondary_email_created_at_cut_off = create(
+ :email,
+ :confirmed,
+ created_at: cut_off
+ )
+
+ confirmed_secondary_email_created_after_cut_off_1 = create(
+ :email,
+ :confirmed,
+ created_at: cut_off + 1.second
+ )
+
+ confirmed_secondary_email_created_after_cut_off_2 = create(
+ :email,
+ :confirmed,
+ created_at: cut_off + 1.day
+ )
+
+ expect { worker.perform }.to change { Email.count }.by(-2)
+
+ expect(Email.exists?(unconfirmed_secondary_email_created_before_cut_off_1.id)).to eq(false)
+ expect(Email.exists?(unconfirmed_secondary_email_created_before_cut_off_2.id)).to eq(false)
+ expect(Email.exists?(unconfirmed_secondary_email_created_at_cut_off.id)).to eq(true)
+ expect(Email.exists?(unconfirmed_secondary_email_created_after_cut_off_1.id)).to eq(true)
+ expect(Email.exists?(unconfirmed_secondary_email_created_after_cut_off_2.id)).to eq(true)
+
+ expect(Email.exists?(confirmed_secondary_email_created_before_cut_off_1.id)).to eq(true)
+ expect(Email.exists?(confirmed_secondary_email_created_before_cut_off_2.id)).to eq(true)
+ expect(Email.exists?(confirmed_secondary_email_created_at_cut_off.id)).to eq(true)
+ expect(Email.exists?(confirmed_secondary_email_created_after_cut_off_1.id)).to eq(true)
+ expect(Email.exists?(confirmed_secondary_email_created_after_cut_off_2.id)).to eq(true)
+ end
+ end
+end
diff --git a/tooling/danger/project_helper.rb b/tooling/danger/project_helper.rb
index 2a2019c96a8..bea637a88aa 100644
--- a/tooling/danger/project_helper.rb
+++ b/tooling/danger/project_helper.rb
@@ -3,7 +3,7 @@
module Tooling
module Danger
module ProjectHelper
- CI_ONLY_RULES ||= %w[
+ CI_ONLY_RULES = %w[
ce_ee_vue_templates
datateam
feature_flag