Test fix WIP

middleman-core/features/collections.feature

@@ -197,11 +197,10 @@ Feature: Collections
     Given a fixture app "collections-app"
     And a file named "config.rb" with:
       """
-      Dir.chdir(ENV['MM_ROOT'])
       ignore "/description_template.html"
 
       live {
-        Dir["descriptions/*.txt"]
+        Dir[File.join(root, "descriptions/*.txt")]
       }.each do |description_name|
         base = File.basename(description_name, '.txt')
         proxy "#{base}.html", "/description_template.html", locals: {

middleman-core/lib/middleman-core/step_definitions/builder_steps.rb

@@ -4,34 +4,6 @@ Before do
   @modification_times = Hash.new
 end
 
-Given /^app "([^\"]*)" is using config "([^\"]*)"$/ do |path, config_name|
-  target = File.join(PROJECT_ROOT_PATH, 'fixtures', path)
-  config_path = File.join(expand_path("."), "config-#{config_name}.rb")
-  config_dest = File.join(expand_path("."), 'config.rb')
-  FileUtils.cp(config_path, config_dest)
-end
-
-Given /^an empty app$/ do
-  step %Q{a directory named "empty_app"}
-  step %Q{I cd to "empty_app"}
-  ENV['MM_ROOT'] = nil
-end
-
-Given /^a fixture app "([^\"]*)"$/ do |path|
-  ENV['MM_ROOT'] = nil
-
-  # This step can be reentered from several places but we don't want
-  # to keep re-copying and re-cd-ing into ever-deeper directories
-  next if File.basename(expand_path(".")) == path
-
-  step %Q{a directory named "#{path}"}
-
-  target_path = File.join(PROJECT_ROOT_PATH, 'fixtures', path)
-  FileUtils.cp_r(target_path, expand_path("."))
-
-  step %Q{I cd to "#{path}"}
-end
-
 Given /^a built app at "([^\"]*)"$/ do |path|
   step %Q{a fixture app "#{path}"}
   step %Q{I run `middleman build --verbose`}
@@ -56,22 +28,3 @@ Given /^a successfully built app at "([^\"]*)" with flags "([^\"]*)"$/ do |path,
   step %Q{a built app at "#{path}" with flags "#{flags}"}
   step %Q{was successfully built}
 end
-
-Given /^a modification time for a file named "([^\"]*)"$/ do |file|
-  target = File.join(expand_path("."), file)
-  @modification_times[target] = File.mtime(target)
-end
-
-Then /^the file "([^\"]*)" should not have been updated$/ do |file|
-  target = File.join(expand_path("."), file)
-  expect(File.mtime(target)).to eq(@modification_times[target])
-end
-
-# Provide this Aruba overload in case we're matching something with quotes in it
-Then /^the file "([^"]*)" should contain '([^']*)'$/ do |file, partial_content|
-  expect(file).to have_file_content(Regexp.new(Regexp.escape(partial_content)), true)
-end
-
-And /the file "(.*)" should be gzipped/ do |file|
-  expect(File.binread(File.join(expand_path("."), file), 2)).to eq(['1F8B'].pack('H*'))
-end

middleman-core/lib/middleman-core/step_definitions/middleman_steps.rb

@@ -1,11 +1,60 @@
+require 'fileutils'
+
+Given /^app "([^\"]*)" is using config "([^\"]*)"$/ do |path, config_name|
+  target = File.join(PROJECT_ROOT_PATH, 'fixtures', path)
+  config_path = File.join(expand_path("."), "config-#{config_name}.rb")
+  config_dest = File.join(expand_path("."), 'config.rb')
+  FileUtils.cp(config_path, config_dest)
+end
+
+Given /^an empty app$/ do
+  step %Q{a directory named "empty_app"}
+  step %Q{I cd to "empty_app"}
+  ENV['MM_ROOT'] = nil
+end
+
+Given /^a fixture app "([^\"]*)"$/ do |path|
+  ENV['MM_ROOT'] = nil
+
+  # This step can be reentered from several places but we don't want
+  # to keep re-copying and re-cd-ing into ever-deeper directories
+  next if File.basename(expand_path(".")) == path
+
+  step %Q{a directory named "#{path}"}
+
+  target_path = File.join(PROJECT_ROOT_PATH, 'fixtures', path)
+  FileUtils.cp_r(target_path, expand_path("."))
+
+  step %Q{I cd to "#{path}"}
+end
+
 Then /^the file "([^\"]*)" has the contents$/ do |path, contents|
-  File.write(File.expand_path(path), contents)
+  write_file(path, contents)
 
   @server_inst.files.find_new_files!
 end
 
 Then /^the file "([^\"]*)" is removed$/ do |path|
-  File.delete(File.expand_path(path))
+  step %Q{I remove the file "#{path}"}
 
   @server_inst.files.find_new_files!
 end
+
+Given /^a modification time for a file named "([^\"]*)"$/ do |file|
+  target = File.join(expand_path("."), file)
+  @modification_times[target] = File.mtime(target)
+end
+
+Then /^the file "([^\"]*)" should not have been updated$/ do |file|
+  target = File.join(expand_path("."), file)
+  expect(File.mtime(target)).to eq(@modification_times[target])
+end
+
+# Provide this Aruba overload in case we're matching something with quotes in it
+Then /^the file "([^"]*)" should contain '([^']*)'$/ do |file, partial_content|
+  expect(file).to have_file_content(Regexp.new(Regexp.escape(partial_content)), true)
+end
+
+And /the file "(.*)" should be gzipped/ do |file|
+  expect(File.binread(File.join(expand_path("."), file), 2)).to eq(['1F8B'].pack('H*'))
+end

middleman-core/lib/middleman-core/util/data.rb

@@ -41,9 +41,9 @@ module Middleman::Util::Data
     end
 
     case [start, stop]
-    when %w[--- ---], %w[--- ...]
+    when %w(--- ---), %w(--- ...)
       [parse_yaml(frontmatter, full_path), additional_content]
-    when %w[;;; ;;;]
+    when %w(;;; ;;;)
       [parse_json(frontmatter, full_path), additional_content]
     else
       [{}, content]

middleman-core/source/stylesheets/_partial.sass

@@ -0,0 +1,2 @@
+body
+  font-size: 14px