From 6d569710b9edceb8aa3cedd1e6080ff5d3a89dcb Mon Sep 17 00:00:00 2001
From: Joseph Wynn <joseph@wildlyinaccurate.com>
Date: Tue, 27 Sep 2016 23:48:24 +0100
Subject: [PATCH] More test improvements

---
 features/step_definitions/jekyll_steps.rb          | 2 --
 features/support/env.rb                            | 4 +++-
 features/test-site/_includes/base-url.html         | 2 +-
 features/test-site/_includes/responsive-image.html | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/features/step_definitions/jekyll_steps.rb b/features/step_definitions/jekyll_steps.rb
index 5ca4529..6612ba9 100644
--- a/features/step_definitions/jekyll_steps.rb
+++ b/features/step_definitions/jekyll_steps.rb
@@ -1,5 +1,3 @@
-include Test::Unit::Assertions
-
 When /^I run Jekyll$/ do
   run_jekyll
 end
diff --git a/features/support/env.rb b/features/support/env.rb
index eaed1ae..d686c8e 100644
--- a/features/support/env.rb
+++ b/features/support/env.rb
@@ -3,7 +3,7 @@ if ENV['CI']
   Coveralls.wear!
 end
 
-require 'test/unit'
+require 'test/unit/assertions'
 require 'jekyll/responsive_image'
 
 TEST_DIR = File.join('/', 'tmp', 'jekyll')
@@ -14,3 +14,5 @@ def run_jekyll(options = {})
   site = Jekyll::Site.new(options)
   site.process
 end
+
+World(Test::Unit::Assertions)
diff --git a/features/test-site/_includes/base-url.html b/features/test-site/_includes/base-url.html
index e3e6485..1fa4aed 100644
--- a/features/test-site/_includes/base-url.html
+++ b/features/test-site/_includes/base-url.html
@@ -1 +1 @@
-<img src="{{ site.baseurl }}/{{ path }}">
+<img src="{{ site.baseurl }}/{{ original.path }}">
diff --git a/features/test-site/_includes/responsive-image.html b/features/test-site/_includes/responsive-image.html
index 277fb39..f2df49e 100644
--- a/features/test-site/_includes/responsive-image.html
+++ b/features/test-site/_includes/responsive-image.html
@@ -1 +1 @@
-<img alt="{{ alt }}" src="/{{ path }}" title="{{ title }}" srcset="{% for i in resized %}/{{ i.path }} {{ i.width }}w,{% endfor %}/{{ original.path }} {{ original.width }}w">
+<img alt="{{ alt }}" src="/{{ original.path }}" title="{{ title }}" srcset="{% for i in resized %}/{{ i.path }} {{ i.width }}w,{% endfor %}/{{ original.path }} {{ original.width }}w">