Commit fdcb3d47 authored by GitLab Bot's avatar GitLab Bot

Add latest changes from gitlab-org/gitlab@13-12-stable-ee

parent 01ca8e9e
...@@ -185,18 +185,6 @@ RSpec.describe Tooling::Danger::Changelog do ...@@ -185,18 +185,6 @@ RSpec.describe Tooling::Danger::Changelog do
it { is_expected.to have_attributes(warnings: ["This MR has a Changelog file outside `ee/`, but code changes in `ee/`. Consider moving the Changelog file into `ee/`."]) } it { is_expected.to have_attributes(warnings: ["This MR has a Changelog file outside `ee/`, but code changes in `ee/`. Consider moving the Changelog file into `ee/`."]) }
end end
context "and a EE changelog" do
let(:changelog_change) { change_class.new('ee/changelogs/unreleased/entry.yml', :added, :changelog) }
it { is_expected.to have_attributes(errors: [], warnings: [], markdowns: [], messages: []) }
context "and there are DB changes" do
let(:foss_change) { change_class.new('db/migrate/foo.rb', :added, :migration) }
it { is_expected.to have_attributes(warnings: ["This MR has a Changelog file inside `ee/`, but there are database changes which [requires](https://docs.gitlab.com/ee/development/changelog.html#what-warrants-a-changelog-entry) the Changelog placement to be outside of `ee/`. Consider moving the Changelog file outside `ee/`."]) }
end
end
end end
context "with no EE changes" do context "with no EE changes" do
...@@ -219,26 +207,20 @@ RSpec.describe Tooling::Danger::Changelog do ...@@ -219,26 +207,20 @@ RSpec.describe Tooling::Danger::Changelog do
describe '#required_reasons' do describe '#required_reasons' do
subject { changelog.required_reasons } subject { changelog.required_reasons }
context "added files contain a migration" do
let(:changes) { changes_class.new([change_class.new('foo', :added, :migration)]) }
it { is_expected.to include(:db_changes) }
end
context "removed files contains a feature flag" do context "removed files contains a feature flag" do
let(:changes) { changes_class.new([change_class.new('foo', :deleted, :feature_flag)]) } let(:changes) { changes_class.new([change_class.new('foo', :deleted, :feature_flag)]) }
it { is_expected.to include(:feature_flag_removed) } it { is_expected.to include(:feature_flag_removed) }
end end
context "added files do not contain a migration" do context "removed files do not contain a feature flag" do
let(:changes) { changes_class.new([change_class.new('foo', :added, :frontend)]) } let(:changes) { changes_class.new([change_class.new('foo', :deleted, :backend)]) }
it { is_expected.to be_empty } it { is_expected.to be_empty }
end end
context "removed files do not contain a feature flag" do context "added files contain a migration" do
let(:changes) { changes_class.new([change_class.new('foo', :deleted, :backend)]) } let(:changes) { changes_class.new([change_class.new('foo', :added, :migration)]) }
it { is_expected.to be_empty } it { is_expected.to be_empty }
end end
...@@ -247,26 +229,20 @@ RSpec.describe Tooling::Danger::Changelog do ...@@ -247,26 +229,20 @@ RSpec.describe Tooling::Danger::Changelog do
describe '#required?' do describe '#required?' do
subject { changelog.required? } subject { changelog.required? }
context 'added files contain a migration' do
let(:changes) { changes_class.new([change_class.new('foo', :added, :migration)]) }
it { is_expected.to be_truthy }
end
context "removed files contains a feature flag" do context "removed files contains a feature flag" do
let(:changes) { changes_class.new([change_class.new('foo', :deleted, :feature_flag)]) } let(:changes) { changes_class.new([change_class.new('foo', :deleted, :feature_flag)]) }
it { is_expected.to be_truthy } it { is_expected.to be_truthy }
end end
context 'added files do not contain a migration' do context "removed files do not contain a feature flag" do
let(:changes) { changes_class.new([change_class.new('foo', :added, :frontend)]) } let(:changes) { changes_class.new([change_class.new('foo', :deleted, :backend)]) }
it { is_expected.to be_falsey } it { is_expected.to be_falsey }
end end
context "removed files do not contain a feature flag" do context "added files contain a migration" do
let(:changes) { changes_class.new([change_class.new('foo', :deleted, :backend)]) } let(:changes) { changes_class.new([change_class.new('foo', :added, :migration)]) }
it { is_expected.to be_falsey } it { is_expected.to be_falsey }
end end
...@@ -434,20 +410,6 @@ RSpec.describe Tooling::Danger::Changelog do ...@@ -434,20 +410,6 @@ RSpec.describe Tooling::Danger::Changelog do
end end
end end
context 'with a new migration file' do
let(:changes) { changes_class.new([change_class.new('foo', :added, :migration)]) }
context "when title is not changed from sanitization", :aggregate_failures do
it_behaves_like 'changelog required text', :db_changes
end
context "when title needs sanitization", :aggregate_failures do
let(:mr_title) { 'DRAFT: Fake Title' }
it_behaves_like 'changelog required text', :db_changes
end
end
context 'with a removed feature flag file' do context 'with a removed feature flag file' do
let(:changes) { changes_class.new([change_class.new('foo', :deleted, :feature_flag)]) } let(:changes) { changes_class.new([change_class.new('foo', :deleted, :feature_flag)]) }
...@@ -469,20 +431,6 @@ RSpec.describe Tooling::Danger::Changelog do ...@@ -469,20 +431,6 @@ RSpec.describe Tooling::Danger::Changelog do
end end
end end
context 'with a new migration file' do
let(:changes) { changes_class.new([change_class.new('foo', :added, :migration)]) }
context "when title is not changed from sanitization", :aggregate_failures do
it_behaves_like 'changelog required text', :db_changes
end
context "when title needs sanitization", :aggregate_failures do
let(:mr_title) { 'DRAFT: Fake Title' }
it_behaves_like 'changelog required text', :db_changes
end
end
context 'with a removed feature flag file' do context 'with a removed feature flag file' do
let(:changes) { changes_class.new([change_class.new('foo', :deleted, :feature_flag)]) } let(:changes) { changes_class.new([change_class.new('foo', :deleted, :feature_flag)]) }
......
...@@ -65,7 +65,6 @@ module Tooling ...@@ -65,7 +65,6 @@ module Tooling
SUGGEST_COMMENT SUGGEST_COMMENT
REQUIRED_CHANGELOG_REASONS = { REQUIRED_CHANGELOG_REASONS = {
db_changes: 'introduces a database migration',
feature_flag_removed: 'removes a feature flag' feature_flag_removed: 'removes a feature flag'
}.freeze }.freeze
REQUIRED_CHANGELOG_MESSAGE = { REQUIRED_CHANGELOG_MESSAGE = {
...@@ -235,16 +234,11 @@ module Tooling ...@@ -235,16 +234,11 @@ module Tooling
check_result.warning("This MR has a Changelog file in `ee/`, but no code changes in `ee/`. Consider moving the Changelog file outside `ee/`.") check_result.warning("This MR has a Changelog file in `ee/`, but no code changes in `ee/`. Consider moving the Changelog file outside `ee/`.")
end end
if ee_changes.any? && ee_changelog? && required_reasons.include?(:db_changes)
check_result.warning("This MR has a Changelog file inside `ee/`, but there are database changes which [requires](https://docs.gitlab.com/ee/development/changelog.html#what-warrants-a-changelog-entry) the Changelog placement to be outside of `ee/`. Consider moving the Changelog file outside `ee/`.")
end
check_result check_result
end end
def required_reasons def required_reasons
[].tap do |reasons| [].tap do |reasons|
reasons << :db_changes if project_helper.changes.added.has_category?(:migration)
reasons << :feature_flag_removed if project_helper.changes.deleted.has_category?(:feature_flag) reasons << :feature_flag_removed if project_helper.changes.deleted.has_category?(:feature_flag)
end end
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment