lib/serverspec/matchers/contain.rb in serverspec-0.5.8 vs lib/serverspec/matchers/contain.rb in serverspec-0.6.0
- old
+ new
@@ -1,17 +1,7 @@
RSpec::Matchers.define :contain do |pattern|
match do |file|
- if file.respond_to?(:contain)
- file.contain(pattern, @from, @to)
- else
- if (@from || @to).nil?
- cmd = backend.commands.check_file_contain(file, pattern)
- else
- cmd = backend.commands.check_file_contain_within(file, pattern, @from, @to)
- end
- ret = backend.run_command(cmd)
- ret[:exit_status] == 0
- end
+ file.contain(pattern, @from, @to)
end
# for contain(pattern).from(/A/).to(/B/)
chain :from do |from|
@from = Regexp.new(from).inspect
end