{
});
});
+ describe('Merge button when merge request has been retargeted', () => {
+ beforeEach(() => {
+ createComponent({
+ mr: { retargeted: true },
+ });
+ });
+
+ it('should display confirmation modal when merge button is clicked', async () => {
+ expect(findPipelineFailedConfirmModal().props()).toEqual({ visible: false });
+
+ await findMergeButton().vm.$emit('click');
+
+ expect(findPipelineFailedConfirmModal().props()).toEqual({ visible: true });
+ });
+ });
+
describe('updating graphql data triggers commit message update when default changed', () => {
const UPDATED_MERGE_COMMIT_MESSAGE = 'New merge message from BE';
const UPDATED_SQUASH_COMMIT_MESSAGE = 'New squash message from BE';
diff --git a/spec/frontend/vue_shared/components/badges/__snapshots__/beta_badge_spec.js.snap b/spec/frontend/vue_shared/components/badges/__snapshots__/beta_badge_spec.js.snap
index c601d5dac92..76208bea345 100644
--- a/spec/frontend/vue_shared/components/badges/__snapshots__/beta_badge_spec.js.snap
+++ b/spec/frontend/vue_shared/components/badges/__snapshots__/beta_badge_spec.js.snap
@@ -7,7 +7,11 @@ exports[`Beta badge component renders the badge 1`] = `
href="#"
target="_self"
>
- Beta
+
- Experiment
+
+ Experiment
+
{
});
describe('namespace dropdown rendering', () => {
- beforeEach(() => createComponent({ ...USERS_MOCK_PROPS, isProjectOnlyNamespace: true }));
+ beforeEach(() => createComponent({ ...USERS_MOCK_PROPS, disableNamespaceDropdown: true }));
- it('does not render namespace dropdown with isProjectOnlyNamespace prop', () => {
+ it('does not render namespace dropdown with disableNamespaceDropdown prop', () => {
expect(findNamespaceDropdown().exists()).toBe(false);
});
});
@@ -183,6 +183,15 @@ describe('List Selector spec', () => {
expect(findNamespaceDropdown().props('items').length).toBe(2);
});
+ it('does not render namespace dropdown with disableNamespaceDropdown prop set to true', () => {
+ createComponent({
+ ...GROUPS_MOCK_PROPS,
+ disableNamespaceDropdown: true,
+ });
+
+ expect(findNamespaceDropdown().exists()).toBe(false);
+ });
+
describe('searching', () => {
const searchResponse = GROUPS_RESPONSE_MOCK.data.groups.nodes.map((group) => ({
...group,
@@ -229,6 +238,7 @@ describe('List Selector spec', () => {
name: 'Flightjs',
text: 'Flightjs',
value: 'Flightjs',
+ type: 'group',
},
],
]);
diff --git a/spec/lib/gitlab/bitbucket_import/importers/issue_importer_spec.rb b/spec/lib/gitlab/bitbucket_import/importers/issue_importer_spec.rb
index 74baa70052d..2a760ec6ce0 100644
--- a/spec/lib/gitlab/bitbucket_import/importers/issue_importer_spec.rb
+++ b/spec/lib/gitlab/bitbucket_import/importers/issue_importer_spec.rb
@@ -49,6 +49,7 @@ RSpec.describe Gitlab::BitbucketImport::Importers::IssueImporter, :clean_gitlab_
expect(issue.labels).to eq([label])
expect(issue.created_at).to eq(Date.today)
expect(issue.updated_at).to eq(Date.today)
+ expect(issue.imported_from).to eq('bitbucket')
end
it 'converts mentions in the description' do
diff --git a/spec/lib/gitlab/bitbucket_import/importers/issue_notes_importer_spec.rb b/spec/lib/gitlab/bitbucket_import/importers/issue_notes_importer_spec.rb
index b48a2862624..a72b56c92c6 100644
--- a/spec/lib/gitlab/bitbucket_import/importers/issue_notes_importer_spec.rb
+++ b/spec/lib/gitlab/bitbucket_import/importers/issue_notes_importer_spec.rb
@@ -49,6 +49,7 @@ RSpec.describe Gitlab::BitbucketImport::Importers::IssueNotesImporter, :clean_gi
expect(note.author).to eq(bitbucket_user)
expect(note.created_at).to eq(Date.today)
expect(note.updated_at).to eq(Date.today)
+ expect(note.imported_from).to eq('bitbucket')
end
it 'converts mentions in the note' do
diff --git a/spec/lib/gitlab/bitbucket_import/importers/pull_request_importer_spec.rb b/spec/lib/gitlab/bitbucket_import/importers/pull_request_importer_spec.rb
index ca0a310f203..8859b3c1e3d 100644
--- a/spec/lib/gitlab/bitbucket_import/importers/pull_request_importer_spec.rb
+++ b/spec/lib/gitlab/bitbucket_import/importers/pull_request_importer_spec.rb
@@ -70,6 +70,7 @@ RSpec.describe Gitlab::BitbucketImport::Importers::PullRequestImporter, :clean_g
expect(merge_request.merge_request_diffs.first.head_commit_sha).to eq(target_branch_sha)
expect(merge_request.metrics.merged_by_id).to eq(closed_by_user.id)
expect(merge_request.metrics.latest_closed_by_id).to be_nil
+ expect(merge_request.imported_from).to eq('bitbucket')
end
it 'converts mentions in the description' do
diff --git a/spec/lib/gitlab/bitbucket_import/importers/pull_request_notes_importer_spec.rb b/spec/lib/gitlab/bitbucket_import/importers/pull_request_notes_importer_spec.rb
index 4e3af982db9..df3209f7db9 100644
--- a/spec/lib/gitlab/bitbucket_import/importers/pull_request_notes_importer_spec.rb
+++ b/spec/lib/gitlab/bitbucket_import/importers/pull_request_notes_importer_spec.rb
@@ -67,6 +67,7 @@ RSpec.describe Gitlab::BitbucketImport::Importers::PullRequestNotesImporter, :cl
expect(note.author).to eq(bitbucket_user)
expect(note.created_at).to eq(created_at)
expect(note.updated_at).to eq(updated_at)
+ expect(note.imported_from).to eq('bitbucket')
end
context 'when the author does not have a bitbucket identity' do
diff --git a/spec/models/concerns/import/has_import_source_spec.rb b/spec/models/concerns/import/has_import_source_spec.rb
index 92a6aa1b81a..20a99e43d41 100644
--- a/spec/models/concerns/import/has_import_source_spec.rb
+++ b/spec/models/concerns/import/has_import_source_spec.rb
@@ -6,6 +6,7 @@ RSpec.describe Import::HasImportSource, feature_category: :importers do
let_it_be(:snippet_not_imported) { create(:snippet, :repository) }
let_it_be(:snippet_imported) { create(:snippet, imported_from: :bitbucket) }
let_it_be(:merge_request_imported) { create(:snippet, imported_from: :fogbugz) }
+ let_it_be(:merge_request_imported_bb_cloud) { create(:snippet, imported_from: :bitbucket) }
let_it_be(:merge_request_imported_github) { create(:snippet, imported_from: :github) }
let_it_be(:merge_request_imported_gitea) { create(:snippet, imported_from: :gitea) }
@@ -14,6 +15,7 @@ RSpec.describe Import::HasImportSource, feature_category: :importers do
expect(snippet_not_imported.imported?).to eq(false)
expect(snippet_imported.imported?).to eq(true)
expect(merge_request_imported.imported?).to eq(true)
+ expect(merge_request_imported_bb_cloud.imported?).to eq(true)
expect(merge_request_imported_github.imported?).to eq(true)
expect(merge_request_imported_gitea.imported?).to eq(true)
end
@@ -24,6 +26,7 @@ RSpec.describe Import::HasImportSource, feature_category: :importers do
expect(snippet_not_imported.imported_from).to eq('none')
expect(snippet_imported.imported_from).to eq('bitbucket')
expect(merge_request_imported.imported_from).to eq('fogbugz')
+ expect(merge_request_imported_bb_cloud.imported_from).to eq('bitbucket')
expect(merge_request_imported_github.imported_from).to eq('github')
expect(merge_request_imported_gitea.imported_from).to eq('gitea')
end
diff --git a/spec/requests/projects/packages/packages_controller_spec.rb b/spec/requests/projects/packages/packages_controller_spec.rb
index f48d2a8d203..a7bb8ab1441 100644
--- a/spec/requests/projects/packages/packages_controller_spec.rb
+++ b/spec/requests/projects/packages/packages_controller_spec.rb
@@ -5,32 +5,35 @@ require 'spec_helper'
RSpec.describe Projects::Packages::PackagesController, feature_category: :package_registry do
let_it_be(:project) { create(:project, :public) }
- describe 'GET #index' do
- let(:get_namespace_project_packages_path) do
- get namespace_project_packages_path(namespace_id: project.namespace, project_id: project)
- end
-
- subject { response.body }
-
- context 'when feature flag "packages_protected_packages" is enabled' do
- before do
- get_namespace_project_packages_path
- end
-
- it { is_expected.to have_pushed_frontend_feature_flags(packagesProtectedPackages: true) }
+ shared_examples 'having the feature flag "packagesProtectedPackages"' do
+ it 'pushes the feature flag to the view' do
+ is_expected.to have_gitlab_http_status(:ok)
+ is_expected.to have_attributes(body: have_pushed_frontend_feature_flags(packagesProtectedPackages: true))
end
context 'when feature flag "packages_protected_packages" is disabled' do
before do
stub_feature_flags(packages_protected_packages: false)
-
- get_namespace_project_packages_path
end
- it { is_expected.to have_pushed_frontend_feature_flags(packagesProtectedPackages: false) }
+ it 'does not pushes the feature flag to the view' do
+ is_expected.to have_gitlab_http_status(:ok)
+ is_expected.to have_attributes(body: have_pushed_frontend_feature_flags(packagesProtectedPackages: false))
+ end
end
end
+ describe 'GET #index' do
+ subject do
+ get namespace_project_packages_path(namespace_id: project.namespace, project_id: project)
+ response
+ end
+
+ it { is_expected.to have_gitlab_http_status(:ok) }
+
+ it_behaves_like 'having the feature flag "packagesProtectedPackages"'
+ end
+
describe 'GET #show' do
let_it_be(:package) { create(:package, project: project) }
@@ -41,16 +44,6 @@ RSpec.describe Projects::Packages::PackagesController, feature_category: :packag
it { is_expected.to have_gitlab_http_status(:ok) }
- it { is_expected.to have_attributes(body: have_pushed_frontend_feature_flags(packagesProtectedPackages: true)) }
-
- context 'when feature flag "packages_protected_packages" is disabled' do
- before do
- stub_feature_flags(packages_protected_packages: false)
- end
-
- it { is_expected.to have_gitlab_http_status(:ok) }
-
- it { is_expected.to have_attributes(body: have_pushed_frontend_feature_flags(packagesProtectedPackages: false)) }
- end
+ it_behaves_like 'having the feature flag "packagesProtectedPackages"'
end
end
diff --git a/spec/services/projects/create_service_spec.rb b/spec/services/projects/create_service_spec.rb
index 11f3775ff5f..1df22db3333 100644
--- a/spec/services/projects/create_service_spec.rb
+++ b/spec/services/projects/create_service_spec.rb
@@ -278,19 +278,41 @@ RSpec.describe Projects::CreateService, '#execute', feature_category: :groups_an
it_behaves_like 'has sync-ed traversal_ids'
context 'when project is an import' do
- before do
- stub_application_setting(import_sources: ['gitlab_project'])
+ let(:group) do
+ create(:group).tap do |group|
+ group.add_developer(user)
+ end
+ end
+
+ context 'and import is from a built-in template' do
+ let(:project_template) { Gitlab::ProjectTemplate.find(:rails) }
+
+ it 'does create the project' do
+ project = create_project(user, opts.merge!(template_name: project_template.name))
+
+ expect(project).to be_persisted
+ expect(project.errors).to be_blank
+ end
+ end
+
+ context 'and import is from a sample template' do
+ let(:sample_template) { Gitlab::SampleDataTemplate.find(:sample) }
+
+ it 'does create the project' do
+ project = create_project(user, opts.merge!(template_name: sample_template.name))
+
+ expect(project).to be_persisted
+ expect(project.errors).to be_blank
+ end
end
context 'when user is not allowed to import projects' do
- let(:group) do
- create(:group).tap do |group|
- group.add_developer(user)
- end
+ before do
+ stub_application_setting(import_sources: ['gitlab_project_migration'])
end
it 'does not create the project' do
- project = create_project(user, opts.merge!(namespace_id: group.id, import_type: 'gitlab_project'))
+ project = create_project(user, opts.merge!(namespace_id: group.id, import_type: 'gitlab_project_migration'))
expect(project).not_to be_persisted
expect(project.errors.messages[:user].first).to eq('is not allowed to import projects')
diff --git a/spec/support/helpers/gitaly_setup.rb b/spec/support/helpers/gitaly_setup.rb
index dcb7f9afb0c..f4c569c10e7 100644
--- a/spec/support/helpers/gitaly_setup.rb
+++ b/spec/support/helpers/gitaly_setup.rb
@@ -112,10 +112,14 @@ module GitalySetup
FileUtils.mkdir_p(GitalySetup.second_storage_path)
end
- if ENV['CI'] && gitaly_with_transactions?
- # The configuration file with transactions is pre-generated in the CI. Here we check
+ if gitaly_with_transactions? && !toml
+ # The configuration file with transactions is pre-generated. Here we check
# whether this job should actually run with transactions and choose the pre-generated
# configuration with transactions enabled if so.
+ #
+ # Workhorse provides its own configuration through 'toml'. If a configuration is
+ # explicitly provided, we don't override it. Workhorse test setup has its own logic
+ # to choose the configuration with transactions enabled.
toml = "#{config_path(service)}.transactions"
end
@@ -247,7 +251,7 @@ module GitalySetup
runtime_dir: runtime_dir,
prometheus_listen_addr: 'localhost:9236',
config_filename: config_name(:gitaly),
- transactions_enabled: gitaly_with_transactions?
+ transactions_enabled: false
}
},
{
@@ -256,7 +260,7 @@ module GitalySetup
runtime_dir: runtime_dir,
gitaly_socket: "gitaly2.socket",
config_filename: config_name(:gitaly2),
- transactions_enabled: gitaly_with_transactions?
+ transactions_enabled: false
}
}
].each do |params|
@@ -272,12 +276,10 @@ module GitalySetup
# without transactions enabled.
#
# Similarly to the Praefect configuration, generate variant of the configuration file with
- # transactions enabled in CI. Later when the rspec job runs, we decide whether to run Gitaly
+ # transactions enabled. Later when the rspec job runs, we decide whether to run Gitaly
# using the configuration with transactions enabled or not.
#
# These configuration files are only used in the CI.
- next unless ENV['CI']
-
params[:options][:config_filename] = "#{params[:options][:config_filename]}.transactions"
params[:options][:transactions_enabled] = true
diff --git a/workhorse/Makefile b/workhorse/Makefile
index 8020333ea41..380f01ed392 100644
--- a/workhorse/Makefile
+++ b/workhorse/Makefile
@@ -133,7 +133,17 @@ $(GITALY_PID_FILE): gitaly.toml
$(call message, "Starting gitaly")
cd ..; GITALY_TESTING_NO_GIT_HOOKS=1 GITALY_PID_FILE=workhorse/$(GITALY_PID_FILE) scripts/gitaly-test-spawn workhorse/gitaly.toml
-gitaly.toml: ../tmp/tests/gitaly/config.toml
+GITALY_CONFIGURATION_SOURCE_BASE = ../tmp/tests/gitaly/config.toml
+ifeq ($(GITALY_TRANSACTIONS_ENABLED),true)
+ GITALY_CONFIGURATION_SOURCE = ${GITALY_CONFIGURATION_SOURCE_BASE}.transactions
+else
+ GITALY_CONFIGURATION_SOURCE = ${GITALY_CONFIGURATION_SOURCE_BASE}
+endif
+
+# Mark the target phony so the configuration is always refreshed in case the `GITALY_TRANSACTIONS_ENABLED`
+# environment variable has been changed.
+.PHONY: gitaly.toml
+gitaly.toml: ${GITALY_CONFIGURATION_SOURCE}
sed -e 's/^socket_path.*$$/listen_addr = "0.0.0.0:8075"/;s/^\[auth\]$$//;s/^token.*$$//;s/^internal_socket_dir.*$$//' \
$< > $@
diff --git a/yarn.lock b/yarn.lock
index 176f68b6516..20032fb1ab4 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1331,10 +1331,10 @@
resolved "https://registry.yarnpkg.com/@gitlab/svgs/-/svgs-3.103.0.tgz#af61387481100eadef2bea8fe8605250311ac582"
integrity sha512-jVWCrRVRF6nw2A+Aowc0quXV2bdRPl2v08ElCPSestfdKjQ92tSlCrIsLB8GvdW5aI0eFsD1vJ1w2qkzZdpA4A==
-"@gitlab/ui@85.4.1":
- version "85.4.1"
- resolved "https://registry.yarnpkg.com/@gitlab/ui/-/ui-85.4.1.tgz#4cc7ed0bec0d022003e996a790d7ea9c37cce5ff"
- integrity sha512-Q2QsIILLlipv6StUEAjS11OaJFkoZ5jlIE3QpFpJeGkHnskD6viRdnFcFDCYXwGMtrm1JphEp7iZZs6uX/MIkw==
+"@gitlab/ui@85.12.1":
+ version "85.12.1"
+ resolved "https://registry.yarnpkg.com/@gitlab/ui/-/ui-85.12.1.tgz#b990c57b5ab3941e8a8900a987a8642a8cf8aa50"
+ integrity sha512-T+LWKfYGhxSVPT5x72qx7ujv1xgEKJCxVXbwcrMcWdMMjTdLSK6hGA/G7pY4MW8t0e0ZHvlwj7+BO9NFSDmq3Q==
dependencies:
"@floating-ui/dom" "1.4.3"
echarts "^5.3.2"
@@ -4994,10 +4994,10 @@ core-js-pure@^3.30.2:
resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.35.0.tgz#4660033304a050215ae82e476bd2513a419fbb34"
integrity sha512-f+eRYmkou59uh7BPcyJ8MC76DiGhspj1KMxVIcF24tzP8NA9HVa1uC7BTW2tgx7E1QVCzDzsgp7kArrzhlz8Ew==
-core-js@^3.29.1, core-js@^3.36.1, core-js@^3.6.5:
- version "3.36.1"
- resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.36.1.tgz#c97a7160ebd00b2de19e62f4bbd3406ab720e578"
- integrity sha512-BTvUrwxVBezj5SZ3f10ImnX2oRByMxql3EimVqMysepbC9EeMUOpLwdy6Eoili2x6E4kf+ZUB5k/+Jv55alPfA==
+core-js@^3.29.1, core-js@^3.37.1, core-js@^3.6.5:
+ version "3.37.1"
+ resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.37.1.tgz#d21751ddb756518ac5a00e4d66499df981a62db9"
+ integrity sha512-Xn6qmxrQZyB0FFY8E3bgRXei3lWDJHhvI+u0q9TKIYM49G8pAr0FgnnrFRAmsbptZL1yxRADVXn+x5AGsbBfyw==
core-util-is@~1.0.0:
version "1.0.3"