From 4020738eedf876abcff70b2cd1f5cbba86f152e1 Mon Sep 17 00:00:00 2001 From: Jarek Radosz Date: Sat, 26 Feb 2022 03:51:39 +0100 Subject: [PATCH] DEV: Fix specs deprecations (#16059) --- spec/lib/has_errors_spec.rb | 6 +++--- spec/lib/migration/safe_migrate_spec.rb | 16 ++++++++-------- spec/models/reviewable_queued_post_spec.rb | 4 ++-- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/spec/lib/has_errors_spec.rb b/spec/lib/has_errors_spec.rb index 19844744d1c..5feea235ffb 100644 --- a/spec/lib/has_errors_spec.rb +++ b/spec/lib/has_errors_spec.rb @@ -37,7 +37,7 @@ describe HasErrors do it "triggers a rollback" do invalid_topic.valid? - expect(-> { error_test.rollback_from_errors!(invalid_topic) }).to raise_error(ActiveRecord::Rollback) + expect { error_test.rollback_from_errors!(invalid_topic) }.to raise_error(ActiveRecord::Rollback) expect(error_test.errors).to be_present expect(error_test.errors[:base]).to include(title_error) end @@ -46,9 +46,9 @@ describe HasErrors do context "rollback_with_error!" do it "triggers a rollback" do - expect(-> { + expect do error_test.rollback_with!(invalid_topic, :too_many_users) - }).to raise_error(ActiveRecord::Rollback) + end.to raise_error(ActiveRecord::Rollback) expect(error_test.errors).to be_present expect(error_test.errors[:base]).to include("You can only send warnings to one user at a time.") end diff --git a/spec/lib/migration/safe_migrate_spec.rb b/spec/lib/migration/safe_migrate_spec.rb index d15416e4a27..cec7b9710b6 100644 --- a/spec/lib/migration/safe_migrate_spec.rb +++ b/spec/lib/migration/safe_migrate_spec.rb @@ -23,9 +23,9 @@ describe Migration::SafeMigrate do path = File.expand_path "#{Rails.root}/spec/fixtures/db/migrate/drop_table" output = capture_stdout do - expect(lambda do + expect do migrate_up(path) - end).to raise_error(StandardError) + end.to raise_error(StandardError) end expect(output).to include("rails g post_migration") @@ -40,9 +40,9 @@ describe Migration::SafeMigrate do path = File.expand_path "#{Rails.root}/spec/fixtures/db/migrate/rename_table" output = capture_stdout do - expect(lambda do + expect do migrate_up(path) - end).to raise_error(StandardError) + end.to raise_error(StandardError) end expect { User.first }.not_to raise_error @@ -57,9 +57,9 @@ describe Migration::SafeMigrate do path = File.expand_path "#{Rails.root}/spec/fixtures/db/migrate/remove_column" output = capture_stdout do - expect(lambda do + expect do migrate_up(path) - end).to raise_error(StandardError) + end.to raise_error(StandardError) end expect(output).to include("rails g post_migration") @@ -74,9 +74,9 @@ describe Migration::SafeMigrate do path = File.expand_path "#{Rails.root}/spec/fixtures/db/migrate/rename_column" output = capture_stdout do - expect(lambda do + expect do migrate_up(path) - end).to raise_error(StandardError) + end.to raise_error(StandardError) end expect(output).to include("rails g post_migration") diff --git a/spec/models/reviewable_queued_post_spec.rb b/spec/models/reviewable_queued_post_spec.rb index 92fb1653a3b..4615036d6b8 100644 --- a/spec/models/reviewable_queued_post_spec.rb +++ b/spec/models/reviewable_queued_post_spec.rb @@ -73,7 +73,7 @@ RSpec.describe ReviewableQueuedPost, type: :model do expect(notifications).to be_present # We can't approve twice - expect(-> { reviewable.perform(moderator, :approve_post) }).to raise_error(Reviewable::InvalidAction) + expect { reviewable.perform(moderator, :approve_post) }.to raise_error(Reviewable::InvalidAction) end it "skips validations" do @@ -113,7 +113,7 @@ RSpec.describe ReviewableQueuedPost, type: :model do expect(Post.count).to eq(post_count) # We can't reject twice - expect(-> { reviewable.perform(moderator, :reject_post) }).to raise_error(Reviewable::InvalidAction) + expect { reviewable.perform(moderator, :reject_post) }.to raise_error(Reviewable::InvalidAction) end end