Add latest changes from gitlab-org/gitlab@master

5 files changed, 64 insertions, 7 deletions

diff --git a/spec/migrations/cleanup_empty_commit_user_mentions_spec.rb b/spec/migrations/cleanup_empty_commit_user_mentions_spec.rb
index 7e6afbec520..529fe046e32 100644
--- a/spec/migrations/cleanup_empty_commit_user_mentions_spec.rb
+++ b/spec/migrations/cleanup_empty_commit_user_mentions_spec.rb
@@ -14,7 +14,7 @@ describe CleanupEmptyCommitUserMentions, :migration, :sidekiq do
   let(:project) { projects.create!(name: 'gitlab1', path: 'gitlab1', namespace_id: group.id, visibility_level: 0) }
 
   let(:repository) { Gitlab::Git::Repository.new('default', TEST_REPO_PATH, '', 'group/project') }
-  let(:commit) { Commit.new(RepoHelpers.sample_commit, project.becomes(Project)) }
+  let(:commit) { Commit.new(RepoHelpers.sample_commit, project) }
   let(:commit_user_mentions) { table(:commit_user_mentions) }
 
   let!(:resource1) { notes.create!(commit_id: commit.id, noteable_type: 'Commit', project_id: project.id, author_id: user.id, note: 'note1 for @root to check') }
diff --git a/spec/migrations/cleanup_optimistic_locking_nulls_pt2_spec.rb b/spec/migrations/cleanup_optimistic_locking_nulls_pt2_spec.rb
new file mode 100644
index 00000000000..8d7d5ac2d26
--- /dev/null
+++ b/spec/migrations/cleanup_optimistic_locking_nulls_pt2_spec.rb
@@ -0,0 +1,44 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+require Rails.root.join('db', 'post_migrate', '20200217210353_cleanup_optimistic_locking_nulls_pt2')
+
+describe CleanupOptimisticLockingNullsPt2, :migration do
+  let(:ci_stages) { table(:ci_stages) }
+  let(:ci_builds) { table(:ci_builds) }
+  let(:ci_pipelines) { table(:ci_pipelines) }
+  let(:tables) { [ci_stages, ci_builds, ci_pipelines] }
+
+  before do
+    # Create necessary rows
+    ci_stages.create!
+    ci_builds.create!
+    ci_pipelines.create!
+
+    # Nullify `lock_version` column for all rows
+    # Needs to be done with a SQL fragment, otherwise Rails will coerce it to 0
+    tables.each do |table|
+      table.update_all('lock_version = NULL')
+    end
+  end
+
+  it 'correctly migrates nullified lock_version column', :sidekiq_might_not_need_inline do
+    tables.each do |table|
+      expect(table.where(lock_version: nil).count).to eq(1)
+    end
+
+    tables.each do |table|
+      expect(table.where(lock_version: 0).count).to eq(0)
+    end
+
+    migrate!
+
+    tables.each do |table|
+      expect(table.where(lock_version: nil).count).to eq(0)
+    end
+
+    tables.each do |table|
+      expect(table.where(lock_version: 0).count).to eq(1)
+    end
+  end
+end
diff --git a/spec/migrations/cleanup_optimistic_locking_nulls_spec.rb b/spec/migrations/cleanup_optimistic_locking_nulls_spec.rb
index d32a374b914..6e541c903ff 100644
--- a/spec/migrations/cleanup_optimistic_locking_nulls_spec.rb
+++ b/spec/migrations/cleanup_optimistic_locking_nulls_spec.rb
@@ -4,11 +4,10 @@ require 'spec_helper'
 require Rails.root.join('db', 'post_migrate', '20200128210353_cleanup_optimistic_locking_nulls')
 
 describe CleanupOptimisticLockingNulls do
-  TABLES = %w(epics merge_requests issues).freeze
-  TABLES.each do |table|
-    let(table.to_sym) { table(table.to_sym) }
-  end
-  let(:tables) { TABLES.map { |t| method(t.to_sym).call } }
+  let(:epics) { table(:epics) }
+  let(:merge_requests) { table(:merge_requests) }
+  let(:issues) { table(:issues) }
+  let(:tables) { [epics, merge_requests, issues] }
 
   let(:namespaces) { table(:namespaces) }
   let(:projects) { table(:projects) }
diff --git a/spec/migrations/migrate_commit_notes_mentions_to_db_spec.rb b/spec/migrations/migrate_commit_notes_mentions_to_db_spec.rb
index aa78381ba3a..dc40d0865f2 100644
--- a/spec/migrations/migrate_commit_notes_mentions_to_db_spec.rb
+++ b/spec/migrations/migrate_commit_notes_mentions_to_db_spec.rb
@@ -14,7 +14,7 @@ describe MigrateCommitNotesMentionsToDb, :migration, :sidekiq do
   let(:project) { projects.create!(name: 'gitlab1', path: 'gitlab1', namespace_id: group.id, visibility_level: 0) }
 
   let(:repository) { Gitlab::Git::Repository.new('default', TEST_REPO_PATH, '', 'group/project') }
-  let(:commit) { Commit.new(RepoHelpers.sample_commit, project.becomes(Project)) }
+  let(:commit) { Commit.new(RepoHelpers.sample_commit, project) }
   let(:commit_user_mentions) { table(:commit_user_mentions) }
 
   let!(:resource1) { notes.create!(commit_id: commit.id, noteable_type: 'Commit', project_id: project.id, author_id: user.id, note: 'note1 for @root to check') }
diff --git a/spec/migrations/schedule_backfill_push_rules_id_in_projects_spec.rb b/spec/migrations/schedule_backfill_push_rules_id_in_projects_spec.rb
index 77648f5c64a..77721eab77d 100644
--- a/spec/migrations/schedule_backfill_push_rules_id_in_projects_spec.rb
+++ b/spec/migrations/schedule_backfill_push_rules_id_in_projects_spec.rb
@@ -20,6 +20,20 @@ describe ScheduleBackfillPushRulesIdInProjects do
     expect(setting.push_rule_id).to eq(sample_rule.id)
   end
 
+  it 'adds global rule association to last application settings when there is more than one record without failing' do
+    application_settings = table(:application_settings)
+    setting_old = application_settings.create!
+    setting = application_settings.create!
+    sample_rule = push_rules.create!(is_sample: true)
+
+    Sidekiq::Testing.fake! do
+      disable_migrations_output { migrate! }
+    end
+
+    expect(setting_old.reload.push_rule_id).to be_nil
+    expect(setting.reload.push_rule_id).to eq(sample_rule.id)
+  end
+
   it 'schedules worker to migrate project push rules' do
     rule_1 = push_rules.create!
     rule_2 = push_rules.create!