summaryrefslogtreecommitdiff
path: root/spec/lib
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-01-15 12:08:34 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-01-15 12:08:34 +0000
commit0820b29dca14bd22c2cee6d9ee2900b64385bfa6 (patch)
tree3637b0c997f5764c7255b830ffe32e53ac7ce078 /spec/lib
parent778772c8d97adc025c126a941a1bd37bf72419ac (diff)
downloadgitlab-ce-0820b29dca14bd22c2cee6d9ee2900b64385bfa6.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/lib')
-rw-r--r--spec/lib/gitlab/database/migration_helpers_spec.rb6
-rw-r--r--spec/lib/gitlab/import_export/all_models.yml2
2 files changed, 7 insertions, 1 deletions
diff --git a/spec/lib/gitlab/database/migration_helpers_spec.rb b/spec/lib/gitlab/database/migration_helpers_spec.rb
index 439f1343514..e0b4c8ae1f7 100644
--- a/spec/lib/gitlab/database/migration_helpers_spec.rb
+++ b/spec/lib/gitlab/database/migration_helpers_spec.rb
@@ -1475,7 +1475,11 @@ describe Gitlab::Database::MigrationHelpers do
describe '#index_exists_by_name?' do
it 'returns true if an index exists' do
- expect(model.index_exists_by_name?(:projects, 'index_projects_on_path'))
+ ActiveRecord::Base.connection.execute(
+ 'CREATE INDEX test_index_for_index_exists ON projects (path);'
+ )
+
+ expect(model.index_exists_by_name?(:projects, 'test_index_for_index_exists'))
.to be_truthy
end
diff --git a/spec/lib/gitlab/import_export/all_models.yml b/spec/lib/gitlab/import_export/all_models.yml
index ee4db935b58..ce7894ea955 100644
--- a/spec/lib/gitlab/import_export/all_models.yml
+++ b/spec/lib/gitlab/import_export/all_models.yml
@@ -38,6 +38,8 @@ issues:
- vulnerability_links
- related_vulnerabilities
- user_mentions
+- blocked_by_issue_links
+- blocked_by_issues
events:
- author
- project