Add latest changes from gitlab-org/gitlab@15-1-stable-eev15.1.0-rc42

1 files changed, 22 insertions, 0 deletions

diff --git a/spec/migrations/20220523171107_drop_deploy_tokens_token_column_spec.rb b/spec/migrations/20220523171107_drop_deploy_tokens_token_column_spec.rb
new file mode 100644
index 00000000000..78df6f5fc35
--- /dev/null
+++ b/spec/migrations/20220523171107_drop_deploy_tokens_token_column_spec.rb
@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+require_migration!
+
+RSpec.describe DropDeployTokensTokenColumn do
+  let(:deploy_tokens) { table(:deploy_tokens) }
+
+  it 'correctly migrates up and down' do
+    reversible_migration do |migration|
+      migration.before -> {
+        expect(deploy_tokens.column_names).to include('token')
+      }
+
+      migration.after -> {
+        deploy_tokens.reset_column_information
+
+        expect(deploy_tokens.column_names).not_to include('token')
+      }
+    end
+  end
+end