From 4b67e4b900cd2c591619315612183d1b6acd2031 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?fn=20=E2=8C=83=20=E2=8C=A5?= <70830482+FnControlOption@users.noreply.github.com> Date: Mon, 1 Nov 2021 17:57:56 -0700 Subject: [PATCH] Add `normalize` parameter to `expect_correction` --- spec/ameba/rule/layout/trailing_blank_lines_spec.cr | 2 +- src/ameba/spec/expect_issue.cr | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/spec/ameba/rule/layout/trailing_blank_lines_spec.cr b/spec/ameba/rule/layout/trailing_blank_lines_spec.cr index babe9f05..dcf5a69a 100644 --- a/spec/ameba/rule/layout/trailing_blank_lines_spec.cr +++ b/spec/ameba/rule/layout/trailing_blank_lines_spec.cr @@ -24,7 +24,7 @@ module Ameba::Rule::Layout it "fails if last line is not blank" do source = expect_issue subject, "\n\n\n puts 22 # error: Trailing newline missing", normalize: false - expect_correction source, "\n\n\n puts 22\n" + expect_correction source, "\n\n\n puts 22\n", normalize: false end context "when unnecessary blank line has been detected" do diff --git a/src/ameba/spec/expect_issue.cr b/src/ameba/spec/expect_issue.cr index 1167b8a3..6d865905 100644 --- a/src/ameba/spec/expect_issue.cr +++ b/src/ameba/spec/expect_issue.cr @@ -50,8 +50,8 @@ module Ameba::Spec::ExpectIssue def expect_issue(rules : Rule::Base | Enumerable(Rule::Base), annotated_code : String, path = "", - normalize = true, *, + normalize = true, file = __FILE__, line = __LINE__, **replacements) @@ -81,7 +81,8 @@ module Ameba::Spec::ExpectIssue source end - def expect_correction(source, correction, *, file = __FILE__, line = __LINE__) + def expect_correction(source, correction, *, normalize = true, file = __FILE__, line = __LINE__) + correction = normalize_code(correction) if normalize raise "Use `expect_no_corrections` if the code will not change" unless source.correct return if correction == source.code