Add latest changes from gitlab-org/gitlab@master

2 files changed, 48 insertions, 6 deletions

diff --git a/spec/support/helpers/cookie_helper.rb b/spec/support/helpers/cookie_helper.rb
index 8971c03a5cc..ea4be12355b 100644
--- a/spec/support/helpers/cookie_helper.rb
+++ b/spec/support/helpers/cookie_helper.rb
@@ -27,12 +27,6 @@ module CookieHelper
     page.driver.browser.manage.cookie_named(name)
   end
 
-  def wait_for_cookie_set(name)
-    wait_for("Complete setting cookie") do
-      get_cookie(name)
-    end
-  end
-
   private
 
   def on_a_page?
diff --git a/spec/support/shared_examples/lib/gitlab/database/foreign_key_validators_shared_examples.rb b/spec/support/shared_examples/lib/gitlab/database/foreign_key_validators_shared_examples.rb
new file mode 100644
index 00000000000..a1e75e4af7e
--- /dev/null
+++ b/spec/support/shared_examples/lib/gitlab/database/foreign_key_validators_shared_examples.rb
@@ -0,0 +1,48 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.shared_examples 'foreign key validators' do |validator, expected_result|
+  subject(:result) { validator.new(structure_file, database).execute }
+
+  let(:structure_file_path) { Rails.root.join('spec/fixtures/structure.sql') }
+  let(:structure_file) { Gitlab::Database::SchemaValidation::StructureSql.new(structure_file_path, schema) }
+  let(:inconsistency_type) { validator.name.demodulize.underscore }
+  let(:database_name) { 'main' }
+  let(:schema) { 'public' }
+  let(:database_model) { Gitlab::Database.database_base_models[database_name] }
+  let(:connection) { database_model.connection }
+  let(:database) { Gitlab::Database::SchemaValidation::Database.new(connection) }
+
+  let(:database_query) do
+    [
+      {
+        'schema' => schema,
+        'table_name' => 'web_hooks',
+        'foreign_key_name' => 'web_hooks_project_id_fkey',
+        'foreign_key_definition' => 'FOREIGN KEY (project_id) REFERENCES projects(id) ON DELETE CASCADE'
+      },
+      {
+        'schema' => schema,
+        'table_name' => 'issues',
+        'foreign_key_name' => 'wrong_definition_fk',
+        'foreign_key_definition' => 'FOREIGN KEY (author_id) REFERENCES users(id) ON DELETE CASCADE'
+      },
+      {
+        'schema' => schema,
+        'table_name' => 'projects',
+        'foreign_key_name' => 'extra_fk',
+        'foreign_key_definition' => 'FOREIGN KEY (creator_id) REFERENCES users(id) ON DELETE CASCADE'
+      }
+    ]
+  end
+
+  before do
+    allow(connection).to receive(:exec_query).and_return(database_query)
+  end
+
+  it 'returns trigger inconsistencies' do
+    expect(result.map(&:object_name)).to match_array(expected_result)
+    expect(result.map(&:type)).to all(eql inconsistency_type)
+  end
+end