Skip to content

Commit

Permalink
Merge pull request #1795 from rubocop/use-getters-and-setters
Browse files Browse the repository at this point in the history
Use getter methods instead of instance variables
  • Loading branch information
pirj authored Feb 1, 2024
2 parents f8e0611 + fcf535a commit f062f92
Showing 1 changed file with 12 additions and 10 deletions.
22 changes: 12 additions & 10 deletions lib/rubocop/cop/rspec/rails/minitest_assertions.rb
Original file line number Diff line number Diff line change
Expand Up @@ -30,22 +30,24 @@ class MinitestAssertions < Base
class BasicAssertion
extend NodePattern::Macros

attr_reader :expected, :actual, :failure_message

def self.minitest_assertion
raise NotImplementedError
end

def initialize(expected, actual, fail_message)
def initialize(expected, actual, failure_message)
@expected = expected&.source
@actual = actual.source
@fail_message = fail_message&.source
@failure_message = failure_message&.source
end

def replaced(node)
runner = negated?(node) ? 'not_to' : 'to'
if @fail_message.nil?
"expect(#{@actual}).#{runner} #{assertion}"
if failure_message.nil?
"expect(#{actual}).#{runner} #{assertion}"
else
"expect(#{@actual}).#{runner}(#{assertion}, #{@fail_message})"
"expect(#{actual}).#{runner}(#{assertion}, #{failure_message})"
end
end

Expand Down Expand Up @@ -76,7 +78,7 @@ def self.match(expected, actual, failure_message)
end

def assertion
"eq(#{@expected})"
"eq(#{expected})"
end
end

Expand All @@ -98,7 +100,7 @@ def self.match(expected, actual, failure_message)
end

def assertion
"be_an_instance_of(#{@expected})"
"be_an_instance_of(#{expected})"
end
end

Expand All @@ -120,7 +122,7 @@ def self.match(collection, expected, failure_message)
end

def assertion
"include(#{@expected})"
"include(#{expected})"
end
end

Expand All @@ -144,7 +146,7 @@ def self.match(subject, predicate, failure_message)
end

def assertion
"be_#{@expected.delete_prefix(':').delete_suffix('?')}"
"be_#{expected.delete_prefix(':').delete_suffix('?')}"
end
end

Expand All @@ -165,7 +167,7 @@ def self.match(matcher, actual, failure_message)
end

def assertion
"match(#{@expected})"
"match(#{expected})"
end
end

Expand Down

0 comments on commit f062f92

Please sign in to comment.