kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Merge branch '60029-fix-broken-master' into 'master'

Browse source 
Fix an order-dependent spec failure in spec/migrations/schedule_sync_issuables_state_id_spec.rb

Closes #60029

See merge request gitlab-org/gitlab-ce!26997
This commit is contained in:
Sean McGivern 2019-04-04 14:37:53 +00:00
commit b99b6bb096
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
spec/migrations/schedule_runners_token_encryption_spec.rb
View file

@ -1,7 +1,7 @@
require 'spec_helper'
require Rails.root.join('db', 'post_migrate', '20181121111200_schedule_runners_token_encryption')
describe ScheduleRunnersTokenEncryption, :migration do
describe ScheduleRunnersTokenEncryption, :migration, :sidekiq do
let(:settings) { table(:application_settings) }
let(:namespaces) { table(:namespaces) }
let(:projects) { table(:projects) }

2
spec/migrations/schedule_sync_issuables_state_id_spec.rb
View file

@ -3,7 +3,7 @@
require 'spec_helper'
require Rails.root.join('db', 'post_migrate', '20190214112022_schedule_sync_issuables_state_id.rb')
describe ScheduleSyncIssuablesStateId, :migration do
describe ScheduleSyncIssuablesStateId, :migration, :sidekiq do
let(:namespaces) { table(:namespaces) }
let(:projects) { table(:projects) }
let(:merge_requests) { table(:merge_requests) }