Add latest changes from gitlab-org/gitlab@master

1 files changed, 24 insertions, 0 deletions

diff --git a/spec/migrations/add_deploy_token_type_to_deploy_tokens_spec.rb b/spec/migrations/add_deploy_token_type_to_deploy_tokens_spec.rb
new file mode 100644
index 00000000000..fb8213a6bd6
--- /dev/null
+++ b/spec/migrations/add_deploy_token_type_to_deploy_tokens_spec.rb
@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+require Rails.root.join('db', 'migrate', '20200122161638_add_deploy_token_type_to_deploy_tokens.rb')
+
+describe AddDeployTokenTypeToDeployTokens, :migration do
+  let(:deploy_tokens) { table(:deploy_tokens) }
+  let(:deploy_token) do
+    deploy_tokens.create(name: 'token_test',
+                         username: 'gitlab+deploy-token-1',
+                         token_encrypted: 'dr8rPXwM+Mbs2p3Bg1+gpnXqrnH/wu6vaHdcc7A3isPR67WB',
+                         read_repository: true,
+                         expires_at: Time.now + 1.year)
+  end
+
+  it 'updates the deploy_token_type column to 2' do
+    expect(deploy_token).not_to respond_to(:deploy_token_type)
+
+    migrate!
+
+    deploy_token.reload
+    expect(deploy_token.deploy_token_type).to eq(2)
+  end
+end