More tweaks

middleman-cli/features/preview_server.feature

@@ -9,7 +9,7 @@ Feature: Run the preview server
     And the default aruba timeout is 30 seconds
 
   Scenario: Start the server with defaults
-    When I run `middleman server` interactively
+    When I run the interactive middleman server
     And I stop middleman if the output contains:
     """
     Inspect your site configuration

middleman-core/features/extension_hooks.feature

@@ -1,9 +1,7 @@
 Feature: Extension author could use some hooks
 
   Scenario: When build
-    Given a fixture app "extension-hooks-app"
-    When I run `middleman build`
-    Then the exit status should be 0
+    Given a successfully built app at "extension-hooks-app"
     And the output should contain "/// after_configuration ///"
     And the output should contain "/// ready ///"
     And the output should contain "/// before_build ///"

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

@@ -49,3 +49,9 @@ Given /^I run the interactive middleman console$/ do
   step %Q{I set the environment variable "MM_ROOT" to "#{cwd}"}
   step %Q{I run `middleman console` interactively}
 end
+
+Given /^I run the interactive middleman server$/ do
+  cwd = File.expand_path(aruba.current_directory)
+  step %Q{I set the environment variable "MM_ROOT" to "#{cwd}"}
+  step %Q{I run `middleman server` interactively}
+end

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

@@ -1,10 +1,10 @@
 When /^I stop (?:middleman|all commands) if the output( of the last command)? contains:$/ do |last_command, expected|
   begin
-    Timeout.timeout(exit_timeout) do
+    Timeout.timeout(aruba.config.exit_timeout) do
       loop do
         fail "You need to start middleman interactively first." unless @interactive
 
-        if unescape(@interactive.output) =~ Regexp.new(unescape(expected))
+        if sanitize_text(@interactive.output) =~ Regexp.new(sanitize_text(expected))
           all_commands.each { |p| p.terminate }
           break
         end