diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-08-27 03:08:45 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-08-27 03:08:45 +0300 |
| commit | d9c4e920ed70224d4e3a47b2a1c866a4f6f37ce4 (patch) | |
| tree | 95fa3467e085c3737b29f217faaf6188c14a27f5 /spec/lib | |
| parent | 9f6c0ac9fd6921bc0b5190ed4d4eaf0ab1e1f2d7 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/lib')
| -rw-r--r-- | spec/lib/gitlab/database/load_balancing/load_balancer_spec.rb | 6 | ||||
| -rw-r--r-- | spec/lib/gitlab/import_export/all_models.yml | 1 |
2 files changed, 7 insertions, 0 deletions
diff --git a/spec/lib/gitlab/database/load_balancing/load_balancer_spec.rb b/spec/lib/gitlab/database/load_balancing/load_balancer_spec.rb index c647f5a8f5d..4de5cb7c3d7 100644 --- a/spec/lib/gitlab/database/load_balancing/load_balancer_spec.rb +++ b/spec/lib/gitlab/database/load_balancing/load_balancer_spec.rb @@ -283,6 +283,12 @@ RSpec.describe Gitlab::Database::LoadBalancing::LoadBalancer, :request_store do expect(lb.connection_error?(error)).to eq(false) end + + it 'returns false for ActiveRecord errors without a cause' do + error = ActiveRecord::RecordNotUnique.new + + expect(lb.connection_error?(error)).to eq(false) + end end describe '#serialization_failure?' do diff --git a/spec/lib/gitlab/import_export/all_models.yml b/spec/lib/gitlab/import_export/all_models.yml index d83a00589b1..cf340b47b68 100644 --- a/spec/lib/gitlab/import_export/all_models.yml +++ b/spec/lib/gitlab/import_export/all_models.yml @@ -58,6 +58,7 @@ issues: - test_reports - requirement - incident_management_issuable_escalation_status +- pending_escalations work_item_type: - issues events: |