Add latest changes from gitlab-org/gitlab@master

1 files changed, 21 insertions, 0 deletions

diff --git a/spec/migrations/drop_project_ci_cd_settings_merge_trains_enabled_spec.rb b/spec/migrations/drop_project_ci_cd_settings_merge_trains_enabled_spec.rb
new file mode 100644
index 00000000000..1b0e6e140ca
--- /dev/null
+++ b/spec/migrations/drop_project_ci_cd_settings_merge_trains_enabled_spec.rb
@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+require Rails.root.join('db', 'post_migrate', '20191128162854_drop_project_ci_cd_settings_merge_trains_enabled.rb')
+
+describe DropProjectCiCdSettingsMergeTrainsEnabled, :migration do
+  let!(:project_ci_cd_setting) { table(:project_ci_cd_settings) }
+
+  it 'correctly migrates up and down' do
+    reversible_migration do |migration|
+      migration.before -> {
+        expect(project_ci_cd_setting.column_names).to include("merge_trains_enabled")
+      }
+
+      migration.after -> {
+        project_ci_cd_setting.reset_column_information
+        expect(project_ci_cd_setting.column_names).not_to include("merge_trains_enabled")
+      }
+    end
+  end
+end