Add latest changes from gitlab-org/gitlab@master

2 files changed, 78 insertions, 0 deletions

diff --git a/spec/migrations/backfill_operations_feature_flags_iid_spec.rb b/spec/migrations/backfill_operations_feature_flags_iid_spec.rb
new file mode 100644
index 00000000000..f7a223e794a
--- /dev/null
+++ b/spec/migrations/backfill_operations_feature_flags_iid_spec.rb
@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+require Rails.root.join('db', 'post_migrate', '20200117194850_backfill_operations_feature_flags_iid.rb')
+
+describe BackfillOperationsFeatureFlagsIid, :migration do
+  let(:namespaces)   { table(:namespaces) }
+  let(:projects)     { table(:projects) }
+  let(:flags)        { table(:operations_feature_flags) }
+
+  def setup
+    namespace = namespaces.create!(name: 'foo', path: 'foo')
+    project = projects.create!(namespace_id: namespace.id)
+
+    project
+  end
+
+  it 'migrates successfully when there are no flags in the database' do
+    setup
+
+    disable_migrations_output { migrate! }
+
+    expect(flags.count).to eq(0)
+  end
+
+  it 'migrates successfully with a row in the table in both FOSS and EE' do
+    project = setup
+    flags.create!(project_id: project.id, active: true, name: 'test_flag')
+
+    disable_migrations_output { migrate! }
+
+    expect(flags.count).to eq(1)
+  end
+end
diff --git a/spec/migrations/delete_internal_ids_where_feature_flags_usage_spec.rb b/spec/migrations/delete_internal_ids_where_feature_flags_usage_spec.rb
new file mode 100644
index 00000000000..b9c6b489aca
--- /dev/null
+++ b/spec/migrations/delete_internal_ids_where_feature_flags_usage_spec.rb
@@ -0,0 +1,44 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+require Rails.root.join('db', 'post_migrate', '20200117194900_delete_internal_ids_where_feature_flags_usage')
+
+describe DeleteInternalIdsWhereFeatureFlagsUsage, :migration do
+  let(:namespaces)   { table(:namespaces) }
+  let(:projects)     { table(:projects) }
+  let(:internal_ids) { table(:internal_ids) }
+
+  def setup
+    namespace = namespaces.create!(name: 'foo', path: 'foo')
+    project = projects.create!(namespace_id: namespace.id)
+
+    project
+  end
+
+  it 'deletes feature flag rows from the internal_ids table' do
+    project = setup
+    internal_ids.create!(project_id: project.id, usage: 6, last_value: 1)
+
+    disable_migrations_output { migrate! }
+
+    expect(internal_ids.count).to eq(0)
+  end
+
+  it 'does not delete issue rows from the internal_ids table' do
+    project = setup
+    internal_ids.create!(project_id: project.id, usage: 0, last_value: 1)
+
+    disable_migrations_output { migrate! }
+
+    expect(internal_ids.count).to eq(1)
+  end
+
+  it 'does not delete merge request rows from the internal_ids table' do
+    project = setup
+    internal_ids.create!(project_id: project.id, usage: 1, last_value: 1)
+
+    disable_migrations_output { migrate! }
+
+    expect(internal_ids.count).to eq(1)
+  end
+end