diff options
| author | Stan Hu <stanhu@gmail.com> | 2019-06-26 14:33:58 +0000 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2019-06-26 14:33:58 +0000 |
| commit | b0c8de1f4f0852f769d4382e0e2d04ab82d239cc (patch) | |
| tree | 9cc524b1cfa0062f1944236bcb66c7d9fec5512d | |
| parent | 05a7fcbdf79fbff25048161657cfacdd58395b76 (diff) | |
| parent | 813b8aad24a88aa014c75487fe2856fa385d4cf6 (diff) | |
| download | gitlab-ce-b0c8de1f4f0852f769d4382e0e2d04ab82d239cc.tar.gz | |
Merge branch 'jprovazn-internal-id-spec' into 'master'
Fix failing spec/models/internal_id_spec.rb spec
Closes #63698
See merge request gitlab-org/gitlab-ce!30027
| -rw-r--r-- | spec/models/internal_id_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/models/internal_id_spec.rb b/spec/models/internal_id_spec.rb index 806b4f61bd8..28630f7d3fe 100644 --- a/spec/models/internal_id_spec.rb +++ b/spec/models/internal_id_spec.rb @@ -158,7 +158,7 @@ describe InternalId do before do described_class.reset_column_information # Project factory will also call the current_version - expect(ActiveRecord::Migrator).to receive(:current_version).twice.and_return(InternalId::REQUIRED_SCHEMA_VERSION - 1) + expect(ActiveRecord::Migrator).to receive(:current_version).at_least(:once).and_return(InternalId::REQUIRED_SCHEMA_VERSION - 1) end it 'does not reset any of the iids' do |