diff options
3 files changed, 13 insertions, 9 deletions
diff --git a/db/post_migrate/20190715193142_migrate_discussion_id_on_promoted_epics.rb b/db/post_migrate/20190715193142_migrate_discussion_id_on_promoted_epics.rb index b351d10e7a7..ccfec8b3aaf 100644 --- a/db/post_migrate/20190715193142_migrate_discussion_id_on_promoted_epics.rb +++ b/db/post_migrate/20190715193142_migrate_discussion_id_on_promoted_epics.rb @@ -15,7 +15,7 @@ class MigrateDiscussionIdOnPromotedEpics < ActiveRecord::Migration[5.2] disable_ddl_transaction! - class SystemNoteMtadata < ActiveRecord::Base + class SystemNoteMetadata < ActiveRecord::Base self.table_name = 'system_note_metadata' end diff --git a/spec/lib/gitlab/background_migration/fix_promoted_epics_discussion_ids_spec.rb b/spec/lib/gitlab/background_migration/fix_promoted_epics_discussion_ids_spec.rb index 155704746b3..fe07144745b 100644 --- a/spec/lib/gitlab/background_migration/fix_promoted_epics_discussion_ids_spec.rb +++ b/spec/lib/gitlab/background_migration/fix_promoted_epics_discussion_ids_spec.rb @@ -38,7 +38,7 @@ describe Gitlab::BackgroundMigration::FixPromotedEpicsDiscussionIds, :migration, expect(note1.discussion_id).not_to eq(note3.discussion_id) end - it 'skips notes with discsussion id not in range' do + it 'skips notes with discussion id not in range' do note4 = create_note('20000000') subject.perform(%w(00000000 10000000)) diff --git a/spec/migrations/migrate_discussion_id_on_promoted_epics_spec.rb b/spec/migrations/migrate_discussion_id_on_promoted_epics_spec.rb index 5375a53d9ef..5e25d1aed82 100644 --- a/spec/migrations/migrate_discussion_id_on_promoted_epics_spec.rb +++ b/spec/migrations/migrate_discussion_id_on_promoted_epics_spec.rb @@ -19,10 +19,8 @@ describe MigrateDiscussionIdOnPromotedEpics, :migration, :sidekiq do let(:namespace) { namespaces.create!(name: 'gitlab', path: 'gitlab-org') } def create_promotion_note(model, id) - note = notes.create!(system: true, note: 'promoted from issue XXX', - noteable_id: model.id, - noteable_type: model.class.name, - discussion_id: id) + note = create_note(model, id, { system: true, + note: 'promoted from issue XXX' }) system_note_metadata.create!(note_id: note.id, action: 'moved') end @@ -33,9 +31,15 @@ describe MigrateDiscussionIdOnPromotedEpics, :migration, :sidekiq do title_html: 'Epic with discussion') end - def create_note(model, id) - notes.create!(note: 'note', noteable_id: model.id, - noteable_type: model.class.name, discussion_id: id) + def create_note(model, id, extra_params = {}) + params = { + note: 'note', + noteable_id: model.id, + noteable_type: model.class.name, + discussion_id: id + }.merge(extra_params) + + notes.create!(params) end context 'with promoted epic' do |