Add latest changes from gitlab-org/gitlab@master

1 files changed, 24 insertions, 0 deletions

diff --git a/spec/migrations/update_timestamp_softwarelicensespolicy_spec.rb b/spec/migrations/update_timestamp_softwarelicensespolicy_spec.rb
new file mode 100644
index 00000000000..539da8ac92a
--- /dev/null
+++ b/spec/migrations/update_timestamp_softwarelicensespolicy_spec.rb
@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+require Rails.root.join('db', 'migrate', '20200116175538_update_timestamp_softwarelicensespolicy.rb')
+
+describe UpdateTimestampSoftwarelicensespolicy, :migration do
+  let(:software_licenses_policy) { table(:software_license_policies) }
+  let(:projects) { table(:projects) }
+  let(:licenses) { table(:software_licenses) }
+
+  before do
+    projects.create!(name: 'gitlab', path: 'gitlab-org/gitlab-ce', namespace_id: 1)
+    licenses.create!(name: 'MIT')
+    software_licenses_policy.create!(project_id: projects.first.id, software_license_id: licenses.first.id, created_at: nil, updated_at: nil)
+  end
+
+  it 'creates timestamps' do
+    migrate!
+
+    expect(software_licenses_policy.first.created_at).to be_present
+    expect(software_licenses_policy.first.updated_at).to be_present
+  end
+end