test/test.rb in octopress-ink-1.0.0.alpha.34 vs test/test.rb in octopress-ink-1.0.0.alpha.35
- old
+ new
@@ -36,12 +36,16 @@
end
end
def build(options={})
config = ['_config.yml'] << options[:config]
- cmd = "rm -rf site && bundle exec octopress build --config #{config.join(',')}"
- cmd += " --octopress-config #{options[:octopress_config]}" if options[:octopress_config]
+ cmd = "rm -rf site && bundle exec jekyll build --config #{config.join(',')}"
+ #cmd += " --octopress-config #{options[:octopress_config]}" if options[:octopress_config]
+ if options[:octopress_config]
+ FileUtils.cp options[:octopress_config], '_octopress.yml'
+ end
`#{cmd}`
+ `rm _octopress.yml`
end
def diff_file(file, target_dir='expected', source_dir='site')
diff = `diff #{target_dir}/#{file} #{source_dir}/#{file}`
if diff =~ /(<.+?\n)?(---\n)?(>.+)/