diff options
author | Sean McGivern <sean@mcgivern.me.uk> | 2018-02-07 20:22:12 +0300 |
---|---|---|
committer | Sean McGivern <sean@mcgivern.me.uk> | 2018-02-07 20:22:12 +0300 |
commit | 9a9ee0d760cc7740e1dfebdf7c0fe882c01bce4c (patch) | |
tree | 49f21da55d7039cf4591b0418159947ad4476872 /spec/migrations | |
parent | 7141344aab3c75cee56c9da3399f247a808c9cce (diff) | |
parent | 0c62b49484c65d6eadfdf8602f507b55497e442f (diff) |
Merge branch 'ce-4813-fix-ee-projects-destroy_service_spec' into 'master'
Reset column information after the schema is migrated in MigrationsHelpers.schema_migrate_up!
Closes gitlab-ee#4813
See merge request gitlab-org/gitlab-ce!16950
Diffstat (limited to 'spec/migrations')
-rw-r--r-- | spec/migrations/convert_custom_notification_settings_to_columns_spec.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/migrations/convert_custom_notification_settings_to_columns_spec.rb b/spec/migrations/convert_custom_notification_settings_to_columns_spec.rb index 759e77ac9db..d1bf6bdf9d6 100644 --- a/spec/migrations/convert_custom_notification_settings_to_columns_spec.rb +++ b/spec/migrations/convert_custom_notification_settings_to_columns_spec.rb @@ -21,7 +21,7 @@ describe ConvertCustomNotificationSettingsToColumns, :migration do events[event] = true end - user = build(:user).becomes(user_class).tap(&:save!) + user = user_class.create!(email: "user-#{SecureRandom.hex}@example.org", username: "user-#{SecureRandom.hex}", encrypted_password: '12345678') create_params = { user_id: user.id, level: params[:level], events: events } notification_setting = described_class::NotificationSetting.create(create_params) @@ -37,7 +37,7 @@ describe ConvertCustomNotificationSettingsToColumns, :migration do events[event] = true end - user = build(:user).becomes(user_class).tap(&:save!) + user = user_class.create!(email: "user-#{SecureRandom.hex}@example.org", username: "user-#{SecureRandom.hex}", encrypted_password: '12345678') create_params = events.merge(user_id: user.id, level: params[:level]) notification_setting = described_class::NotificationSetting.create(create_params) |