From 09d229de33aea740381e011ea6beff1b55005687 Mon Sep 17 00:00:00 2001 From: scribu Date: Thu, 23 May 2013 19:42:47 +0300 Subject: [PATCH 1/2] make bin/jekyll executable `bundle install` makes it executable and it should be anyway, since it has the hashbang at the top. --- bin/jekyll | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 bin/jekyll diff --git a/bin/jekyll b/bin/jekyll old mode 100644 new mode 100755 From 7579c1c42d69c0017a8f7dc2f82e02cca69899e9 Mon Sep 17 00:00:00 2001 From: scribu Date: Thu, 23 May 2013 19:44:02 +0300 Subject: [PATCH 2/2] cucumber: don't manually include assertions It causes hard to debug infinite loops and it's done automatically in recent versions of Cucumber anyway. --- features/support/env.rb | 4 ---- 1 file changed, 4 deletions(-) diff --git a/features/support/env.rb b/features/support/env.rb index 38bab950..c64b9311 100644 --- a/features/support/env.rb +++ b/features/support/env.rb @@ -2,10 +2,6 @@ require 'fileutils' require 'rr' require 'test/unit' -World do - include Test::Unit::Assertions -end - TEST_DIR = File.join('/', 'tmp', 'jekyll') JEKYLL_PATH = File.join(File.dirname(__FILE__), '..', '..', 'bin', 'jekyll')