kotovalexarian-likes-github
/
thoughtbot--shoulda-matchers
mirror of https://github.com/thoughtbot/shoulda-matchers.git
1
0
Fork 0
Code Releases Activity

Continue cleaning up matchers.

This commit is contained in:
Gabe Berke-Williams 2012-03-30 10:51:00 -04:00
parent 36006d83b4
commit 96df0b12ca
1 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
lib/shoulda/matchers/action_controller/set_the_flash_matcher.rb
View File

@ -18,6 +18,7 @@ module Shoulda # :nodoc:
end
class SetTheFlashMatcher # :nodoc:
attr_reader :failure_message, :negative_failure_message
def to(value)
@value = value
@ -39,8 +40,6 @@ module Shoulda # :nodoc:
sets_the_flash? && string_value_matches? && regexp_value_matches?
end
attr_reader :failure_message, :negative_failure_message
def description
description = "set the #{expected_flash_invocation}"
description << " to #{@value.inspect}" unless @value.nil?
@ -62,13 +61,19 @@ module Shoulda # :nodoc:
end
def string_value_matches?
return true unless String === @value
flash_values.any? {|value| value == @value }
if @value.is_a?(String)
flash_values.any? {|value| value == @value }
else
true
end
end
def regexp_value_matches?
return true unless Regexp === @value
flash_values.any? {|value| value =~ @value }
if @value.is_a?(Regexp)
flash_values.any? {|value| value =~ @value }
else
true
end
end
def flash_values
@ -80,11 +85,16 @@ module Shoulda # :nodoc:
end
def flash
return @flash if @flash
@flash = @controller.flash.dup
@flash.instance_variable_set(:@used, @controller.flash.instance_variable_get(:@used).dup)
@flash.sweep unless @now
@flash
if @flash
@flash
else
@flash = @controller.flash.dup
@flash.instance_variable_set(:@used, @controller.flash.instance_variable_get(:@used).dup)
if ! @now
@flash.sweep
end
@flash
end
end
def expectation