Skip to content

Commit 57935f1

Browse files
cguntheravit
authored andcommitted
Update matchers to be compatible with RSpec 3 (#6)
1 parent d2ef752 commit 57935f1

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

lib/rspec-rails-caching/matchers/base.rb

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,16 +13,16 @@ def self.caching_matcher name, &block
1313
"#{cache_or_expire} #{expected.inspect}"
1414
end
1515

16-
failure_message_for_should_not do |actual|
16+
failure_message_when_negated do |actual|
1717
"Expected #{controller.class} not to #{cache_or_expire} #{expected.inspect} but got #{cache_results.inspect}"
1818
end
1919

20-
failure_message_for_should do |actual|
20+
failure_message do |actual|
2121
"Expected #{controller.class} to #{cache_or_expire} #{expected.inspect} but got #{cache_results.inspect}"
2222
end
2323

24-
def controller
25-
matcher_execution_context.controller
24+
def supports_block_expectations?
25+
true
2626
end
2727

2828
def cache_store
@@ -37,7 +37,7 @@ def cache_or_expire
3737
fail NoMethodError, "Abstract method 'cache_or_expire' to be defined in matcher"
3838
end
3939

40-
instance_eval &block
40+
module_eval &block
4141

4242
end
4343
end

rspec-rails-caching.gemspec

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ Gem::Specification.new do |gem|
1313
gem.required_ruby_version = Gem::Requirement.new(">= 2.0.0")
1414

1515
gem.add_dependency "rails", ">=3.0.0"
16-
gem.add_dependency "rspec", ">=2.8.0"
17-
gem.add_dependency "rspec-rails", ">=2.10.0"
16+
gem.add_dependency "rspec", ">=3.0.0"
17+
gem.add_dependency "rspec-rails", ">=3.0.0"
1818

1919
gem.files = `git ls-files`.split($\)
2020
gem.test_files = gem.files.grep(%r{^(test|spec|features)/})

0 commit comments

Comments
 (0)