diff --git a/features/step_definitions/jekyll_steps.rb b/features/step_definitions/jekyll_steps.rb index cc8353e0..66ae8eaf 100644 --- a/features/step_definitions/jekyll_steps.rb +++ b/features/step_definitions/jekyll_steps.rb @@ -142,19 +142,19 @@ Then /^the (.*) directory should exist$/ do |dir| end Then /^I should see "(.*)" in "(.*)"$/ do |text, file| - assert Regexp.new(text).match(read_file(file)) + assert Regexp.new(text).match(file_contents(file)) end Then /^I should see exactly "(.*)" in "(.*)"$/ do |text, file| - assert_equal text, read_file(file).strip + assert_equal text, file_contents(file).strip end Then /^I should not see "(.*)" in "(.*)"$/ do |text, file| - assert_no_match Regexp.new(text), read_file(file) + assert_no_match Regexp.new(text), file_contents(file) end Then /^I should see escaped "(.*)" in "(.*)"$/ do |text, file| - assert Regexp.new(Regexp.escape(text)).match(read_file(file)) + assert Regexp.new(Regexp.escape(text)).match(file_contents(file)) end Then /^the "(.*)" file should exist$/ do |file| @@ -166,9 +166,9 @@ Then /^the "(.*)" file should not exist$/ do |file| end Then /^I should see today's time in "(.*)"$/ do |file| - assert_match Regexp.new(Regexp.escape(Time.now.to_s)), read_file(file) + assert_match Regexp.new(Regexp.escape(Time.now.to_s)), file_contents(file) end Then /^I should see today's date in "(.*)"$/ do |file| - assert_match Regexp.new(Date.today.to_s), read_file(file) + assert_match Regexp.new(Date.today.to_s), file_contents(file) end diff --git a/features/support/env.rb b/features/support/env.rb index dfab55c8..e426a4ab 100644 --- a/features/support/env.rb +++ b/features/support/env.rb @@ -35,7 +35,7 @@ def location(folder, direction) [before || '.', after || '.'] end -def read_file(path) +def file_contents(path) File.open(path) do |file| file.readlines.join # avoid differences with \n and \r\n line endings end